shahaibo
|
f8d468d55b
|
TASK:代码合并;
|
2024-02-20 10:35:50 +08:00 |
|
shahaibo
|
ca70371585
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
# src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
# src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
# src/main/java/com/ai/da/mapper/primary/entity/Product.java
# src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
# src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
|
2024-02-20 10:26:13 +08:00 |
|
shahaibo
|
68f6ae2a8d
|
TASK:design new;
|
2024-02-20 10:12:44 +08:00 |
|
shahaibo
|
7803decb29
|
TASK:增加邮件通知人;
|
2024-02-20 09:31:31 +08:00 |
|
|
|
35fbd4d865
|
修改内网穿透地址
|
2024-02-19 15:26:42 +08:00 |
|
|
|
2a73986e64
|
修改内网穿透地址
|
2024-02-19 14:38:18 +08:00 |
|
shahaibo
|
4e2e1affa8
|
Merge branch 'dev/dev' into dev/dev_shb
# Conflicts:
# src/main/java/com/ai/da/controller/AccountController.java
# src/main/java/com/ai/da/mapper/primary/entity/GenerateCancel.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryCopy.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPointCopy.java
# src/main/java/com/ai/da/service/AccountService.java
# src/main/java/com/ai/da/service/LibraryService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
# src/main/resources/application-prod.properties
# src/main/resources/application-test.properties
|
2024-02-19 13:02:58 +08:00 |
|
shahaibo
|
9bae02406c
|
TASK:dev分支调用python端端口修改;
|
2024-02-19 11:03:28 +08:00 |
|
shahaibo
|
a4f36a2fd5
|
TASK:试用时间增加;
|
2024-02-15 15:23:32 +08:00 |
|
shahaibo
|
fda2a3120b
|
TASK:试用时间增加;
|
2024-02-15 15:19:09 +08:00 |
|
|
|
87580cfece
|
接入支付宝 联调修改
|
2024-02-15 14:03:44 +08:00 |
|
|
|
318d0a1441
|
充值功能--接入支付宝
|
2024-02-14 12:37:57 +08:00 |
|
|
|
874a59ea04
|
Merge remote-tracking branch 'origin/dev/dev_xp' into dev/dev
|
2024-02-14 12:22:16 +08:00 |
|
|
|
a7c60a932a
|
合并stable
|
2024-02-14 12:21:01 +08:00 |
|
|
|
7f33597c02
|
充值功能--接入支付宝
|
2024-02-14 12:10:15 +08:00 |
|
|
|
92dafd74c9
|
在过滤器中添加未携带token的请求ip日志打印
|
2024-02-01 13:28:48 +08:00 |
|
|
|
9b55083768
|
generate 日志打印
|
2024-01-31 19:35:17 +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
|
5c2c9f22ce
|
TASK:配置文件;
|
2024-01-29 11:33:28 +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
|
a5cbca8d74
|
TASK:配置文件;
|
2024-01-29 11:18:32 +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 |
|
