Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java

@@ -66,9 +66,9 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
 
     @Autowired
     private RestUtil restUtil;
-    @Value("${cbs8.elec_path}")
+    @Value("${cbs8.elec_path:}")
     private String elec_path;
-    @Value("${OA.data_source_code}")
+    @Value("${OA.data_source_code:}")
     private String oa_data_source_code;
     /**
      * 支付申请

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

@@ -6,7 +6,7 @@ logging:
   encodings: UTF-8
   file:
 #    日志保存路径
-    path: /Users/xiangerlin/work/app/logs/ydc
+    path: /Users/xiangerlin/work/app/logs/dev
 spring:
   datasource:
     dynamic:
@@ -18,7 +18,7 @@ spring:
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 savefile:
     #    文件保存路径
-  path: /Users/xiangerlin/work/app/logs/ydc
+  path: /Users/xiangerlin/work/app/file/dev
 cbs8:
   appId: 1P4AGrpz
   appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a

buildpackage/src/test/java/com/hzya/frame/temButtom.java

@@ -66,6 +66,8 @@ public class temButtom {
     @Autowired
     private PayResultPluginInitializer payResultPluginInitializer;
 
+
+
     @Test
     public void cbs8PluginTest(){
         try {

service/src/main/java/com/hzya/frame/cbs8/util/CBSUtil.java

@@ -87,21 +87,21 @@ public class CBSUtil {
     /**
      * 财资管理云公钥(平台公钥)
      */
-    @Value("${cbs8.cbs_public_key}")
+    @Value("${cbs8.cbs_public_key:}")
     public  void setBodyEncryptionKey(String bodyEncryptionKey) {
         CBSUtil.bodyEncryptionKey = bodyEncryptionKey;
     }
     /**
      * 企业私钥（解密）
      */
-    @Value("${cbs8.ya_private_key}")
+    @Value("${cbs8.ya_private_key:}")
     public  void setSignEncryptionPrivateKey(String signEncryptionPrivateKey) {
         CBSUtil.signEncryptionPrivateKey = signEncryptionPrivateKey;
     }
     /**
      * 企业私钥（解密）
      */
-    @Value("${cbs8.ya_private_key}")
+    @Value("${cbs8.ya_private_key:}")
     public  void setBodyDecryptionKey(String bodyDecryptionKey) {
         CBSUtil.bodyDecryptionKey = bodyDecryptionKey;
     }

service/src/main/java/com/hzya/frame/cbs8/util/CbsAccessToken.java

@@ -24,11 +24,11 @@ import java.util.Map;
 public class CbsAccessToken {
 
     private static final Logger logger = LoggerFactory.getLogger(CbsAccessToken.class);
-    @Value("${cbs8.appId}")
+    @Value("${cbs8.appId:}")
     private  String app_id;
-    @Value("${cbs8.appSecret}")
+    @Value("${cbs8.appSecret:}")
     private  String app_secret;
-    @Value("${cbs8.url}")
+    @Value("${cbs8.url:}")
     private  String app_url;
 
     private static String appId;

service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java

@@ -49,7 +49,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
     Logger logger = LoggerFactory.getLogger(getClass());
     @Autowired
     private RestUtil restUtil;
-    @Value("${savefile.path}")
+    @Value("${savefile.path:}")
     public String DSK;
     @Autowired
     private ISysApplicationDatabaseService sysApplicationDatabaseService;

service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml

@@ -346,6 +346,7 @@ where id = #{id}
                 `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
                 `company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
                 `data_id` varchar(100) DEFAULT NULL COMMENT 'data_id',
+                `mdm_up_id` varchar(100) DEFAULT NULL COMMENT 'mdm_up_id',
             </when>
             <when test="tableType  == '2'.toString()">
                 `id` varchar(50) NOT NULL COMMENT '唯一标识码',

service/src/main/java/com/hzya/frame/seeyon/cbs8/service/impl/CbsLogServiceImpl.java

@@ -39,7 +39,7 @@ public class CbsLogServiceImpl extends BaseService<CbsLogEntity,String> implemen
     Logger log = LoggerFactory.getLogger(getClass());
 
     private ICbsLogDao cbsLogDao;
-    @Value("${OA.data_source_code}")
+    @Value("${OA.data_source_code:}")
     private String oa_data_source_code;
     @Autowired
     public void setCbsLogDao(ICbsLogDao cbsLogDao) {