Merge branches 'develop' and 'huangyuan-user' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

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

@@ -5,6 +5,8 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
 /**
  * @Author xwy
@@ -14,6 +16,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.dao.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
+@EnableRedisHttpSession
+@EnableRedisRepositories
 public class BatchApplication {
 
     public static void main(String[] args) {

lift-business-service/src/main/java/cn/com/ty/lift/business/BusinessApplication.java

@@ -5,7 +5,9 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.jms.annotation.EnableJms;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
 /**
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
+@EnableRedisHttpSession
+@EnableRedisRepositories
 public class BusinessApplication {
 
     public static void main(String[] args) {

lift-business-service/src/main/resources/application-prod.yml

@@ -20,7 +20,7 @@ spring:
     timeout: 600000s
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://121.40.209.47:61616
+    broker-url: tcp://172.16.24.145:61616
     #用户名
     user: admin
     #密码

lift-common/pom.xml

@@ -119,7 +119,11 @@
         <groupId>org.messaginghub</groupId>
         <artifactId>pooled-jms</artifactId>
         </dependency>
-
+        <!-- 分布式session -->
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/EnterpriseApplication.java

@@ -5,7 +5,9 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.jms.annotation.EnableJms;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
 /**
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
+@EnableRedisHttpSession
+@EnableRedisRepositories
 public class EnterpriseApplication {
 
     public static void main(String[] args) {

lift-enterprise-service/src/main/resources/application-prod.yml

@@ -22,7 +22,7 @@ spring:
   #消息队列配置
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://121.40.209.47:61616
+    broker-url: tcp://172.16.24.145:61616
     #用户名
     user: admin
     #密码

lift-push/src/main/java/cn/com/ty/lift/push/PushApplication.java

@@ -3,7 +3,9 @@ package cn.com.ty.lift.push;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.jms.annotation.EnableJms;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
 /**
  * 消息推送
@@ -14,6 +16,8 @@ import org.springframework.jms.annotation.EnableJms;
 @EnableJms
 @MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication
+@EnableRedisHttpSession
+@EnableRedisRepositories
 public class PushApplication {
 
     public static void main(String[] args) {

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

@@ -20,7 +20,7 @@ spring:
     timeout: 600000s
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://121.40.209.47:61616
+    broker-url: tcp://172.16.24.145:61616
     #用户名
     user: admin
     #密码

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

@@ -5,7 +5,9 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.jms.annotation.EnableJms;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
 /**
  * @Author xwy
@@ -16,6 +18,8 @@ import org.springframework.jms.annotation.EnableJms;
 @MapperScan("cn.com.ty.**.dao.mapper")
 @EnableJms
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
+@EnableRedisHttpSession
+@EnableRedisRepositories
 public class QuanApplication {
 
     public static void main(String[] args) {

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

@@ -7,7 +7,7 @@ spring:
 
   #redis缓存配置
   redis:
-    database: 1 #数据库索引，默认为0
+    database: 0 #数据库索引，默认为0
     host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
@@ -18,7 +18,28 @@ spring:
         max-wait: 20000ms
         min-idle: 0
     timeout: 600000
-
+  activemq:
+    #ActiveMQ通讯地址
+    broker-url: tcp://172.16.24.145:61616
+    #用户名
+    user: admin
+    #密码
+    password: admin
+    #true 表示使用内置的MQ，false则连接服务器: 消息持久化就必须spring.activemq.in-memory=false选项
+    in-memory: false
+    packages:
+      #信任所有的包: 如果直接发送对象消息，那么必须设置spring.activemq.packages.trust-all为true
+      trust-all: true
+    pool:
+      #true表示使用连接池；false时，每发送一条数据创建一个连接
+      enabled: true
+      #连接池最大连接数
+      max-connections: 30
+      #空闲的连接过期时间，默认为30秒
+      idle-timeout: 3000s
+  jms:
+    #如果是点对点（queue），那么此处默认应该是false，如果发布订阅，那么一定设置为true
+    pub-sub-domain: false
 #aliyun OSS服务配置信息，加载到SystemConfiguration
 aliyun:
   oss:

lift-system-service/src/main/java/cn/com/ty/lift/system/SystemApplication.java

@@ -5,7 +5,9 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.jms.annotation.EnableJms;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
 /**
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 @MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
 @CrossOrigin
+@EnableRedisHttpSession
+@EnableRedisRepositories
 public class SystemApplication {
 
     public static void main(String[] args) {

lift-system-service/src/main/resources/application-prod.yml

@@ -21,7 +21,7 @@ spring:
   # activeMQ 移动端消息推送配置
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://121.40.209.47:61616
+    broker-url: tcp://172.16.24.145:61616
     #用户名
     user: admin
     #密码