Browse Source

修复因配置导致的启动报错问题

chenw 6 years ago
parent
commit
2c27d160d3

+ 2 - 1
applications/document/document-server/src/main/resources/application.yml

@@ -98,4 +98,5 @@ b2b:
     inquiry: https://test-inquiry.uuzcc.cn
     Component: https://test-mall.uuzcc.cn
     product: http://test-product.uuzcc.cn
-    common: http://test-b2b.uuzcc.cn
+    common: http://test-b2b.uuzcc.cn
+    post: https://test-b2b-post.uuzcc.cn

+ 2 - 1
applications/money/money-server/src/main/resources/application.yml

@@ -84,4 +84,5 @@ b2b:
     inquiry: https://test-inquiry.uuzcc.cn
     Component: https://test-mall.uuzcc.cn
     product: http://test-product.uuzcc.cn
-    common: http://test-b2b.uuzcc.cn
+    common: http://test-b2b.uuzcc.cn
+    post: https://test-b2b-post.uuzcc.cn

+ 2 - 1
applications/purchase/purchase-server/src/main/resources/application.yml

@@ -96,4 +96,5 @@ b2b:
     inquiry: https://test-inquiry.uuzcc.cn
     Component: https://test-mall.uuzcc.cn
     product: http://test-product.uuzcc.cn
-    common: http://test-b2b.uuzcc.cn
+    common: http://test-b2b.uuzcc.cn
+    post: https://test-b2b-post.uuzcc.cn

+ 2 - 1
applications/sale/sale-server/src/main/resources/application.yml

@@ -97,4 +97,5 @@ b2b:
     inquiry: https://test-inquiry.uuzcc.cn
     Component: https://test-mall.uuzcc.cn
     product: http://test-product.uuzcc.cn
-    common: http://test-b2b.uuzcc.cn
+    common: http://test-b2b.uuzcc.cn
+    post: https://test-b2b-post.uuzcc.cn

+ 1 - 1
applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/EnConfigTest.java

@@ -35,7 +35,7 @@ public class EnConfigTest {
         addOrUpdateEnterpriseRequest.setSaasPost(true);
         addOrUpdateEnterpriseRequest.setAccessSecret("b0c0320f457149a0bac7d115a55d9f9f");
         String responseHeader = enConfigApi.addOrUpdateEnterprise(addOrUpdateEnterpriseRequest);
-        System.out.println(JsonUtils.fromJsonString(responseHeader, ResponseHeader.class));
+        System.out.println(responseHeader);
     }
 
     @Test

+ 2 - 1
applications/transfers/transfers-server/src/main/resources/application.yml

@@ -95,4 +95,5 @@ b2b:
     inquiry: https://test-inquiry.uuzcc.cn
     Component: https://test-mall.uuzcc.cn
     product: http://test-product.uuzcc.cn
-    common: http://test-b2b.uuzcc.cn
+    common: http://test-b2b.uuzcc.cn
+    post: https://test-b2b-post.uuzcc.cn

+ 3 - 2
applications/transfers/transfers-server/src/test/java/com/usoftchina/saas/transfers/task/SendPurchaseEndTaskTest.java

@@ -10,6 +10,7 @@ import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
 import com.usoftchina.saas.transfers.config.B2BConfig;
 import com.usoftchina.saas.transfers.utils.SendUtil;
 import com.usoftchina.saas.utils.CollectionUtils;
+import com.usoftchina.saas.utils.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -66,8 +67,8 @@ public class SendPurchaseEndTaskTest {
             //添加身份ID
             String url = b2bConfig.getCommon() + purchaseEndUrl + "?access_id=" + companyDTO.getUu();
             //发送给b2b
-            boolean success = SendUtil.sendToB2B(url, JSON.toJSONString(purchaseDetailEndList), companyDTO.getAccessKey());
-            if (success) {
+            String message = SendUtil.sendToB2B(url, JSON.toJSONString(purchaseDetailEndList), companyDTO.getAccessKey());
+            if (StringUtils.isEmpty(message)) {
                 LOGGER.info("上传成功!");
             } else {
                 LOGGER.info("上传失败!");

+ 3 - 2
applications/transfers/transfers-server/src/test/java/com/usoftchina/saas/transfers/task/SendPurchaseTaskTest.java

@@ -14,6 +14,7 @@ import com.usoftchina.saas.transfers.utils.SendUtil;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.ObjectUtils;
+import com.usoftchina.saas.utils.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -67,8 +68,8 @@ public class SendPurchaseTaskTest {
             //将数据改为B2B数据格式
             List<Purchase> data = new ArrayList<Purchase>();
             data.add(b2bPurchase);
-            boolean success = SendUtil.sendToB2B(url, JSON.toJSONString(data), "bece5de0b15742d69738819b4e008ac8");
-            if (success){
+            String message = SendUtil.sendToB2B(url, JSON.toJSONString(data), "bece5de0b15742d69738819b4e008ac8");
+            if (StringUtils.isEmpty(message)){
                 LOGGER.info("上传成功!");
             } else {
                 LOGGER.info("上传失败!");