Commit Graph

202 Commits

Author SHA1 Message Date
c0db0332e7 时间戳服务BUG修复 2021-07-16 14:13:40 +08:00
1d64577634 修改post 2021-07-16 11:32:32 +08:00
ede5432bbb Merge branch 'master' into 'sim'
Master

See merge request eshop/biz_service_ebtp_extend!49
2021-06-30 14:56:03 +08:00
e15d0a7c06 Merge branch 'master-password' into 'master'
Master password

See merge request eshop/biz_service_ebtp_extend!46
2021-06-18 08:41:40 +08:00
yss
ba7ccc4fd8 平台密码 2021-06-15 16:46:20 +08:00
yss
6ebd72bd55 平台密码 2021-06-15 16:40:19 +08:00
yss
d405d4d10f 平台密码 2021-06-15 16:02:18 +08:00
yss
6481d1b436 平台密码 2021-06-15 14:53:46 +08:00
8188e60cce Merge branch 'master-shared' into 'master'
修改共享文档查询条件

See merge request eshop/biz_service_ebtp_extend!42
2021-06-08 14:16:13 +08:00
e0d1ddd9d1 修改共享文档查询条件 2021-06-08 14:14:56 +08:00
b2a9cb9a1a 修改共享文档查询条件 2021-06-05 11:26:01 +08:00
72f4b7251f 修改配置 2021-05-28 14:29:37 +08:00
fcfa90fd64 Merge remote-tracking branch 'origin/uat' 2021-05-28 14:21:16 +08:00
0c7d019a6b 修改skywalking配置 2021-05-28 10:02:39 +08:00
bd9af4a277 修改skywalking配置 2021-05-28 09:46:55 +08:00
3da588dd86 1.日志挂载路径修改
2.就绪检测与存活检测规则修改
2021-05-27 18:00:32 +08:00
92a558004d 修改配置 2021-05-27 09:06:53 +08:00
b20ab0ff33 Merge branch 'master' into sim
# Conflicts:
#	src/main/resources/application.yml
2021-05-27 09:05:35 +08:00
cfc46b12eb 将shardingjdbc健康监测代码移动到脚手架 2021-05-26 23:28:15 +08:00
2230ec9549 调试shardingjdbc的健康监测 2021-05-26 23:23:04 +08:00
0366b47cdf Update application-sim.yml 2021-05-26 23:12:42 +08:00
203aff8355 Update application-sim.yml 2021-05-26 22:41:57 +08:00
6699dee8c1 Update application-sim.yml 2021-05-26 22:30:03 +08:00
8a7f1b4598 Update application-sim.yml 2021-05-26 22:26:33 +08:00
570e9beeb5 Update application-sim.yml 2021-05-26 22:23:05 +08:00
384fdd67b7 Update application-sim.yml 2021-05-26 22:19:58 +08:00
ad2083b041 Update sim.yaml 2021-05-26 22:13:14 +08:00
4a5e3cb897 Update application-sim.yml 2021-05-26 21:55:43 +08:00
95d75ea89f Update application-sim.yml 2021-05-26 21:50:01 +08:00
cef21c5ea6 日志卷 2021-05-26 18:37:09 +08:00
e8319836b5 修改日志挂在卷位置,增加k8s探针 2021-05-26 18:01:41 +08:00
b09f0e2f35 添加apollo 2021-05-25 16:00:11 +08:00
008a108a95 添加apollo 2021-05-25 15:59:28 +08:00
a9dc1f24dc 添加apollo 2021-05-25 15:57:11 +08:00
97f35d9d91 Merge branch 'master' into uat
# Conflicts:
#	src/main/resources/application.yml
2021-05-25 15:55:54 +08:00
8c3114cca7 添加apollo 2021-05-25 15:52:20 +08:00
6718acb3c5 Merge remote-tracking branch 'origin/pro' 2021-05-25 15:28:07 +08:00
131b3780eb 注册 UAT Skywalking
修改logback
2021-05-18 09:43:02 +08:00
b51f6eed90 添加CPU内存资源限制,防止服务部署异常 2021-05-15 14:22:51 +08:00
4fe1d2814b Update application-sim.yml 2021-05-14 14:44:23 +08:00
8e85fbc2fd 修改sim配置文件 2021-05-14 09:28:23 +08:00
fab63c6ba7 共享文档重构 2021-05-14 08:57:02 +08:00
c5001583af Update application-test.yml 2021-05-06 15:11:16 +08:00
fd407370d2 Update application-test.yml 2021-05-06 15:08:45 +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