Commit Graph

401 Commits

Author SHA1 Message Date
0c20a391d1 修改xml内路径 2021-11-12 13:58:46 +08:00
0e3a0403cd 修改配置文件 2021-11-12 10:12:20 +08:00
739ba6d06d Merge remote-tracking branch 'remotes/origin/uat' into dev
# Conflicts:
#	pom.xml
2021-11-12 09:48:26 +08:00
480b02904d 短信功能增加开关 2021-11-11 15:18:51 +08:00
471227db7d 短信功能增加开关 2021-11-11 14:59:01 +08:00
f253e8d0cb 发短信功能改成不往数据库记日志,改成log输出了 2021-11-08 16:56:50 +08:00
7580d91910 Merge branch 'uat-v2' into 'uat'
Uat v2

See merge request eshop/biz_service_ebtp_extend!67
2021-10-29 16:00:10 +08:00
8d22ec7ef0 新增根据token获取用户信息接口 2021-10-25 15:39:23 +08:00
21cb9310c1 定时任务发送人发送人名给固定值 2021-10-25 15:34:34 +08:00
5b53bd733d 定时任务发送人发送人名给固定值 2021-10-25 14:58:10 +08:00
6d26b06ea6 Merge branch 'uat' into 'uat-v2'
未进入评审室的供应商,不应在报表打印里出现

See merge request eshop/biz_service_ebtp_extend!66
2021-10-25 11:09:42 +08:00
809caa25e7 未进入评审室的供应商,不应在报表打印里出现 2021-10-25 11:07:57 +08:00
fce49c2915 Merge branch 'uat' into 'uat-v2'
【生产】未进入评审室的供应商,不应在报表打印里出现

See merge request eshop/biz_service_ebtp_extend!65
2021-10-25 10:29:57 +08:00
5b6ff0dba3 【生产】未进入评审室的供应商,不应在报表打印里出现 2021-10-25 10:29:03 +08:00
4c157090cb 脚手架v2 2021-10-21 08:36:04 +08:00
522ba62744 Merge branch 'master' into 'uat'
Master

See merge request eshop/biz_service_ebtp_extend!64
2021-10-20 10:59:05 +08:00
cc88da3659 Merge branch 'sim' into 'master'
Sim

See merge request eshop/biz_service_ebtp_extend!63
2021-09-29 16:21:31 +08:00
02031a2bf1 Merge branch 'uat' into sim 2021-09-29 16:09:58 +08:00
a72464c0f0 发送短信接口 2021-09-24 14:49:28 +08:00
3a65d04c83 发送短信接口 2021-09-24 13:40:59 +08:00
168e309ea3 Merge remote-tracking branch 'remotes/origin/dev' into dev_sendMsg
# Conflicts:
#	pom.xml
#	src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java
#	src/main/resources/application-local.yml
2021-09-18 08:50:41 +08:00
dxc
d74b1aa932 定时任务本地测试日志输出 2021-09-17 15:21:03 +08:00
dxc
62c3b62c29 定时任务测试日志 2021-09-17 14:22:25 +08:00
dxc
7be724f71a 定时任务测试 2021-09-17 14:10:48 +08:00
dxc
900d8cc6ca 定时任务测试 2021-09-17 13:41:50 +08:00
dxc
a904822322 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pom.xml
2021-09-17 13:38:31 +08:00
dxc
19ceaf20d9 定时任务测试 2021-09-17 13:37:51 +08:00
d8f8520784 UAT区块链代码测试 2021-09-16 10:00:55 +08:00
607538bb52 UAT区块链代码测试 2021-09-16 09:45:08 +08:00
3b04bb1de3 区块链调试 2021-09-15 15:59:16 +08:00
36297fbc4c 区块链调试 2021-09-15 15:07:27 +08:00
a9794f0a87 Merge remote-tracking branch 'origin/uat' into uat 2021-09-15 14:47:32 +08:00
4b31184ba1 区块链调试 2021-09-15 14:46:31 +08:00
yss
3215c1e121 区块链根据mconfig.bss.app-secret 修改请求路径 2021-09-15 11:20:31 +08:00
yss
d5ecebbf81 区块链根据mconfig.bss.app-secret 修改请求路径 2021-09-15 11:14:01 +08:00
yss
1ded8d58c7 区块链根据mconfig.bss.app-secret 修改请求路径 2021-09-15 11:07:17 +08:00
yss
daa3566c43 区块链根据mconfig.bss.app-secret 修改请求路径 2021-09-15 10:58:48 +08:00
yss
476583936d 区块链修改为生产环境配置 2021-09-14 11:29:34 +08:00
yss
1ffcb167f9 区块链修改为生产环境配置 2021-09-14 11:23:48 +08:00
db24820fe1 区块链调试 2021-09-07 14:06:03 +08:00
2d62fa27e6 区块链调试 2021-09-06 16:44:44 +08:00
36dd6eacf2 区块链调试 2021-09-06 16:36:44 +08:00
7a8c26f1cb 区块链调试 2021-09-06 16:20:28 +08:00
d3d1749d5e 区块链调试 2021-09-06 15:48:29 +08:00
5af0522e46 区块链调试 2021-09-06 15:14:22 +08:00
21568b7a4e 区块链调试 2021-09-06 14:57:07 +08:00
b5b7c44c0e Merge branch 'dev' into uat 2021-09-06 09:57:07 +08:00
a3c7f2c559 Merge remote-tracking branch 'origin/dev' into dev 2021-09-06 09:56:28 +08:00
fa2515d851 传入加密参数保留null 2021-09-06 09:55:58 +08:00
yss
69300f6248 区块链日志 2021-09-03 15:06:30 +08:00