feature：同步组织信息

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java

@@ -64,10 +64,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import static org.joda.time.DateTime.now;
 
@@ -430,8 +427,10 @@ public class InvoiceRestApiV6 {
             String bskey = isInput.getBSKEY();//jsonObject2.getString("BSKEY");
             String sapkey = isInput.getSAPKEY();//jsonObject2.getString("SAPKEY");
             String s = "";
+            JSONObject result = new JSONObject();
+
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("BSKEY",bskey);
+            jsonObject.put("BSKEY",UUID.randomUUID().toString().replaceAll("-",""));
             jsonObject.put("SAPKEY",sapkey);
             jsonObject.put("ZTYPE","E");
             jsonObject.put("ZMESSAGE","处理失败");
@@ -452,7 +451,8 @@ public class InvoiceRestApiV6 {
                 jsonObject.put("ZMESSAGE","处理失败");
             }
             log.info("同步组织信息返回报文：{}",jsonObject.toJSONString());
-            return jsonObject.toJSONString();
+            result.put("ES_OUTPUT",jsonObject);
+            return result.toJSONString();
         }else{
             returnJsonString = "";
         }

order-management-consumer/src/main/resources/bootstrap-dev.yaml

@@ -4,15 +4,15 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 10.1.1.72:8848
+        server-addr: 172.31.36.147:33000
         # Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
-        namespace: sdenergy-order
+        namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524
         # Nacos config 分组
         group: sims-order-config
         # Nacos config 登录用户名
         username: nacos
         # Nacos config 登录密码
-        password: nacos
+        password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
         prefix: sims-order-api
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}

order-management-consumer/src/main/resources/bootstrap.yaml

@@ -6,8 +6,8 @@ spring:
     name: order-api
   profiles:
     # Spring 配置文件读取
-    active: @deployType@
+#    active: @deployType@
-#    active: dev
+    active: dev
 #    active: std
     #active: test
   jackson: