tianwu.sun 8 miesięcy temu
rodzic
commit
8efe95233b

+ 1 - 1
src/main/java/com/bootdo/common/config/DateConverConfig.java

@@ -21,7 +21,7 @@ public class DateConverConfig {
         return new Converter<String, Date>() {
             @Override
             public Date convert(String source) {
-                if(ObjectUtils.isEmpty(source)){
+                if(ObjectUtils.isEmpty(source) || ObjectUtils.isEmpty(source.trim()) ) {
                     return null;
                 }
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

+ 5 - 5
src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 bootdo:
-  uploadPath: C:/cicdebserver/res/
-  encPrival: C:/cicdebserver/sm2/sm2_client_enc_private.key
-  crtPrival: C:/cicdebserver/sm2/sm2_client_enc_cert.crt
-  licensePath: C:/cicdebserver/sm2/license.lic
+  uploadPath: D:/workspace_data/cic/cic-data-reportin-fujian/res/
+  encPrival: D:/workspace_data/cic/cic-data-reportin-fujian/sm2/sm2_client_enc_private.key
+  crtPrival: D:/workspace_data/cic/cic-data-reportin-fujian/sm2/sm2_client_enc_cert.crt
+  licensePath: D:/workspace_data/cic/cic-data-reportin-fujian/sm2/license.lic
   username: admin
   password: 111111
 
@@ -82,7 +82,7 @@ third-part-sso:
 # ca 证书配置
 ca:
   # cert 文件路径
-  file-path: D:/res
+  file-path: D:/workspace_data/cic/cic-data-reportin-fujian/res/ca
   # 信长城服务地址
   ra-url: http://1.202.72.10:18084/ra/pki/api/v1
   # ra授信平台id

+ 4 - 4
src/main/resources/application-test.yml

@@ -1,8 +1,8 @@
 bootdo:
   uploadPath: /opt/streams/service/cic-data/res/data_filing/
-  encPrival: /opt/streams/service/cic-data/data_filing/sm2/sm2_client_enc_private.key
-  crtPrival: /opt/streams/service/cic-data/data_filing/sm2/sm2_client_enc_cert.crt
-  licensePath: /opt/streams/service/cic-data/data_filing/sm2/license.lic
+  encPrival: /opt/streams/service/cic-data/data_filing/work/sm2/sm2_client_enc_private.key
+  crtPrival: /opt/streams/service/cic-data/data_filing/work/sm2/sm2_client_enc_cert.crt
+  licensePath: /opt/streams/service/cic-data/data_filing/work/sm2/license.lic
   username: admin
   password: 111111
 
@@ -82,7 +82,7 @@ third-part-sso:
 # ca 证书配置
 ca:
   # cert 文件路径
-  file-path: D:/res
+  file-path: /opt/streams/service/cic-data/data_filing/work/ca
   # 信长城服务地址
   ra-url: http://1.202.72.10:18084/ra/pki/api/v1
   # ra授信平台id