Commit Graph

460 Commits

Author SHA1 Message Date
a7c60a932a 合并stable 2024-02-14 12:21:01 +08:00
c646a8adb0 Merge branch 'release/3.0' into dev/dev
# Conflicts:
#	docker-compose.yml
#	src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
2024-01-31 16:30:52 +08:00
69fe927576 新增generate-queue-dev消息队列 2024-01-31 16:01:06 +08:00
f4a80a4486 Merge remote-tracking branch 'origin/test/stable' into dev/dev
# Conflicts:
#	docker-compose.yml
2024-01-31 15:51:35 +08:00
83058acfea Merge remote-tracking branch 'origin/test/stable' into release/3.0
# Conflicts:
#	src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
#	src/main/resources/application.properties
2024-01-31 15:13:02 +08:00
8f832ec441 机器人试用到期提示 2024-01-31 14:59:19 +08:00
shahaibo
5e1573ae09 TASK:试用用户机器人余额; 2024-01-30 15:07:34 +08:00
shahaibo
f1176dfefb TASK:试用用户机器人余额; 2024-01-30 15:03:38 +08:00
zchengrong
12cd9e8f1f Delete docker-compose.yml 2024-01-30 14:52:40 +08:00
shahaibo
81c5d7ee65 TASK:试用用户机器人余额; 2024-01-30 14:20:57 +08:00
shahaibo
878b5a129c TASK:试用用户机器人余额; 2024-01-30 14:20:01 +08:00
821a3420ae 配置环境修改 2024-01-30 13:39:59 +08:00
bee78cc9a2 generate 添加试用用户判断 2024-01-30 13:34:30 +08:00
5975519c39 docker-compose.yml 2024-01-30 12:43:36 +08:00
ec9b60e1d6 docker-compose.yml 2024-01-30 12:38:56 +08:00
9e653595a9 generate 添加试用用户判断 2024-01-30 11:48:26 +08:00
02d65b4fb2 Merge remote-tracking branch 'origin/release/3.0' into test/stable
# Conflicts:
#	src/main/resources/application-prod.properties
2024-01-30 10:50:18 +08:00
533b54a768 MQ 消息队列名修改 2024-01-29 17:03:10 +08:00
shahaibo
98d98b1131 TASK:配置文件; 2024-01-29 11:32:41 +08:00
shahaibo
7386f4427d TASK:配置文件; 2024-01-29 11:30:39 +08:00
shahaibo
9a5ee2b264 TASK:配置文件; 2024-01-29 11:20:26 +08:00
shahaibo
2b2fb4319a TASK:配置文件; 2024-01-29 11:10:00 +08:00
shahaibo
0afcf92582 BUGFIX:试用用户; 2024-01-29 10:35:19 +08:00
shahaibo
33a096e382 Merge remote-tracking branch 'origin/release/3.0' into release/3.0 2024-01-29 10:06:58 +08:00
shahaibo
ee2a8ac3ce BUGFIX:试用用户; 2024-01-29 10:06:48 +08:00
zchengrong
17e7ebc8fe Update docker-compose.yml 2024-01-29 10:02:45 +08:00
shahaibo
41919c44c9 BUGFIX:试用用户; 2024-01-29 09:50:48 +08:00
zchengrong
12190f88c8 Update docker-compose.yml 2024-01-28 12:26:47 +08:00
zchengrong
c74c7376cc Update docker-compose.yml 2024-01-28 12:25:02 +08:00
zchengrong
4f68fbcff1 Update docker-compose.yml 2024-01-28 12:19:36 +08:00
zchengrong
e539a931f9 Update docker-compose.yml 2024-01-28 12:18:47 +08:00
zchengrong
abcad626f6 Update docker-compose.yml 2024-01-28 11:19:03 +08:00
zchengrong
ae6692523b Update docker-compose.yml 2024-01-28 11:16:59 +08:00
shahaibo
3a2253f1ce TASK:数据库连接 2024-01-28 11:08:53 +08:00
shahaibo
4380f0bc5b BUGFIX:异常级别设置 2024-01-28 10:40:29 +08:00
shahaibo
18d0d55d4f BUGFIX:设置上传文件大小,正式用户转试用用户 2024-01-27 16:32:18 +08:00
shahaibo
f047ca0324 Merge remote-tracking branch 'origin/develop' into develop 2024-01-26 15:33:43 +08:00
shahaibo
f02988a0a7 TASK:分页去除限制; 2024-01-26 15:33:33 +08:00
fc4dcd41ae generate 修改字段名str->content 2024-01-26 14:18:28 +08:00
shahaibo
d4a7fa441c Merge remote-tracking branch 'origin/develop' into develop 2024-01-26 13:18:37 +08:00
shahaibo
5af86c28f1 TASK:数据迁移; 2024-01-26 13:18:16 +08:00
shahaibo
62e6f8b77d TASK:数据迁移; 2024-01-26 13:17:59 +08:00
4c0dd27332 generate 记录取消操作 2024-01-26 13:12:04 +08:00
aa270b5f7d 修改排队位置 2024-01-25 14:11:12 +08:00
e90c4f7239 恢复配置 2024-01-25 13:44:28 +08:00
c35a188abb TASK:generate 修复逻辑Bug 2024-01-25 13:37:17 +08:00
65bed9dada TASK:generate 取消generate 2024-01-24 16:57:53 +08:00
1d2cb17d54 TASK:generate 添加队列消费者,增加并发量 2024-01-24 14:44:31 +08:00
d4568ad740 redis 配置修改 2024-01-24 11:47:19 +08:00
96858c2cc3 TASK:异步调用generate及取消generate 2024-01-24 11:43:56 +08:00