NPO配置更改

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

@@ -20,12 +20,14 @@ public class  ProxyController {
     private final RestTemplate restTemplate = new RestTemplate();
     //@Value(value = "${sap.TARGET_URL_Poc}")
     //测试地址
-  private String  TARGET_URL ="http://139.224.3.140:8091/stms/openapi/income/bookkeeping";
+//  private String  TARGET_URL ="http://139.224.3.140:8091/stms/openapi/income/bookkeeping";
+    //正式地址
+    //  private String  TARGET_URL ="http://106.15.251.153:8091/stms/openapi/ts/income/bookkeeping";
 
 
+    @Value(value = "${hangxing.TARGET_URL_Poc}")
+    private String  TARGET_URL ;
 
-    //正式地址
-  //  private String  TARGET_URL ="http://106.15.251.153:8091/stms/openapi/ts/income/bookkeeping";
 
     @PostMapping("/bookkeeping")
     public ResponseEntity<?> forwardRequest( @RequestBody Object requestBody) {

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

@@ -48,7 +48,7 @@ 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 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";
 
     /**
@@ -59,6 +59,10 @@ public class NonPoServerImpl implements NonPoServer {
      */
  //  private String QA_sapUrl = "https://etl-prod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonProd/Ultraprojects/team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id=";
 
+
+    @Value(value = "${sap.QA_sapUrl_Poc}")
+    private String  QA_sapUrl ;
+
     //    @Override
     public void NonPoinsetSAP0005(String type, String InstanceId,String formUuid) {
         YDParam ydParam = _getYDTokenKPD();

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

@@ -1,8 +1,8 @@
 # 环境配置
 server:
-  port: 9090
+  port: 9099
   servlet:
-    context-path: /api/ts
+    context-path: /apitsprod
 
 enable:
   scheduling: false
@@ -53,10 +53,10 @@ aliwork:
   systemToken: "UM6660D1PGF2O34KAVVKG8XZ756E3O06MZX5LW"
 
 sap:
-  QA_sapUrl_Poc: "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="
+  QA_sapUrl_Poc: "https://etl-prod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonProd/Ultraprojects/team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id="
   JT_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/10-QA-team-fssc/tk_oa_to_sap_r2r_generate_fi_document_with_copa?bearer_token=TVof6BjMdOvJreUmI9DzEepesFVwbfEc&interface_id=SAP020"
 #  JT_sapUrl_Poc: "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/00-STG-team-fssc/tk_oa_to_sap_r2r_generate_fi_document_with_copa?bearer_token=TVof6BjMdOvJreUmI9DzEepesFVwbfEc&interface_id=SAP020"
   TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
 
 hangxing:
-  TARGET_URL_Poc: "http://139.224.3.140:8091/stms/openapi/income/bookkeeping"
+  TARGET_URL_Poc: "http://106.15.251.153:8091/stms/openapi/ts/income/bookkeeping"

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

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

mjava-ts/src/test/java/test.java

@@ -45,7 +45,7 @@ public class test {
     /**
      * 测试地址
      */
-    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=";
+    //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 NonPoServer nonPoServer;