Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/application-dev.yml

@@ -6,6 +6,7 @@ server:
 # 文件存储配置
 file:
   upload-dir: D:/Temp_Spaces/ljlq-web/ruoyi/uploadPath
+#  upload-dir: /data/upload
 
 
 
@@ -38,7 +39,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 10.0.0.125:8848
+        server-addr: 127.0.0.1:8848
   aop:
     auto: true #开启spring的aop配置
     proxy-target-class: true
@@ -105,10 +106,10 @@ spring:
 
   # 天宫 redis 需要使用哨兵进行访问
   redis:
-    sentinel:
+#    sentinel:
-      master: mymaster
+#      master: mymaster
-      nodes: 10.0.0.125:6379
+#      nodes: 10.0.0.125:6379
-    password:
+#    password:
     database:
       sharding: 1
       cache: 2
@@ -142,7 +143,7 @@ mybatis-plus:
     auto-mapping-behavior: full
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
     # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:com/chinaunicom/**/*Mapper.xml
+  mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml,com/chinaunicom/zyhy/ebtp/**/mapper/*Mapper.xml
   global-config:
     # 逻辑删除配置
     db-config: