diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 16f954a..0a14643 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: Casic203 redis: host: 111.198.10.15 port: 11412 @@ -29,10 +29,10 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ -# dir: D:\casic\tmp\ - uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ - dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ + uploadPath: D:\casic\tmp\ + dir: D:\casic\tmp\ +# uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ +# dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ meter: standardEquipment: #标准装置 remindDay: 30 #到期提醒,提前天数 diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 16f954a..0a14643 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: Casic203 redis: host: 111.198.10.15 port: 11412 @@ -29,10 +29,10 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ -# dir: D:\casic\tmp\ - uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ - dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ + uploadPath: D:\casic\tmp\ + dir: D:\casic\tmp\ +# uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ +# dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ meter: standardEquipment: #标准装置 remindDay: 30 #到期提醒,提前天数 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java index 9b14d70..c770f0e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java @@ -46,7 +46,8 @@ * 3、设置文件id,作为操作空间文件名称,防止对其他同时处理的证书形成影响 */ protected final FilePrintRegister initialization(String templateFileDir, - Long id, ModuleTemplatePrintConfig moduleTemplatePrintConfig) { + Long id, + ModuleTemplatePrintConfig moduleTemplatePrintConfig) { FilePrintRegister filePrintRegister = new FilePrintRegister(); templateFileDir = templateFileDir + id + File.separator; //处理待填充模板