Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

lift-batch-service/src/main/java/cn/com/ty/lift/batch/config/CustomCORSConfiguration.java

@@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter;
  * @date 2019-12-10
  * @description
  */
-@Configuration
+//@Configuration
 public class CustomCORSConfiguration {
     private CorsConfiguration buildConfig(){
         CorsConfiguration corsConfiguration = new CorsConfiguration();
@@ -23,7 +23,7 @@ public class CustomCORSConfiguration {
     }
 
     // 添加CorsFilter拦截器，对任意的请求使用
-    @Bean
+    //@Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", buildConfig());

lift-push-pc/src/main/java/cn/com/ty/lift/push/websocket/handler/TimeyMessageHandler.java

@@ -41,7 +41,7 @@ public class TimeyMessageHandler implements WebSocketHandler {
     public void afterConnectionEstablished(WebSocketSession session) {
         //用户登录连接后，将用户id放入到在线用户列表中
         Long userId = getCurrentUser(session);
-        if (userId == null) {
+        if (userId != null) {
             users.put(userId, session);
             //获取用户实时消息
             List<TimeMessage> TimeMessageList = timeMessageService.list(new QueryWrapper<TimeMessage>()

lift-push-pc/src/main/resources/application-prod.yml

@@ -5,6 +5,20 @@ spring:
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
 
+  #redis缓存配置
+  redis:
+    database: 0 #数据库索引，默认为0
+    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址，上线改为内网地址)服务器地址
+    port: 6379 #端口
+    password: Gdkc-290431 #验证密码
+    jedis:
+      pool:
+        max-active: 8 #最大连接数
+        max-idle: 8 #最大空闲链接
+        max-wait: 20000ms
+        min-idle: 0
+    timeout: 600000s
+
   # activemq配置
   activemq:
     #ActiveMQ通讯地址

lift-push-pc/src/main/resources/application.yml

@@ -2,8 +2,6 @@ server:
   port: 20240
 #  tomcat:
 #    basedir: /Users/huangyuan/application/tomcat/data/tomcat_temp
-  tomcat:
-    basedir: /home/ying/server/application/tomcat/data/zuul_tomcat_temp
 
 spring:
   application:

lift-quan-service/pom.xml

@@ -16,10 +16,10 @@
             <groupId>cn.com.xwy</groupId>
             <artifactId>xwy-spring-boot</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>cn.com.xwy</groupId>-->
-<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.com.xwy</groupId>
+            <artifactId>xwy-cloud-dependencies</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.com.ty</groupId>
             <artifactId>lift-common</artifactId>

lift-quan-service/src/main/java/cn/com/ty/lift/quan/config/CustomCORSConfiguration.java

@@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter;
  * @date 2020-04-10
  * @description 跨域
  */
-@Configuration
+//@Configuration
 public class CustomCORSConfiguration {
     private CorsConfiguration buildConfig(){
         CorsConfiguration corsConfiguration = new CorsConfiguration();
@@ -23,7 +23,7 @@ public class CustomCORSConfiguration {
     }
 
     // 添加CorsFilter拦截器，对任意的请求使用
-    @Bean
+    //@Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", buildConfig());

lift-quan-service/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: lift-quan-service
   profiles:
-    active: test
+    active: prod
   servlet:
     multipart:
       enabled: true

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -121,7 +121,7 @@ public class LoginService implements ILoginService {
         UserAccount userAccount = userAccountService.getByMobile(userRequest.getMobile());
         //验证手机号是否存在
         if (userAccount == null) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号尚未注册");
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号尚未注册") ;
         }
         //判断用户是否为物管端用户
         int userType = userAccount.getType() != null ? userAccount.getType() : ApiConstants.UserConstants.TYPE_USER;