33 Commits

Author SHA1 Message Date
4a9daea833 Merge branch 'dev' into beta 2023-07-27 20:53:20 +08:00
chenyunlong
b69f6af1e7 Effort Task #4099 Cost:0.5h 合并行和列数字调整 2023-07-27 20:41:26 +08:00
de88e68f91 Effort Task #7373 Cost:1h Left:8h 漏洞修复,xstream依赖版本升级到1.4.20 2023-06-14 10:45:04 +08:00
aabc3449ac Effort Task #7373 Cost:1h Left:8h 漏洞修复,xstream依赖版本升级 2023-06-14 10:43:25 +08:00
929ec3b321 Dockerfile_prod 2023-03-10 18:41:47 +08:00
5dcf31b6d5 Dockerfile_prod 2023-03-10 18:29:25 +08:00
3e710191cc Dockerfile_prod 2023-03-10 18:12:29 +08:00
9f6d3824dd sim环境token修改 2023-02-27 14:48:15 +08:00
1ad1e95356 Dockerfile_sim端口修改 2023-02-27 13:47:43 +08:00
2635fb065f 增加sim和prod两个配置文件 2023-02-27 13:46:15 +08:00
a70c2047fb Dockerfile_gray 端口修改 2023-02-24 19:07:50 +08:00
e9202a548a 还原商品为9089 2023-02-24 19:01:05 +08:00
0fccf80e53 Dockerfile_gray端口改为8080 2023-02-24 18:09:10 +08:00
8716ceb232 Dockerfile_prod端口和健康检查修改 2023-02-24 18:02:55 +08:00
5218675a1a Merge branch 'beta' into dev
# Conflicts:
#	server/src/main/java/cn/keking/web/controller/ContractController.java
2023-02-23 17:33:52 +08:00
5b1fb0d83b 生产环境dockerfile重命名 2023-02-23 17:29:53 +08:00
a889588baa 更新 'server/src/main/resources/application-dev.properties' 2022-09-07 16:01:09 +08:00
4d15f2a9f8 更新 'server/src/main/resources/application-dev.properties' 2022-09-07 16:00:01 +08:00
bigtian
5d9b32be13 输出请求参数 2022-08-25 10:04:02 +08:00
bigtian
0a29703a19 输出请求参数 2022-08-25 10:03:38 +08:00
bigtian
e31be7fe70 输出请求参数 2022-08-25 09:48:05 +08:00
bigtian
e9e23d1324 拿master配置文件到dev环境 2022-07-21 09:45:39 +08:00
bigtian
d2cfc3b194 修改POM 2022-07-15 15:06:33 +08:00
bigtian
2d2e602558 修改POM 2022-07-15 15:03:13 +08:00
bigtian
010ca247b5 修改启动类 2022-07-15 14:57:02 +08:00
bigtian
d127e685ff 修改启动类 2022-07-15 14:47:42 +08:00
bigtian
729c589e24 修改启动类 2022-07-15 14:41:46 +08:00
bigtian
bac23ce58f 添加忽略文件 2022-07-15 14:25:18 +08:00
bigtian
706274d28d first commit 2022-07-15 14:21:27 +08:00
bigtian
cfe20cbdd6 1 2022-07-15 14:16:24 +08:00
bigtian
c9355b125b 添加kkfile 2022-07-15 13:54:00 +08:00
bigtian
9d6c3acb60 添加kkfile 2022-07-15 09:49:26 +08:00
bigtian
c720d2ed1e 添加kkfile 2022-07-08 16:56:12 +08:00