澳星拉取主分支代码，切换数据库

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

@@ -12,12 +12,18 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          url: jdbc:mysql://127.0.0.1:3306/businesscenter_new?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
           username: root
           password: 62e4295b615a30dbf3b8ee96f41c820b
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+#          url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+#          username: root
+#          password: 62e4295b615a30dbf3b8ee96f41c820b
+#          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 savefile:
     #    文件保存路径
   path: E:\yongansystem\file
+ax:
+  url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface
 zt:
   url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface

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

@@ -32,7 +32,7 @@ spring:
 #          type: com.alibaba.druid.pool.DruidDataSource
           url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
           username: root
-          password: bd993088e8a7c3dc5f44441617f9b4bf
+          password: 62e4295b615a30dbf3b8ee96f41c820b
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 #          url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
 #          url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
@@ -42,7 +42,7 @@ spring:
 savefile:
   #    文件保存路径
   path: /Users/apple/Desktop/log/local
-zt:
+ax:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:
   appId: 1P4AGrpz

service/src/main/java/com/hzya/frame/sys/file/download/service/impl/FileDownloadServiceImpl.java

@@ -33,10 +33,10 @@ public class  FileDownloadServiceImpl extends BaseService< FileDownloadEntity,Lo
 	@Value("${savefile.path}")
 	public String DSK;
 
-	@Value("${savefile.pluginpath}")
+	@Value("${savefile.pluginpath:}")
 	public String PLUGINPATH;
 
-	@Value("${savefile.tomcatpath}")
+	@Value("${savefile.tomcatpath:}")
 	public String TOMCATPATH;
 	@Autowired
 	public void setFileDownloadDao(IFileDownloadDao dao) {

service/src/main/java/com/hzya/frame/sys/file/upload/service/impl/FileUploadServiceImpl.java

@@ -43,7 +43,7 @@ public class FileUploadServiceImpl extends BaseService<FileUploadEntity, Long> i
     @Value("${savefile.path}")
     public String DSK;
 
-    @Value("${savefile.pluginpath}")
+    @Value("${savefile.pluginpath:}")
     public String PLUGINPATH;
 
     protected IFileUploadDao fileUploadDao;

service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java

@@ -121,7 +121,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
     @Resource
     private com.hzya.frame.sysnew.application.service.impl.ApplicationCache applicationCache;
 
-    @Value("${savefile.tomcatpath}")
+    @Value("${savefile.tomcatpath:}")
     public String TOMCATPATH;
     //多线程请求加锁 HttpRequest 构造方法是静态的
     private final Object lock = new Object();

service/src/main/java/com/hzya/frame/u8c/ax/entity/VoucherDetails.java

@@ -15,24 +15,7 @@ public class VoucherDetails {
     private String debitquantity;
     private String price;
 
-    public String getDebitquantity() {
-        return debitquantity;
-    }
-
-    public void setDebitquantity(String debitquantity) {
-        this.debitquantity = debitquantity;
-    }
-
-    public String getPrice() {
-        return price;
-    }
-
-    public void setPrice(String price) {
-        this.price = price;
-    }
     private String creditquantity;
-    private String debitquantity;
-    private String price;
 
     public List<Ass> getAss() {
         return ass;
@@ -129,4 +112,5 @@ public class VoucherDetails {
     public void setPrice(String price) {
         this.price = price;
     }
+
 }