update->上传配置文件。平台修改企业菜单，无法删除问题修复

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

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -18,11 +18,39 @@ spring:
         max-wait: 20000ms
         min-idle: 0
     timeout: 600000s
+  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
+  servlet:
+    multipart:
+      #配置文件接收大小最大为3MB
+      max-file-size: 3MB
 
 #aliyun OSS服务配置信息，加载到SystemConfiguration
 aliyun:
   oss:
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    #    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    #使用内网需要把返回的路径 -internal去掉，不然外网无法访问
+    endpoint: http://oss-cn-hangzhou-internal.aliyuncs.com
     bucketName: ty-oss-file
     accessKeyId: LTAI4G1iLTczu8JxM2En57gY
     accessKeySecret: VHeRj3C2br87Uh447ruHsSTvYSDWeC

lift-batch-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,4 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://192.168.1.121:10225/eureka/
-
+      defaultZone: http://172.16.24.142:10225/eureka/

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

@@ -160,7 +160,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
                 .eq("company_id", companyId)
         );
         if (needDeleteCompanyMenuList != null && needDeleteCompanyMenuList.size() > 0) {
-            List<Long> companyMenuIds = needDeleteCompanyMenuList.stream().map(CompanyMenu::getMenuId).
+            List<Long> companyMenuIds = needDeleteCompanyMenuList.stream().map(CompanyMenu::getId).
                     collect(Collectors.toList());
             if (companyMenuIds.size() > 0) {
                 if (!companyMenuService.removeByIds(companyMenuIds)) {

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

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址，上线改为内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -18,10 +18,9 @@ spring:
         max-wait: 20000ms
         min-idle: 0
     timeout: 600000s
-  # activeMQ 移动端消息推送配置
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://121.40.209.47:61616
+    broker-url: tcp://172.16.24.145:61616
     #用户名
     user: admin
     #密码
@@ -41,11 +40,17 @@ spring:
   jms:
     #如果是点对点（queue），那么此处默认应该是false，如果发布订阅，那么一定设置为true
     pub-sub-domain: false
+  servlet:
+    multipart:
+      #配置文件接收大小最大为3MB
+      max-file-size: 3MB
 
 #aliyun OSS服务配置信息，加载到SystemConfiguration
 aliyun:
   oss:
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    #    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    #使用内网需要把返回的路径 -internal去掉，不然外网无法访问
+    endpoint: http://oss-cn-hangzhou-internal.aliyuncs.com
     bucketName: ty-oss-file
     accessKeyId: LTAI4G1iLTczu8JxM2En57gY
     accessKeySecret: VHeRj3C2br87Uh447ruHsSTvYSDWeC

lift-system-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,4 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://192.168.1.121:10225/eureka/
-
+      defaultZone: http://172.16.24.142:10225/eureka/