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;
@@ -24,7 +23,7 @@ import java.io.PrintStream;
 @EnableTransactionManagement
 @SpringBootApplication
 @EnableWebMvc
-@EnableSSO
+//@EnableSSO
 public class Application {
     public static void main(String[] args) throws FileNotFoundException {
         File logFile = new File("logs/log.log");

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

@@ -1,28 +0,0 @@
-package com.uas.ps.inquiry;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-/**
- * @author liusw
- * @version 2018/1/23 16:53
- */
-@Configuration
-public class CorsConfig extends WebMvcConfigurerAdapter {
-
-    /**
-     * 跨域问题
-     * @param registry
-     */
-    @Override
-    public void addCorsMappings(final CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowCredentials(true)
-                .allowedMethods("GET", "POST", "DELETE", "PUT")
-                .maxAge(3600)
-                .allowedHeaders("Access-Control-Allow-Origin: *");
-    }
-
-}

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);
+
     /**
      * 应用来源
      */
@@ -202,7 +206,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             model.setReceiverEnuu(user.getEnuu());
                             model.setReceiverUu(user.getUseruu());
                             model.setSenderEnuu(item.getInquiry().getEnUU());
-                            model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
+                            if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
+                                model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
+                            } else {
+                               User admin = userDao.findOne(item.getInquiry().getEnUU());
+                               model.setSenderUu(null != admin ? admin.getUserUU() : 0L);
+                            }
                             model.setSmsType(SMS_TYPE);
                             model.setMailTemplate(MAIL_TEMP_ID);
                             model.setSmTemplate(SMS_TEMP_ID);
@@ -229,7 +238,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

@@ -20,4 +20,4 @@ datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMill
 
 # Access path
 ps.product.url=https://api-product.usoftmall.com/
-ps.message.url=https://api-message.ubtob.com/
+ps.message.url=http://api-message.ubtob.com/

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

@@ -1,4 +1,4 @@
-datasource.url=jdbc:mysql://192.168.253.12:3306/public_resources?characterEncoding=utf-8&useSSL=false
+datasource.url=jdbc:mysql://192.168.253.12:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false
 datasource.username=root
 datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
@@ -19,5 +19,9 @@ datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
 
 # Access path
-ps.product.url=http://192.168.253.12:24000/product/
-ps.message.url=http://192.168.253.12:24000/message/
+#ps.product.url=http://192.168.253.12:24000/product/
+#dong localhost
+ps.product.url=http://192.168.253.102:8080/
+ps.message.url=http://192.168.253.12:24000/message/
+# wang localhost
+#ps.message.url=http://192.168.253.131:20000/

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

@@ -19,5 +19,5 @@ datasource.filters=stat,slf4j
 datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
 
 # Access path
-ps.product.url=http://192.168.253.12:24000/product/
-ps.message.url=http://192.168.253.12:24000/message/
+ps.product.url=http://218.17.158.219:24000/product/
+ps.message.url=http://218.17.158.219:24000/message/