|
|
36e41ecd89
|
push to prod 配置修改
|
2024-07-17 15:28:55 +08:00 |
|
|
|
e1b08a9979
|
modify:Stripe
|
2024-07-17 15:26:11 +08:00 |
|
|
|
925da9fa03
|
prod->local 合代码配置修改
|
2024-07-10 14:28:50 +08:00 |
|
|
|
505288fdb7
|
代码合并修改
|
2024-07-10 11:01:25 +08:00 |
|
|
|
429fdad2b7
|
Merge branch 'test/stable' into release/3.0
|
2024-07-10 10:56:07 +08:00 |
|
|
|
46fbbd747e
|
alipay-hk 配置文件位置修改
|
2024-07-10 10:47:36 +08:00 |
|
|
|
803bdfd291
|
alipay-hk 配置文件路径修改
|
2024-07-10 10:08:20 +08:00 |
|
shahaibo
|
a56510c35a
|
TASK:变回develop环境
|
2024-07-09 23:44:40 +08:00 |
|
shahaibo
|
5297880c3b
|
BUGFIX:aida;
|
2024-07-09 17:10:49 +08:00 |
|
shahaibo
|
0c6187a759
|
BUGFIX:aida;
|
2024-07-09 10:13:32 +08:00 |
|
shahaibo
|
0b8d0a1843
|
BUGFIX:aida;
|
2024-07-09 09:46:41 +08:00 |
|
shahaibo
|
42f1d47f82
|
BUGFIX:aida;
|
2024-07-08 16:17:13 +08:00 |
|
shahaibo
|
bc240cd2ee
|
TASK:aida;
|
2024-06-27 17:36:47 +08:00 |
|
shahaibo
|
f869f8eb10
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-27 15:33:38 +08:00 |
|
shahaibo
|
9b438c78a3
|
TASK:aida;
|
2024-06-27 15:33:26 +08:00 |
|
|
|
e614e3a07a
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/GenerateService.java
|
2024-06-25 16:59:41 +08:00 |
|
shahaibo
|
8c65592394
|
TASK:aida;
|
2024-06-25 16:43:54 +08:00 |
|
|
|
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 |
|
shahaibo
|
9b589eece6
|
TASK:aida;
|
2024-06-25 10:59:58 +08:00 |
|
|
|
57ab6c64ef
|
flask 迁移到fast-api 9992 -> 9994
|
2024-06-24 14:33:34 +08:00 |
|
|
|
227c742f0d
|
新增接口：调查问卷
|
2024-06-20 10:27:04 +08:00 |
|
|
|
4f12aa92b6
|
slogan 参数校验
|
2024-06-18 13:13:20 +08:00 |
|
|
|
e6a2ce2b69
|
dev 配置文件修改
|
2024-06-18 10:19:56 +08:00 |
|
shahaibo
|
676ef74bdc
|
TASK:aida;
|
2024-06-17 19:25:37 +08:00 |
|
shahaibo
|
02787db0a1
|
TASK:aida;
|
2024-06-17 17:37:15 +08:00 |
|
shahaibo
|
375f717721
|
TASK:aida;
|
2024-06-17 09:43:59 +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 |
|
|
|
1a48527c70
|
1、design single 添加 design elements
2、design single -- print添加level2Type
3、替换部分flask接口 为 fastAPI接口
|
2024-06-12 10:41:59 +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 |
|
|
|
891f6fb15f
|
Printboard level2Type 语言适配
|
2024-06-04 15:19:30 +08:00 |
|
|
|
49b086ad10
|
generate 添加Logo与Slogan
|
2024-06-03 17:13:48 +08:00 |
|
|
|
86e7119cfb
|
AlipayHK 回调及相关数据处理
|
2024-05-31 16:28:23 +08:00 |
|
|
|
709393a9a6
|
paypal 切换为live环境
|
2024-05-28 11:20:58 +08:00 |
|
|
|
fb8de15eca
|
不等比缩放
|
2024-05-28 11:17:46 +08:00 |
|
|
|
db04267591
|
Merge branch 'dev/dev' into test/stable
# Conflicts:
# src/main/resources/paypal-sandbox.properties
|
2024-05-27 18:26:36 +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
|
b1b4b4147c
|
TASK:配置文件;
|
2024-05-27 15:06:24 +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 |
|
|
|
f9ce559915
|
paypal 切换回sandbox环境
|
2024-05-21 14:40:46 +08:00 |
|
|
|
e40401f61f
|
paypal webhook切换到prod
|
2024-05-21 14:27:17 +08:00 |
|
shahaibo
|
bf072e35f5
|
TASK:监听;
|
2024-05-18 01:16:15 +08:00 |
|
shahaibo
|
b8048704ba
|
TASK:监听;
|
2024-05-18 01:00:42 +08:00 |
|
shahaibo
|
6b07c84c80
|
TASK:检查令牌日志注释;
|
2024-05-17 21:14:39 +08:00 |
|
