Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application-prod.yml

@@ -57,9 +57,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://127.0.0.1:3306/wuye_guanli_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: root
+          password: zhaoshang@2018
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -106,13 +106,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: localhost
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 10
     # redis 密码必须配置
-    password: ruoyi123
+    password: D3fQYAsw
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -129,7 +129,7 @@ redisson:
   # 单节点配置
   singleServerConfig:
     # 客户端名称 不能用中文
-    clientName: RuoYi-Vue-Plus
+    clientName: wuye_guanli_v2
     # 最小空闲连接数
     connectionMinimumIdleSize: 32
     # 连接池大小
@@ -182,11 +182,11 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: 您的accessKey
+      access-key-id: LTAI5tNA2fcBJH6EWRH6Pxr6
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: 您的accessKeySecret
-      signature: 您的短信签名
-      sdk-app-id: 您的sdkAppId
+      access-key-secret: 5WdaPEOvC3u9LC7pwy2DQ9pgmJvgUr
+      signature: 中新云
+#      sdk-app-id: 您的sdkAppId
 #    config2:
 #      # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
 #      supplier: tencent
@@ -198,7 +198,7 @@ sms:
 --- # 三方授权
 justauth:
   # 前端外网访问地址
-  address: http://localhost:80
+  address: https://zhsq.qs163.cn
   type:
     maxkey:
       # maxkey 服务器地址

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ResidentInfoServiceImpl.java

@@ -240,7 +240,7 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
             if (houseInfoRedidentList != null && !houseInfoRedidentList.isEmpty()) {
                 //新增房屋信息到房屋用户表中
                 TenantHelper.ignore(() -> {
-                    return houseInfoRedidentMapper.insertBatch(houseInfoRedidentList);
+                    return houseInfoRedidentMapper.insertOrUpdateBatch(houseInfoRedidentList);
                 });
             }
         }