Browse Source

Merge remote-tracking branch 'origin/https2412' into https2412

njs 1 year ago
parent
commit
7aa2994fd1

+ 1 - 1
suishenbang-admin/src/main/resources/application-dev.yml

@@ -99,7 +99,7 @@ spring:
     #TMS接口地址
     tmsUrl: https://lbtest.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
     tmsToken: EZS2020
-    suishenbang: http://suishenbangtest.nipponpaint.com.cn/oneportal
+    suishenbang: https://suishenbangtest.nipponpaint.com.cn/oneportal
   mail:
     #邮件服务器地址
     host: mail.dgtis.com

+ 4 - 4
suishenbang-admin/src/main/resources/application-uat.yml

@@ -14,9 +14,9 @@ ruoyi:
   addressEnabled: false
   cloudPath: http://127.0.0.1:8000/
   #清空订单缓存
-  clearCachePath: http://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/clearCache
-  orderGetDataHook: http://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/orderGetDataHook
-  deliverGetDataHook: http://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/deliverGetDataHook
+  clearCachePath: https://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/clearCache
+  orderGetDataHook: https://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/orderGetDataHook
+  deliverGetDataHook: https://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/deliverGetDataHook
 #经销商微信接口相关配置
 customer:
   appid: ap4f8e6a38b6142187
@@ -102,7 +102,7 @@ spring:
     #TMS接口地址
     tmsUrl: https://lbtest.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
     tmsToken: EZS2020
-    suishenbang: http://suishenbangtest.nipponpaint.com.cn/oneportal
+    suishenbang: https://suishenbangtest.nipponpaint.com.cn/oneportal
 
   mail:
     #邮件服务器地址

+ 1 - 1
suishenbang-admin/src/main/resources/templates/system/alertConfiguration/add.html

@@ -108,7 +108,7 @@
 <script type="text/javascript">
     var prefix = ctx + "system/configuration"
     // var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
-    var getCompanyListPrefix = "http://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
+    var getCompanyListPrefix = "https://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
 
     var photoUrl;
     var options = {

+ 1 - 1
suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html

@@ -117,7 +117,7 @@
     <script type="text/javascript">
         var prefix = ctx + "system/configuration";
         // var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
-        var getCompanyListPrefix = "http://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
+        var getCompanyListPrefix = "https://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
 
         var photoUrl;
         var options = {

+ 2 - 2
suishenbang-api/src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ ruoyi:
   #是否开启swagger
   openSwagger: true
   cloudPath: http://10.32.2.212:8000/
-  clearCachePath: http://suishenbangtest.nipponpaint.com.cn/order/meta-hana-sales-order/clearCache
+  clearCachePath: https://suishenbangtest.nipponpaint.com.cn/order/meta-hana-sales-order/clearCache
   orderGetDataHook: http://ss.libang.dgtis.com/order/meta-hana-sales-order/orderGetDataHook
   deliverGetDataHook: http://ss.libang.dgtis.com/order/meta-hana-sales-order/deliverGetDataHook
 
@@ -98,7 +98,7 @@ spring:
     #TMS接口地址
     tmsUrl: https://lbtest.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
     tmsToken: EZS2020
-    suishenbang: http://suishenbangtest.nipponpaint.com.cn/oneportal
+    suishenbang: https://suishenbangtest.nipponpaint.com.cn/oneportal
   mail:
     #邮件服务器地址
     host: mail.dgtis.com

+ 7 - 7
suishenbang-api/src/main/resources/application-uat.yml

@@ -13,9 +13,9 @@ ruoyi:
   #是否开启swagger
   openSwagger: true
   cloudPath: http://127.0.0.1:8000/
-  clearCachePath: http://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/clearCache
-  orderGetDataHook: http://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/orderGetDataHook
-  deliverGetDataHook: http://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/deliverGetDataHook
+  clearCachePath: https://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/clearCache
+  orderGetDataHook: https://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/orderGetDataHook
+  deliverGetDataHook: https://suishenbangtest.nipponpaint.com.cn/gateway/order/order/meta-hana-sales-order/deliverGetDataHook
 #接口安全验证
 security:
   #接口过期时间
@@ -74,7 +74,7 @@ spring:
     #TMS接口地址
     tmsUrl: https://lbtest.lutms.com/wuliu/apissbzt/ssb_update_authFile.do
     tmsToken: EZS2020
-    suishenbang: http://suishenbangtest.nipponpaint.com.cn/oneportal
+    suishenbang: https://suishenbangtest.nipponpaint.com.cn/oneportal
   mail:
     #邮件服务器地址
     host: mail.dgtis.com
@@ -146,10 +146,10 @@ esign:
 #  appSecret: ee1321fd61ef055cbfff588085ce0cd2
 #  serviceUrl: https://openapi.esign.cn
   #  个人认证回调url
-  personNotifyUrl: http://suishenbangtest.nipponpaint.com.cn/wxportal-api/eSign/updateUserIsAuthentication
+  personNotifyUrl: https://suishenbangtest.nipponpaint.com.cn/wxportal-api/eSign/updateUserIsAuthentication
   #  企业认证成功回调url
-  organNotifyUrl: http://suishenbangtest.nipponpaint.com.cn/wxportal-api/eSign/updateCustomersIsAuthentication
+  organNotifyUrl: https://suishenbangtest.nipponpaint.com.cn/wxportal-api/eSign/updateCustomersIsAuthentication
   #  签署成功回调url
-  signSuccessUrl: http://suishenbangtest.nipponpaint.com.cn/wxportal-api/eSign/updateOrderFile
+  signSuccessUrl: https://suishenbangtest.nipponpaint.com.cn/wxportal-api/eSign/updateOrderFile
   #  下载后的PDF路径
   fileUrl: /home/admin/project/file/pdf