Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -26,10 +26,10 @@
             <artifactId>ps-entity</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.uas.account</groupId>
-            <artifactId>sso-integration</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.uas.account</groupId>-->
+            <!--<artifactId>sso-integration</artifactId>-->
+        <!--</dependency>-->
 
         <!-- httpClient -->
         <dependency>

src/main/java/com/uas/ps/inquiry/Application.java

@@ -1,6 +1,5 @@
 package com.uas.ps.inquiry;
 
-import com.uas.account.sso.integration.config.EnableSSO;
 import com.uas.ps.core.util.ContextUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.ps.inquiry.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.core.util.ContextUtils;
 import com.uas.ps.entity.Product;
@@ -19,6 +20,7 @@ import com.uas.ps.inquiry.page.criteria.SimpleExpression;
 import com.uas.ps.inquiry.service.PublicInquiryService;
 import com.uas.ps.inquiry.util.*;
 import javassist.NotFoundException;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.domain.Page;
@@ -75,6 +77,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     @Autowired
     private EnterpriseDao enterpriseDao;
 
+    private static final Logger logger = Logger.getLogger(Logger.class);
+
     /**
      * 应用来源
      */
@@ -229,7 +233,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             @Override
             public void run() {
                 try {
-                    HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
+                    logger.info("发送消息实体" + JSON.toJSONString(models));
+                    String res = HttpUtil.doPost(PS_MESSAGE_URL + "/messages", FlexJsonUtils.toJsonDeep(models));
+                    logger.info("消息请求发送日志" + res);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

src/main/resources/config/application-cloud.properties

@@ -19,5 +19,7 @@ datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
 
 # Access path
-ps.product.url=https://api-product.usoftmall.com/
+#ps.product.url=https://api-product.usoftmall.com/
+# 外网访问不了，需要内网访问
+ps.product.url=10.10.0.197:8080
 ps.message.url=https://api-message.ubtob.com/