Merge remote-tracking branch 'origin/master'

admin/src/main/resources/application-dev.yml

@@ -206,23 +206,12 @@ minio:
   accessKey: admin
   secretKey: admin123
   bucketName: mes
-
-#远程连接SAP
+#FeignClient地址
 remote:
-  sap:
-    username: rest_user
-    password: ximain123456
-    url: http://192.168.3.109:8000
-    path: sap/bc/erp_ep/
-  ep:
+  erp:
+    url: http://localhost:20090
     username: rest_user
     password: ximai123456
-    url: http://192.168.3.91:12000
-    path: sap/bc/erp_ep/
-    sapclient: 300
-  bpm:
-    url: http://192.168.3.91:8081
-    path: topsun-xt/syncOrg/syncOrgInfo.ajax
 #fiegn配置连接池
 feign:
   okhttp:

admin/src/main/resources/application-prod.yml

@@ -215,19 +215,10 @@ minio:
 
 #远程连接SAP
 remote:
-  sap:
+  erp:
+    url: http://localhost:20091
     username: rest_user
-    password: Ximai123456
-    url: http://192.168.3.109:8000
-    path: sap/bc/erp_ep/
-    sapclient: 310
-  ep:
-    url: http://192.168.3.91:12000
-    path: sap/bc/erp_ep/
-    sapclient: 300
-  bpm:
-    url: http://192.168.3.91:8081
-    path: topsun-xt/syncOrg/syncOrgInfo.ajax
+    password: ximai123456
 
 #fiegn配置连接池
 feign:

admin/src/main/resources/application-test.yml

@@ -217,21 +217,10 @@ minio:
 
 #远程连接SAP
 remote:
-  sap:
+  erp:
+    url: http://localhost:20090
     username: rest_user
-    password: Ximai123456
-    url: http://192.168.3.109:8000
-    path: sap/bc/erp_ep/
-    sapclient: 300
-  ep:
-    url: http://192.168.3.91:12000
-    path: /api/itemSerial
-    sapclient: 300
-    token: e10adc3949ba59abbe56e057f20f883e
-
-  bpm:
-    url: http://192.168.3.91:8081
-    path: topsun-xt/syncOrg/syncOrgInfo.ajax
+    password: ximai123456