Commit Graph

63 Commits

Author SHA1 Message Date
b20ab0ff33 Merge branch 'master' into sim
# Conflicts:
#	src/main/resources/application.yml
2021-05-27 09:05:35 +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
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
008a108a95 添加apollo 2021-05-25 15:59:28 +08:00
a9dc1f24dc 添加apollo 2021-05-25 15:57:11 +08:00
8c3114cca7 添加apollo 2021-05-25 15:52:20 +08:00
131b3780eb 注册 UAT Skywalking
修改logback
2021-05-18 09:43:02 +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
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
aa59e599ad Merge branch 'master' into pro
# Conflicts:
#	src/main/resources/logback.xml
2021-04-23 16:58:08 +08:00
4103d833cc Update logback.xml 2021-04-22 14:43:19 +08:00
8a7a4dae15 统一日志输出 2021-04-22 14:19:45 +08:00
81aa01b3ea Update logback.xml 2021-04-13 09:54:09 +08:00
82b602d885 Update logback.xml 2021-04-13 09:47:30 +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
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
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
61c57a5390 Merge branch 'pro' into 'master'
# Conflicts:
#   src/main/resources/application.yml
2021-04-02 09:39:27 +08:00
d44411dcbc 时间戳服务 2021-04-01 11:18:00 +08:00
4adb9b2143 Merge branch 'master' into dev 2021-04-01 11:16:17 +08:00
453ae76e15 时间戳服务 2021-04-01 11:15:46 +08:00
cca90d636f 更新代码 2021-03-30 14:28:53 +08:00
08c6914459 Merge branch 'dev' into 'pro'
因天眼不支持中划线服务名,因此将其改为下划线

See merge request eshop/biz_service_ebtp_extend!21
2021-03-29 17:59:08 +08:00
ee7bda7f9f 因天眼不支持中划线服务名,因此将其改为下划线 2021-03-29 16:47:36 +08:00
62d8459926 Merge branch 'master' into 'pro'
Master

See merge request eshop/biz_service_ebtp_extend!19
2021-03-26 14:36:42 +08:00
c60369fdaa Update application.yml 2021-03-26 10:01:33 +08:00
487cad29df Update application.yml 2021-03-26 10:00:51 +08:00
61fe976781 修改配置文件 2021-03-26 09:11:52 +08:00
2c9ce47ed5 提交 2021-03-25 16:45:19 +08:00
ab10dd37cf 提交 2021-03-25 16:44:42 +08:00
15cde06082 返回文件输出流 2021-03-25 15:07:48 +08:00
c0c4eeef24 修改了生产环境的k8s配置 2021-03-23 16:07:45 +08:00
66ebb3d6cd test 2021-03-08 17:11:11 +08:00
338ef41645 测试环境 2021-03-08 16:52:57 +08:00
5d0f1a4d22 天宫无法连接204, 暂时不使用eureka注册seata 2021-03-04 17:19:49 +08:00
bc3801ea3b 消息概要查询接口增加分页功能 2021-03-04 17:11:25 +08:00
e62a21cf29 更新代码 2021-03-02 16:38:48 +08:00