Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project

 Conflicts:

	buildpackage/src/main/resources/application-llg.yml

buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java

@@ -81,7 +81,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
     @Resource
     private IMdmModuleSendLogDao mdmModuleSendLogDao;
 
-    @Value("${ax.url}")
+    @Value("${zt.url}")
     private String url ;
 
     //多线程请求加锁 HttpRequest 构造方法是静态的

buildpackage/src/main/resources/application-ax.yml

@@ -19,5 +19,5 @@ spring:
 savefile:
     #    文件保存路径
   path: E:\yongansystem\file
-ax:
+zt:
   url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface

buildpackage/src/main/resources/application-hclocal.yml

@@ -23,5 +23,5 @@ spring:
 savefile:
     #    文件保存路径
   path: D:\yongansystem\kangarooDataCenter\v3\logs
-ax:
+zt:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

buildpackage/src/main/resources/application-llg.yml

@@ -31,7 +31,7 @@ spring:
 savefile:
   #    文件保存路径
   path: /Users/apple/Desktop/log/local
-ax:
+zt:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:
   appId: 1P4AGrpz

buildpackage/src/main/resources/application-local.yml

@@ -19,5 +19,5 @@ spring:
 savefile:
     #    文件保存路径
   path: /Users/apple/Desktop/log/local
-ax:
+zt:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

buildpackage/src/main/resources/application-yuqh.yml

@@ -19,5 +19,5 @@ spring:
 savefile:
     #    文件保存路径
   path: E:\yongansystem\log
-ax:
+zt:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

buildpackage/src/main/resources/application.yml

@@ -90,7 +90,7 @@ mybatis-plus:
   global-config:
     db-config:
       id-type: auto  # 主键策略
-ax:
+zt:
   url:
 # 积木报表工具
 #JimuReport[minidao配置]

service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java

@@ -150,7 +150,7 @@ public class MdmServiceImpl implements IMdmService {
     private IMdmModuleViewDetailDao mdmModuleViewDetailDao;
     //多线程请求加锁 HttpRequest 构造方法是静态的
     private final Object lock = new Object();
-    @Value("${ax.url}")
+    @Value("${zt.url}")
     private String url;
 
     /**

service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java

@@ -38,7 +38,7 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
 		this.axDao = dao;
 		this.dao = dao;
 	}
-	@Value("${ax.url}")
+	@Value("${zt.url}")
 	private String voucherUrl;
 	private final String publicKey = "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj";
 	private final String secretKey = "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=";