Merge remote-tracking branch 'origin/master'

ruoyi-admin/pom.xml

@@ -119,6 +119,14 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <requiresUnpack>
+                        <dependency>
+                            <groupId>org.bouncycastle</groupId>
+                            <artifactId>bcprov-jdk15on</artifactId>
+                        </dependency>
+                    </requiresUnpack>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -134,6 +142,15 @@
                     <warName>${project.artifactId}</warName>
                 </configuration>
             </plugin>
+            <!-- 单元测试使用 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

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

@@ -15,13 +15,13 @@ ruoyi:
   profile: /home/ruoyi/uploadPath
 
 --- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /ruoyi/server/temp
+# spring.servlet.multipart.location: /ruoyi/server/temp
 
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: false
-  url: http://localhost:9090/admin
+  url: http://127.0.0.1:9090/admin
   instance:
     service-host-type: IP
   username: boman
@@ -62,17 +62,17 @@ 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
+          url: jdbc:mysql://127.0.0.1:3306/zhihuixiaoyuan2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
           username: root
-          password: root
+          password: UEB^RX$z
         # 从库数据源
-        slave:
-          lazy: false
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
-          username:
-          password:
+          #slave:
+          #lazy: true
+          #type: ${spring.datasource.type}
+          #driverClassName: com.mysql.cj.jdbc.Driver
+          #url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
+          #username:
+          #password:
 #        oracle:
 #          type: ${spring.datasource.type}
 #          driverClassName: oracle.jdbc.OracleDriver
@@ -115,13 +115,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: localhost
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码(如没有密码请注释掉)
-    # password:
+    password: 3r263Tr$
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -202,7 +202,7 @@ sms:
 justauth:
   enabled: false
   # 前端外网访问地址
-  address: http://localhost:80
+  address: http://127.0.0.1:80
   type:
     maxkey:
       # maxkey 服务器地址

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

@@ -14,7 +14,7 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8030
   servlet:
     # 应用的访问路径
     context-path: /
@@ -36,7 +36,7 @@ server:
 # 日志配置
 logging:
   level:
-    org.dromara: @logging.level@
+    org.dromara: debug
     org.springframework: warn
     tech.powerjob.worker.background: warn
   config: classpath:logback-plus.xml
@@ -58,7 +58,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: @profiles.active@
+    active: dev
+    #active: prod
   # 文件上传
   servlet:
     multipart: