Commit Graph

Select branches

Hide Pull Requests

beta

daijunxiong-patch-1

daijunxiong-patch-2

daijunxiong-patch-3

dev

master

release-20230706

release-20230727

release-20240530

#1

#10

#11

#12

#13

#14

#15

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• cd01a4f2fc modify Dockerfile_test dev xiaocanyu 2024-12-24 16:13:19 +08:00
• cc44f8f5c2 Merge pull request 'beta' (#15) from beta into master master luobai 2024-08-01 18:05:33 +08:00
• 170e449f4e Merge pull request '修改 Dockerfile_prod' (#14) from dev into beta #15 beta luobai 2024-08-01 18:05:03 +08:00
• f94a551286 修改 Dockerfile_prod #14 luob 2024-08-01 11:54:43 +08:00
• 5f0b373d3b Merge pull request 'beta' (#13) from beta into master luobai 2024-05-30 17:27:15 +08:00
• e1d0aee060 Merge pull request '打印支持俄文' (#12) from dev into beta #13 luobai 2024-05-30 14:05:21 +08:00
• ade7ee8cbd 打印支持俄文 #12 dengshengli 2024-05-30 11:28:52 +08:00
• 5cc7545233 Merge pull request '修改 Dockerfile_gray' (#11) from dev into beta luobai 2024-05-28 14:30:41 +08:00
• 2309df3a99 修改 Dockerfile_gray #11 luob 2024-05-28 14:29:55 +08:00
• 8122a51f29 Merge pull request '打印支持韩文' (#10) from dev into beta luobai 2024-05-28 14:00:29 +08:00
• 7a743e871d 打印支持韩文 #10 dengshengli 2024-05-28 13:50:24 +08:00
• 2b3a041a29 Merge pull request '打印支持韩文' (#9) from dev into beta luobai 2024-05-28 11:23:45 +08:00
• 6c9450cc94 打印支持韩文 #9 dengshengli 2024-05-28 11:21:07 +08:00
• 759fb54ead Effort Task #9427 Cost:1h Left:0h 引入nacos配置，服务器地址修改 huangsheng 2024-01-30 11:31:13 +08:00
• f60b86da4f Merge branch 'dev' into beta huangsheng 2024-01-30 11:26:57 +08:00
• fec69fcecd Effort Task #9427 Cost:1h Left:0h 引入nacos配置，配置调整 huangsheng 2024-01-30 11:08:54 +08:00
• de3a4cb120 Effort Task #9427 Cost:1h Left:0h 引入nacos配置，配置调整 huangsheng 2024-01-30 10:43:11 +08:00
• 4a3d56407c Merge pull request 'beta' (#8) from beta into master release-20240530 luobai 2024-01-12 17:38:55 +08:00
• 5a84afd8bc dev 合并到 beta 还是有区别，再调整一次 #8 luobai 2024-01-12 10:53:08 +08:00
• 3f5dd2d165 Merge pull request 'dev 合并到 beta 还是有区别，再调整一次' (#7) from dev into beta luobai 2024-01-12 10:35:32 +08:00
• 82fef86d12 dev 合并到 beta 还是有区别，再调整一次 #7 luobai 2024-01-12 10:34:12 +08:00
• d5d1137e3c dev 合并到 beta 还是有区别 luobai 2024-01-12 10:27:28 +08:00
• f412e56114 Merge pull request 'dev' (#6) from dev into beta luobai 2024-01-12 10:12:11 +08:00
• 3494cd3a17 Finish Task #9031 Cost:3h 修改dockerfile #6 daijunxiong 2024-01-12 10:10:07 +08:00
• 461dc26a7d Finish Task #9031 Cost:3h 修改dockerfile daijunxiong 2024-01-12 10:08:30 +08:00
• acd0c1982d Finish Task #9031 Cost:3h 修改dockerfile daijunxiong 2024-01-12 10:06:42 +08:00
• f170c60d3f Merge pull request 'dev' (#5) from dev into beta luobai 2024-01-12 09:13:24 +08:00
• ac1274b565 Finish Task #9031 Cost:3h 开发导出word #5 daijunxiong 2024-01-09 14:01:26 +08:00
• aefd70308e Finish Task #9031 Cost:3h 开发导出word daijunxiong 2024-01-09 12:25:57 +08:00
• 3c75bedb8e Finish Task #9031 Cost:3h 开发导出word daijunxiong 2024-01-09 12:21:07 +08:00
• 8bab53a026 Finish Task #9031 Cost:3h 开发导出word daijunxiong 2024-01-09 11:41:51 +08:00
• b995656323 Merge pull request 'beta' (#4) from beta into master luobai 2023-12-24 16:20:40 +08:00
• 3cd4cf8e1c Merge pull request 'dev' (#3) from dev into beta #4 luobai 2023-12-21 17:53:15 +08:00
• 692b678d8e Merge branch 'master' into dev #3 时间淡忘一切 2023-12-21 17:47:06 +08:00
• 6546b269ef Finish Task #9031 Cost:3h 开发导出word 时间淡忘一切 2023-12-21 17:46:36 +08:00
• c9f7c850f6 Merge branch 'dev' into beta huangsheng 2023-12-07 13:38:35 +08:00
• f52b5ef762 Finish Task #8394 Cost:8h 【PC端】新增海外订单排产需求 时间淡忘一切 2023-11-06 09:16:31 +08:00
• b491b9a30b Fix Bug #29411 修复组织数据在redis为空的时候，导致数据转换失败 时间淡忘一切 2023-10-12 18:04:27 +08:00
• 9e9de4d232 Fix Bug #29411 修复组织数据在redis为空的时候，导致数据转换失败 时间淡忘一切 2023-10-12 18:01:30 +08:00
• 8658c56976 Fix Bug #29411 修复组织数据在redis为空的时候，导致数据转换失败 时间淡忘一切 2023-10-12 18:01:10 +08:00
• 5d3b21da57 Fix Bug #29411 修复组织数据在redis为空的时候，导致数据转换失败 时间淡忘一切 2023-10-12 17:46:02 +08:00
• 6c4f479b52 更新 'Dockerfile_gray' daijunxiong 2023-10-12 17:34:56 +08:00
• a148e2e0c4 更新 'Dockerfile_gray' daijunxiong 2023-10-12 17:33:08 +08:00
• 6566bc6ead 更新 'Dockerfile_gray' daijunxiong 2023-10-12 17:30:56 +08:00
• 252850b53d 更新 'Dockerfile_gray' daijunxiong 2023-10-12 17:30:12 +08:00
• 510a37abac 更新 'Dockerfile_gray' daijunxiong 2023-10-12 17:27:24 +08:00
• 8aef25f377 Merge pull request '更新 'Dockerfile_gray'' (#2) from daijunxiong-patch-3 into beta huangsheng 2023-10-12 17:11:35 +08:00
• c508ee8900 更新 'Dockerfile_gray' #2 daijunxiong-patch-3 daijunxiong 2023-10-12 17:09:28 +08:00
• 6a36a3b324 Merge pull request '更新 'Dockerfile_gray'' (#1) from daijunxiong-patch-2 into beta huangsheng 2023-10-12 17:06:15 +08:00
• cea61bb669 更新 'Dockerfile_gray' #1 daijunxiong-patch-2 daijunxiong 2023-10-12 17:02:09 +08:00
• 35cfcc0c8d 更新 'Dockerfile_prod' daijunxiong-patch-1 daijunxiong 2023-10-12 17:01:29 +08:00
• 82313a7470 Merge branch 'dev' into beta release-20230727 huangsheng 2023-07-27 21:33:25 +08:00
• c0c7ae7f15 Effort Task #4099 Cost:0.5h 合并行和列数字调整 chenyunlong 2023-07-27 21:32:42 +08:00
• 4a9daea833 Merge branch 'dev' into beta huangsheng 2023-07-27 20:53:20 +08:00
• b69f6af1e7 Effort Task #4099 Cost:0.5h 合并行和列数字调整 chenyunlong 2023-07-27 20:41:26 +08:00
• de88e68f91 Effort Task #7373 Cost:1h Left:8h 漏洞修复，xstream依赖版本升级到1.4.20 huangsheng 2023-06-14 10:45:04 +08:00
• aabc3449ac Effort Task #7373 Cost:1h Left:8h 漏洞修复，xstream依赖版本升级 release-20230706 huangsheng 2023-06-14 10:43:25 +08:00
• 929ec3b321 Dockerfile_prod huangsheng 2023-03-10 18:41:47 +08:00
• 5dcf31b6d5 Dockerfile_prod huangsheng 2023-03-10 18:29:25 +08:00
• 3e710191cc Dockerfile_prod huangsheng 2023-03-10 18:12:29 +08:00
• 9f6d3824dd sim环境token修改 huangsheng 2023-02-27 14:48:15 +08:00
• 1ad1e95356 Dockerfile_sim端口修改 huangsheng 2023-02-27 13:47:43 +08:00
• 2635fb065f 增加sim和prod两个配置文件 huangsheng 2023-02-27 13:46:15 +08:00
• a70c2047fb Dockerfile_gray 端口修改 huangsheng 2023-02-24 19:07:50 +08:00
• e9202a548a 还原商品为9089 huangsheng 2023-02-24 19:01:05 +08:00
• 0fccf80e53 Dockerfile_gray端口改为8080 huangsheng 2023-02-24 18:09:10 +08:00
• 8716ceb232 Dockerfile_prod端口和健康检查修改 huangsheng 2023-02-24 18:02:55 +08:00
• 5218675a1a Merge branch 'beta' into dev huangsheng 2023-02-23 17:33:52 +08:00
• 5b1fb0d83b 生产环境dockerfile重命名 huangsheng 2023-02-23 17:29:53 +08:00
• a889588baa 更新 'server/src/main/resources/application-dev.properties' dengshengli 2022-09-07 16:01:09 +08:00
• 4d15f2a9f8 更新 'server/src/main/resources/application-dev.properties' dengshengli 2022-09-07 16:00:01 +08:00
• 5d9b32be13 输出请求参数 bigtian 2022-08-25 10:04:02 +08:00
• 0a29703a19 输出请求参数 bigtian 2022-08-25 10:03:38 +08:00
• e31be7fe70 输出请求参数 bigtian 2022-08-25 09:48:05 +08:00
• e9e23d1324 拿master配置文件到dev环境 bigtian 2022-07-21 09:45:39 +08:00
• d2cfc3b194 修改POM bigtian 2022-07-15 15:06:33 +08:00
• 2d2e602558 修改POM bigtian 2022-07-15 15:03:13 +08:00
• 010ca247b5 修改启动类 bigtian 2022-07-15 14:57:02 +08:00
• d127e685ff 修改启动类 bigtian 2022-07-15 14:47:42 +08:00
• 729c589e24 修改启动类 bigtian 2022-07-15 14:41:46 +08:00
• bac23ce58f 添加忽略文件 bigtian 2022-07-15 14:25:18 +08:00
• 706274d28d first commit bigtian 2022-07-15 14:21:27 +08:00
• cfe20cbdd6 1 bigtian 2022-07-15 14:16:24 +08:00
• c9355b125b 添加kkfile bigtian 2022-07-15 13:54:00 +08:00
• 9d6c3acb60 添加kkfile bigtian 2022-07-15 09:49:26 +08:00
• c720d2ed1e 添加kkfile bigtian 2022-07-08 16:56:12 +08:00