Merge remote-tracking branch 'origin/master'

mjava-ts/src/main/java/com/malk/taisen/controller/NonPoCpntroller.java

@@ -31,10 +31,11 @@ public class NonPoCpntroller {
         log.info("NonpoController:notice {}", data);
         String instanceId = UtilMap.getString(data, "instanceId");
         String type = UtilMap.getString(data, "type");
+        String formUuid= UtilMap.getString(data,"formUuid");
         if (type.equals("Non-PoToSAP0005")) {
             log.info("泰森宜搭：Non-Po写入SAP0005 请求参数, {}", data);
             System.out.println("泰森宜搭：Non-Po写入SAP0005！::" + data);
-            NonPoServer.NonPoinsetSAP0005(type, instanceId);
+            NonPoServer.NonPoinsetSAP0005(type, instanceId,formUuid);
             System.out.println("泰森宜搭：Non-Po写入SAP0005！结束");
             log.info("泰森宜搭：Non-Po写入SAP0005！结束");
         }

mjava-ts/src/main/java/com/malk/taisen/service/NonPoServer.java

@@ -2,7 +2,7 @@ package com.malk.taisen.service;
 
 public interface NonPoServer {
 
-    void  NonPoinsetSAP0005(String type,String InstanceId);
+    void  NonPoinsetSAP0005(String type,String InstanceId,String formUuid);
 
     void
     NonPoinsetSAP0005list( );

mjava-ts/src/main/java/com/malk/taisen/service/impl/NonPoServerImpl.java

@@ -48,10 +48,10 @@ public class NonPoServerImpl implements NonPoServer {
      */
 
     private String QA_sapUrl = "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/10-QA-team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id=";
-    private String formUuid = "FORM-E9A6EBE00F3E4DA68681107F85600D80ZJUT";
+    //private String formUuid = "FORM-E9A6EBE00F3E4DA68681107F85600D80ZJUT";
 
     //    @Override
-    public void NonPoinsetSAP0005(String type, String InstanceId) {
+    public void NonPoinsetSAP0005(String type, String InstanceId,String formUuid) {
         YDParam ydParam = _getYDTokenKPD();
         ydParam.setFormInstanceId(InstanceId);
         DDR_New ddr = ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_id);

mjava-ts/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@
 server:
   port: 9001
   servlet:
-    context-path: /api/ts
+    context-path: /apits
 
 enable:
    scheduling: false

mjava-ts/src/main/resources/application-prod.yml

@@ -2,18 +2,18 @@
 server:
   port: 9090
   servlet:
-    context-path: /api/ts
+    context-path: /apits
 
 enable:
-  scheduling: true
+  scheduling: false
 
 # condition
 spel:
-  scheduling: true        # 定时任务是否执行
+  scheduling: false        # 定时任务是否执行
   multiSource: false      # 是否多数据源配置
 
 nc:
-  scheduling: true        # 定时任务是否执行
+  scheduling: false        # 定时任务是否执行
   multiSource: false      # 是否多数据源配置
 
 spring: