Commit Graph

159 Commits

Author SHA1 Message Date
4fe1d2814b Update application-sim.yml 2021-05-14 14:44:23 +08:00
8e85fbc2fd 修改sim配置文件 2021-05-14 09:28:23 +08:00
760e0a2798 Merge branch 'master' into 'pro'
Master

See merge request eshop/biz_service_ebtp_extend!39
2021-04-25 16:35:44 +08:00
014f2cd942 Merge branch 'dev' into 'master'
修改实体bug

See merge request eshop/biz_service_ebtp_extend!38
2021-04-25 16:35:30 +08:00
f4a02562d5 修改实体bug 2021-04-25 16:33:02 +08:00
bc138d98d7 Merge branch 'master' into 'pro'
Master

See merge request eshop/biz_service_ebtp_extend!37
2021-04-25 16:25:04 +08:00
d436db8555 Merge branch 'dev' into 'master'
修改实体bug

See merge request eshop/biz_service_ebtp_extend!36
2021-04-25 16:24:52 +08:00
d8a0669919 修改实体bug 2021-04-25 16:24:32 +08:00
aa59e599ad Merge branch 'master' into pro
# Conflicts:
#	src/main/resources/logback.xml
2021-04-23 16:58:08 +08:00
1aee6195e4 Merge branch 'dev' into 'master'
重构开标一览表

See merge request eshop/biz_service_ebtp_extend!34
2021-04-23 16:54:35 +08:00
9bd070550c 重构开标一览表 2021-04-23 16:54:04 +08:00
4103d833cc Update logback.xml 2021-04-22 14:43:19 +08:00
8a7a4dae15 统一日志输出 2021-04-22 14:19:45 +08:00
17b964fef0 增加JVM堆内存设置 2021-04-22 14:18:33 +08:00
0f400a10af Merge branch 'dev' into 'master'
修改实体

See merge request eshop/biz_service_ebtp_extend!33
2021-04-21 16:07:17 +08:00
949c548896 修改实体 2021-04-21 16:06:17 +08:00
114557eee4 Merge branch 'dev' into 'master'
新增接口,查询最低最高版本号

See merge request eshop/biz_service_ebtp_extend!32
2021-04-21 15:56:14 +08:00
40042d3b78 新增接口,查询最低最高版本号 2021-04-21 15:55:09 +08:00
81663db71c Merge branch 'patch-3' into 'master'
Update logback.xml

See merge request eshop/biz_service_ebtp_extend!31
2021-04-13 09:54:14 +08:00
81aa01b3ea Update logback.xml 2021-04-13 09:54:09 +08:00
39c387dbed 时间戳服务BUG修复 2021-04-13 09:49:43 +08:00
9f4be83df5 Merge branch 'patch-2' into 'master'
Update logback.xml

See merge request eshop/biz_service_ebtp_extend!30
2021-04-13 09:47:36 +08:00
82b602d885 Update logback.xml 2021-04-13 09:47:30 +08:00
83044f0ac3 Merge branch 'dev' into 'master'
时间戳服务器修改

See merge request eshop/biz_service_ebtp_extend!29
2021-04-13 09:45:48 +08:00
be11afa86f 时间戳服务BUG修复 2021-04-13 09:35:39 +08:00
c8b3d5cbcd 修改配置文件 2021-04-12 17:25:00 +08:00
042f4699b1 Update application-uat.yml 2021-04-12 17:18:53 +08:00
78888192f4 Update logback.xml 2021-04-12 16:51:18 +08:00
bb828681f6 Update application-uat.yml 2021-04-12 14:04:53 +08:00
e2c822e45a Merge branch 'dev' into 'master'
Dev

See merge request eshop/biz_service_ebtp_extend!28
2021-04-10 12:19:42 +08:00
d3321c162f Revert "修改天宫环境"
This reverts commit 804c9463
2021-04-10 11:48:00 +08:00
804c9463b7 修改天宫环境 2021-04-10 11:40:31 +08:00
eade35d0ca Update logback.xml 2021-04-10 11:12:57 +08:00
832ce161d4 Update application-uat.yml 2021-04-10 11:12:37 +08:00
4f3b72a2a1 Update deployment-gz.yaml 2021-04-10 11:10:19 +08:00
42288fc004 Update config-gz 2021-04-10 11:09:10 +08:00
880735f354 Merge branch 'dev' into 'master'
Dev

See merge request eshop/biz_service_ebtp_extend!27
2021-04-09 09:28:41 +08:00
a0963112b9 Merge remote-tracking branch 'origin/dev' into dev 2021-04-09 09:18:08 +08:00
7c6a759bcc 测试权限控制 2021-04-09 09:17:52 +08:00
2fa4497eeb 时间戳服务 2021-04-09 09:15:55 +08:00
a7f8afb2e5 时间戳服务 2021-04-08 15:50:20 +08:00
068628c214 时间戳服务 2021-04-08 15:45:48 +08:00
901eb53864 Merge remote-tracking branch 'origin/dev' into dev 2021-04-08 15:36:03 +08:00
969ebec653 时间戳服务 2021-04-08 15:35:45 +08:00
a98b2398dd Merge branch 'dev' into 'master'
返回流加Content-Length

See merge request eshop/biz_service_ebtp_extend!26
2021-04-08 09:40:28 +08:00
9524e2942b 返回流加Content-Length 2021-04-08 09:40:02 +08:00
f84dfdb2e1 Merge branch 'patch-1' into 'master'
Update application.yml

See merge request eshop/biz_service_ebtp_extend!25
2021-04-08 09:16:52 +08:00
b70fc58282 Update application.yml 2021-04-08 09:16:41 +08:00
b371a46fe7 Merge branch 'dev' into 'master'
时间戳服务

See merge request eshop/biz_service_ebtp_extend!24
2021-04-08 09:15:17 +08:00
cbe6c31c16 时间戳服务 2021-04-08 09:14:33 +08:00