|
|
be001477ce
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
|
2024-06-25 15:42:22 +08:00 |
|
|
|
8ea06c05e9
|
1、generate 积分扣除并添加相关积分详细
2、获取服装category bug修改
|
2024-06-25 12:18:18 +08:00 |
|
shahaibo
|
9b589eece6
|
TASK:aida;
|
2024-06-25 10:59:58 +08:00 |
|
|
|
aacbe92cdc
|
generate cancel
|
2024-06-24 17:02:25 +08:00 |
|
|
|
30d5466805
|
添加查询Code-Create数据库，监控新增付费记录并对付费用户进行账号新增或延长账号有效期的操作
|
2024-06-21 15:11:31 +08:00 |
|
|
|
8457a61ded
|
generate 添加积分扣除
|
2024-06-20 15:26:22 +08:00 |
|
|
|
e7f9b77fe5
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
|
2024-06-20 10:39:36 +08:00 |
|
shahaibo
|
ad1fa0e4c2
|
TASK:aida;
|
2024-06-20 10:27:28 +08:00 |
|
|
|
227c742f0d
|
新增接口：调查问卷
|
2024-06-20 10:27:04 +08:00 |
|
|
|
2a2c4b1d39
|
slogan访问地址变更
|
2024-06-17 13:31:44 +08:00 |
|
|
|
5e1ff16052
|
slogan 暂停监听
|
2024-06-17 10:51:35 +08:00 |
|
|
|
dbd89798d5
|
slogan 暂停监听
|
2024-06-17 10:42:45 +08:00 |
|
|
|
b5b6f737aa
|
slogan 暂停监听
|
2024-06-17 10:41:36 +08:00 |
|
|
|
1d60a6a129
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
|
2024-06-17 10:25:20 +08:00 |
|
|
|
0017568cc7
|
slogan
|
2024-06-17 10:21:49 +08:00 |
|
shahaibo
|
18914bea7e
|
TASK:aida;
|
2024-06-17 09:34:48 +08:00 |
|
|
|
619d33b412
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/resources/application-dev.properties
# src/main/resources/messages_en.properties
# src/main/resources/messages_zh.properties
|
2024-06-12 10:50:05 +08:00 |
|
shahaibo
|
ee68a5d782
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-12 09:48:11 +08:00 |
|
shahaibo
|
3a29d25060
|
TASK:aida;
|
2024-06-12 09:47:55 +08:00 |
|
|
|
77f514a03b
|
Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/python/PythonService.java
# src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
|
2024-06-11 15:23:24 +08:00 |
|
|
|
954f6207ec
|
design Single 允许画笔修改sketch后进行design
|
2024-06-05 11:43:35 +08:00 |
|
|
|
49b086ad10
|
generate 添加Logo与Slogan
|
2024-06-03 17:13:48 +08:00 |
|
|
|
86e7119cfb
|
AlipayHK 回调及相关数据处理
|
2024-05-31 16:28:23 +08:00 |
|
shahaibo
|
775ae3266c
|
BUGFIX:定时任务开启;
|
2024-05-31 09:59:08 +08:00 |
|
|
|
1aea8e93f2
|
AlipayHK 新增指定订单查询接口
|
2024-05-30 09:54:49 +08:00 |
|
|
|
804dc9b1b4
|
添加aws S3访问工具类
|
2024-05-29 16:30:27 +08:00 |
|
|
|
fb8de15eca
|
不等比缩放
|
2024-05-28 11:17:46 +08:00 |
|
|
|
f4e9a3474a
|
Merge branch 'test/stable' into release/3.0
# Conflicts:
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-05-28 10:59:34 +08:00 |
|
shahaibo
|
890389843f
|
BUGFIX:试用时间link14天;
|
2024-05-28 10:43:50 +08:00 |
|
|
|
76618de386
|
不等比缩放
|
2024-05-27 18:07:33 +08:00 |
|
|
|
eda92b3f0b
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
|
2024-05-27 15:13:20 +08:00 |
|
shahaibo
|
4ba5f63a62
|
TASK:workspace;
|
2024-05-27 15:05:46 +08:00 |
|
shahaibo
|
8b274b2822
|
Merge remote-tracking branch 'origin/release/3.0' into dev/dev
# Conflicts:
# pom.xml
# src/main/java/com/ai/da/common/utils/SendEmailUtil.java
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
|
2024-05-27 15:03:02 +08:00 |
|
|
|
54cbaf4b80
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
# src/main/resources/application-dev.properties
|
2024-05-27 13:24:51 +08:00 |
|
|
|
c688af01f2
|
Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
# pom.xml
# src/main/java/com/ai/da/common/utils/SendEmailUtil.java
|
2024-05-27 13:20:31 +08:00 |
|
|
|
5ebf0669f5
|
alipay-hk 切换到live环境
|
2024-05-23 15:48:55 +08:00 |
|
shahaibo
|
cd817dbf57
|
TASK:style;
|
2024-05-22 09:50:34 +08:00 |
|
shahaibo
|
8f5a86db0b
|
TASK:监听;
|
2024-05-18 08:19:55 +08:00 |
|
shahaibo
|
14c99f6c6b
|
TASK:监听;
|
2024-05-18 01:31:26 +08:00 |
|
shahaibo
|
b8048704ba
|
TASK:监听;
|
2024-05-18 01:00:42 +08:00 |
|
shahaibo
|
b6704c3caf
|
TASK:取消监听;
|
2024-05-18 00:34:18 +08:00 |
|
shahaibo
|
980e1547cd
|
TASK:检查令牌日志注释;
|
2024-05-17 21:07:20 +08:00 |
|
shahaibo
|
ae2191f369
|
TASK:检查令牌日志注释;
|
2024-05-17 21:03:56 +08:00 |
|
shahaibo
|
4b1a58c036
|
TASK:检查令牌日志注释;
|
2024-05-17 20:58:54 +08:00 |
|
shahaibo
|
4dbd5a1fad
|
TASK:检查令牌日志注释;
|
2024-05-17 20:27:58 +08:00 |
|
shahaibo
|
f1eb48ae74
|
TASK:配置文件;
|
2024-05-17 19:25:50 +08:00 |
|
shahaibo
|
e634481113
|
TASK:配置文件;
|
2024-05-17 17:59:04 +08:00 |
|
shahaibo
|
12c447d6b0
|
TASK:配置文件;
|
2024-05-17 12:14:20 +08:00 |
|
shahaibo
|
c73876e8b0
|
TASK:配置文件;
|
2024-05-17 12:13:35 +08:00 |
|
shahaibo
|
9f4dbda152
|
TASK:无新增用户邮件;
|
2024-05-17 10:39:00 +08:00 |
|
