Merge branch 'dev' into 'master'

dev - master 21

See merge request !357

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -1120,6 +1120,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                         response.setSchedule(100.0);
                     } else if (Objects.equals(response.getTaskStatus(), CarReviewTask.TASK_STATUS_SIGNED)) {
                         response.setSchedule(90.0);
+                    } else if (Objects.equals(response.getTaskStatus(), CarReviewTask.TASK_STATUS_NEW)) {
+                        response.setSchedule(0.0);
                     } else {
                         BigDecimal num = new BigDecimal(response.getSchedule());
                         response.setSchedule(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
@@ -1151,6 +1153,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                         response.setSchedule(100.0);
                     } else if (Objects.equals(response.getTaskStatus(), SystemReviewTask.STATUS_SIGNED)) {
                         response.setSchedule(90.0);
+                    } else if (Objects.equals(response.getTaskStatus(), SystemReviewTask.STATUS_NEW)) {
+                        response.setSchedule(0.0);
                     } else {
                         BigDecimal num = new BigDecimal(response.getSchedule());
                         response.setSchedule(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());

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

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://49.232.167.247:22030/vehicle-quality-review?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&sessionVariables=group_concat_max_len=3000
+                url: jdbc:mysql://106.3.99.64:20011/vehicle-quality-review?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&sessionVariables=group_concat_max_len=3000
                 username: root
                 password: 1qaz@WSX
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url:
-                username:
-                password:
+                url: 
+                username: 
+                password: 
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -39,7 +39,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter:
+            webStatFilter: 
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -58,4 +58,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
\ No newline at end of file

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

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /data/docker_volume/2024/secureTest/application/upload
+  profile: /data/docker_project/2024/002_zqy_security_test_wf/secureTest/application/upload
   # 获取ip地址开关
   addressEnabled: true
   # 验证码类型 math 数字计算 char 字符验证
@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 22032
+  port: 22016
   servlet:
     # 应用的访问路径
     context-path: /
@@ -70,9 +70,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 49.232.167.247
+    host: 106.3.99.64
     # 端口，默认为6379
-    port: 22031
+    port: 22012
     # 数据库索引
     database: 0
     # 密码
@@ -146,7 +146,7 @@ xss:
   urlPatterns: /*
 
 minio:
-  url: http://49.232.167.247:22038
+  url: http://106.3.99.64:22013
   accessKey: lB7WhZYiQwLzhHPutRGn
   secretKey: 7XMWpLm6p4d20OFe9uXKifEyhF3cp4sTCowI2fhJ
   bucketName: vehicle-quality-review-oss

ruoyi-admin/src/main/resources/logback.xml

@@ -2,9 +2,9 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
 
     <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-    
+
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs" />
+    <property name="log.path" value="./logs" />
 
     <!-- 日志输出格式 -->
     <property name="log.pattern"
@@ -89,16 +89,16 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="INFO" />
+    <logger name="com.ruoyi" level="info" />
     <!-- Spring日志级别控制  -->
     <logger name="org.springframework" level="warn" />
 
-    <root level="INFO">
+    <root level="info">
         <appender-ref ref="console" />
     </root>
 
     <!--系统操作日志-->
-    <root level="INFO">
+    <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
         <appender-ref ref="console"/>
@@ -106,9 +106,8 @@
     </root>
 
     <!--系统用户操作日志-->
-    <logger name="sys-user" level="INFO">
+    <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
-        <appender-ref ref="console" />
     </logger>