Commit Graph

367 Commits

Author SHA1 Message Date
shahaibo
4e334dca7d TASK:python服务端口; 2024-01-09 17:31:14 +08:00
shahaibo
a3ae8401fb TASK:定时任务执行周期; 2024-01-09 13:44:15 +08:00
shahaibo
7a0b6307b0 TASK:docker配置文件回退; 2024-01-08 13:33:26 +08:00
shahaibo
580ebc91ff Merge remote-tracking branch 'origin/develop' into dev/dev
# Conflicts:
#	.gitignore
2024-01-08 13:32:56 +08:00
shahaibo
dc325e6ab4 TASK:忽略docker配置文件; 2024-01-08 13:31:05 +08:00
shahaibo
80976f45a7 TASK:忽略docker配置文件; 2024-01-08 13:30:34 +08:00
shahaibo
5bed3c180b TASK:续订通知; 2024-01-08 13:02:50 +08:00
zchengrong
67c137392f Update application.properties 2024-01-06 20:11:06 +08:00
zchengrong
6e979d58a2 Update application-prod.properties 2024-01-06 20:08:19 +08:00
zchengrong
7a95bce2b1 Update docker-compose.yml 2024-01-06 19:25:51 +08:00
shahaibo
84dd2d7cd9 TASK:端口; 2024-01-05 11:31:23 +08:00
shahaibo
4a8867dbb5 TASK:批量修改类别; 2024-01-05 11:11:29 +08:00
shahaibo
8930e64bf7 Merge remote-tracking branch 'origin/develop' into dev/dev 2024-01-05 10:25:50 +08:00
9405b0d630 判断机器人返回图片地址是否实际存在 2024-01-04 17:34:49 +08:00
71f1a2671e Merge branch 'develop' into dev/dev 2024-01-04 17:15:03 +08:00
shahaibo
71a0a3c06b TASK:到期时间查询; 2024-01-04 15:22:38 +08:00
shahaibo
f2a8a82821 TASK:公共标签; 2024-01-04 14:45:20 +08:00
shahaibo
3b37e8644c TASK:公共标签; 2024-01-04 14:25:54 +08:00
shahaibo
2832105ac2 Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 13:57:32 +08:00
shahaibo
eafa6daf5b TASK:公共标签; 2024-01-04 13:57:17 +08:00
7a309bcb17 机器人返回图片数量修改 2024-01-04 11:47:09 +08:00
shahaibo
fc4a59d41a Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 11:04:45 +08:00
shahaibo
11f94ebcb4 BUGFIX:element上传; 2024-01-04 11:04:15 +08:00
7c94bc4826 机器人返回图片路径修改 2024-01-04 10:15:48 +08:00
zchengrong
00cf7b3140 Update DesignServiceImpl.java 2024-01-02 17:13:13 +08:00
zchengrong
914910903e Update application-test.properties 2024-01-02 17:05:37 +08:00
28d92c468c Merge remote-tracking branch 'origin/develop' into dev/dev
# Conflicts:
#	src/main/resources/application-prod.properties
2024-01-02 13:05:06 +08:00
dd5997fea6 统一管理python端服务ip和端口 2024-01-02 11:53:09 +08:00
d19aa7083b 添加状态检测 2023-12-29 13:48:42 +08:00
zhouchengrong
858a195e13 新增aws 状态检测接口 2023-12-29 13:35:39 +08:00
4b1974aceb 添加状态检测 2023-12-29 13:19:48 +08:00
eb45f6e7d0 history designSingle之后日期未更新-bug修复 2023-12-28 17:58:51 +08:00
1c8f230a64 Merge remote-tracking branch 'origin/dev/dev' into dev/dev 2023-12-28 16:35:31 +08:00
shahaibo
85b4d674ea Merge remote-tracking branch 'origin/dev/dev' into dev/dev 2023-12-28 13:56:18 +08:00
shahaibo
8c3b658df0 Merge remote-tracking branch 'origin/develop' into dev/dev 2023-12-28 13:52:28 +08:00
46511fed71 Merge remote-tracking branch 'origin/develop' into dev/dev 2023-12-28 11:05:07 +08:00
f346727469 Merge remote-tracking branch 'origin/develop' into develop 2023-12-28 09:46:03 +08:00
e9844e38a4 generate 为version 1添加str前缀及判空 2023-12-28 09:45:44 +08:00
shahaibo
91012a00b6 BUGFIX:element上传; 2023-12-27 11:08:09 +08:00
shahaibo
bd116ff011 BUGFIX:忘记密码; 2023-12-22 14:12:20 +08:00
shahaibo
ce7c6c657b BUGFIX:忘记密码; 2023-12-22 14:05:31 +08:00
131f46b59e 配置文件修改 2023-12-22 12:09:00 +08:00
shahaibo
0f8f6679ab Merge remote-tracking branch 'origin/develop' into develop 2023-12-22 11:17:51 +08:00
shahaibo
a5d08e700a BUGFIX:retrieve; 2023-12-22 11:17:35 +08:00
f98f54f3c1 Merge remote-tracking branch 'origin/develop' into dev/dev
# Conflicts:
#	docker-compose.yml
2023-12-22 10:55:34 +08:00
zchengrong
23e2c507df Update docker-compose.yml 2023-12-22 10:45:24 +08:00
zchengrong
6331b5d164 Update docker-compose.yml 2023-12-22 10:44:58 +08:00
zchengrong
2dd1ad8a08 Update docker-compose.yml 2023-12-22 10:35:58 +08:00
e45e63103f BUGFIX:修复获取图片命名 2023-12-21 14:23:33 +08:00
shahaibo
640c9527be Merge remote-tracking branch 'origin/develop' into develop 2023-12-21 10:55:34 +08:00