123

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

@@ -7,13 +7,13 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 192.168.10.136
+        host: 192.168.10.214
         # 端口，默认为6379
         port: 6379
         # 数据库索引
-        database: 13
+        database: 2
         # 密码
-        password: wjcy@123456
+        password: Aa@123456
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -32,9 +32,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.10.136:3306/wjcy_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: wjcy@123456
+                url: jdbc:mysql://192.168.10.214:3306/wjcy_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: wjcy_test
+                password: 5EyKjNcW28MTJGHe
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java

@@ -229,6 +229,7 @@ public class ApplyPlanServiceImpl extends ServiceImpl<ApplyPlanMapper, ApplyPlan
         BeanUtils.copyBeanProp(newApplyPlan, plan);
         newApplyPlan.setId(null);
         newApplyPlan.setTaskStatus(PlanRunStatus.AWAIT_CREATE.getKey());
+        newApplyPlan.setTaskUuid(null);
         newApplyPlan.setNextExecTime(newApplyPlan.getLastExecTime());
         if (jobQueryBO.getNewData()) {
             if (null != apply.getSupportParam() && apply.getSupportParam() == 1) {
@@ -727,8 +728,13 @@ public class ApplyPlanServiceImpl extends ServiceImpl<ApplyPlanMapper, ApplyPlan
                     JobStartVO jobStartVO = YinDaoHttpUtils.appStart(applyStartBO);
                     ApplyPlan updateApplyPlan = new ApplyPlan();
                     updateApplyPlan.setId(runApplyPlan.getId());
-                    updateApplyPlan.setCreateBy("系统创建");
-                    updateApplyPlan.setCreateTime(new Date());
+                    try{
+                        updateApplyPlan.setCreateBy(SecurityUtils.getUsername());
+                        updateApplyPlan.setCreateTime(new Date());
+                    }catch (Exception e){
+                        updateApplyPlan.setCreateBy("系统创建");
+                        updateApplyPlan.setCreateTime(new Date());
+                    }
                     updateApplyPlan.setUpdateBy("系统修改");
                     updateApplyPlan.setUpdateTime(new Date());
                     updateApplyPlan.setStartTime(new Date());
@@ -815,6 +821,7 @@ public class ApplyPlanServiceImpl extends ServiceImpl<ApplyPlanMapper, ApplyPlan
         AtomicBoolean insert = new AtomicBoolean(false);
 
         ApplyPlan applyPlan = new ApplyPlan();
+        applyPlan.setCreateBy(SecurityUtils.getUsername());
         if ("2".equals(addApplyPlanBO.getExcType())) {
             final CronExpression cron = new CronExpression(addApplyPlanBO.getCronExpression());
             Date date = new Date();

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ResourceLibraryServiceImpl.java

@@ -1,9 +1,6 @@
 package com.ruoyi.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ruoyi.business.domain.Apply;
@@ -11,6 +8,7 @@ import com.ruoyi.business.domain.bo.AddBatchResourceLibraryBO;
 import com.ruoyi.business.service.IApplyService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.business.mapper.ResourceLibraryMapper;
@@ -43,6 +41,8 @@ public class ResourceLibraryServiceImpl extends ServiceImpl<ResourceLibraryMappe
             ResourceLibrary resourceLibrary = new ResourceLibrary();
             resourceLibrary.setId(e.getId());
             resourceLibrary.setResourceValue(e.getResourceValue());
+            resourceLibrary.setUpdateBy(SecurityUtils.getUsername());
+            resourceLibrary.setUpdateTime(new Date());
             resourceLibraries.add(resourceLibrary);
         });
 

ruoyi-business/src/main/java/com/ruoyi/business/util/YinDaoHttpUtils.java

@@ -57,7 +57,11 @@ public class YinDaoHttpUtils {
                 if ("file".equals(e.getType())) {
 //                    e.setValue(SERVER_URL + e.getValue());
                     e.setType("str");
-                    e.setValue(SERVER_URL + e.getValue());
+                    if (StringUtils.isNull(e.getValue()) || StringUtils.isBlank(e.getValue())) {
+                        e.setValue(null);
+                    }else{
+                        e.setValue(SERVER_URL + e.getValue());
+                    }
                 }
             }).collect(Collectors.toList());
             applyStartBO.setParams(newParamList);

ruoyi-business/src/main/resources/mapper/business/ApplyMapper.xml

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            deleted = 0
             <if test="ownerName != null  and ownerName != ''"> and owner_name like concat(#{ownerName}, '%')</if>
             <if test="ownerAccount != null  and ownerAccount != ''"> and owner_account like concat(#{ownerAccount}, '%')</if>
-            <if test="appName != null  and appName != ''"> and app_name like concat(#{appName}, '%')</if>
+            <if test="appName != null  and appName != ''"> and app_name like concat('%',#{appName}, '%')</if>
             <if test="version != null  and version != ''"> and version = #{version}</if>
             <if test="appTypeName != null  and appTypeName != ''"> and app_type_name like concat(#{appTypeName}, '%')</if>
             <if test="appType != null  and appType != ''"> and app_type = #{appType}</if>