Commit Graph

60 Commits

Author SHA1 Message Date
c1a875c3a1 发送短信测试 2021-06-25 09:50:06 +08:00
c725e6ea72 发送短信测试 2021-06-23 16:11:36 +08:00
8c479079ef Merge branch 'uat' into dev
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java
#	src/main/resources/application.yml
2021-05-25 16:05:16 +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
514dbd25ac dev环境还原 2021-05-07 14:46:11 +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
dd8aebc500 dev环境改成uat的数据库链接 2021-05-06 14:50:17 +08:00
d5bc2ec5a7 Merge remote-tracking branch 'origin/export' into dev
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml
#	src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java
2021-05-06 14:44:37 +08:00
ddd2f1fa80 重构 报表打印 2021-04-28 09:50:54 +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
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
90a2d2e351 重构报表打印 2021-04-12 10:54:30 +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
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
076edce6ed 评标报告下载 2021-03-02 14:13:29 +08:00
3db70ba259 更新代码 2021-02-25 20:03:58 +08:00
14f2dddd0a 增加了部分模板文件 2021-02-25 19:40:22 +08:00