update service-job logic

base-modules/service-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java

@@ -1,34 +1,48 @@
 package com.ruoyi.job;
 
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import com.ruoyi.common.security.annotation.EnableCustomConfig;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+//import com.ruoyi.common.security.annotation.EnableCustomConfig;
+import com.usky.common.security.annotation.EnableRyFeignClients;
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.Environment;
 
-/**
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/*
  * 定时任务
  * 
  * @author ruoyi
  */
-@EnableCustomConfig
-@EnableCustomSwagger2   
-@EnableRyFeignClients
+//@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableFeignClients(basePackages = {"com.usky"})
+@MapperScan(value = "com.ruoyi.job.mapper")
+@ComponentScan(basePackages = {"com.usky","com.ruoyi"})
 @SpringBootApplication
 public class RuoYiJobApplication
 {
-    public static void main(String[] args)
+    private static final Logger LOGGER = LoggerFactory.getLogger(RuoYiJobApplication.class);
+
+    public static void main(String[] args) throws UnknownHostException
     {
-        SpringApplication.run(RuoYiJobApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  定时任务模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+        ConfigurableApplicationContext application = SpringApplication.run(RuoYiJobApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+        LOGGER.info("\n----------------------------------------------------------\n\t" +
+                "Application is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port + (null==path?"":path) + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port + (null==path?"":path) + "/\n\t" +
+                "Api: \t\thttp://" + ip + ":" + port + (null==path?"":path) + "/swagger-ui/index.html\n\t" +
+                "----------------------------------------------------------");
     }
 }

base-modules/service-job/src/main/java/com/ruoyi/job/controller/SysJobController.java

@@ -3,7 +3,12 @@ package com.ruoyi.job.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.core.utils.StringUtils;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.utils.StringUtils;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.common.security.annotation.RequiresPermissions;
+import com.usky.common.security.utils.SecurityUtils;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -14,16 +19,13 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.exception.job.TaskException;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.usky.common.core.constant.Constants;
+import com.usky.common.core.exception.job.TaskException;
+import com.usky.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.web.controller.BaseController;
+import com.usky.common.core.web.domain.AjaxResult;
+import com.usky.common.core.web.page.TableDataInfo;
+
 import com.ruoyi.job.domain.SysJob;
 import com.ruoyi.job.service.ISysJobService;
 import com.ruoyi.job.util.CronUtils;
@@ -44,19 +46,19 @@ public class SysJobController extends BaseController
     /**
      * 查询定时任务列表
      */
-    @RequiresPermissions("monitor:job:list")
+//    @RequiresPermissions("monitor:job:list")
     @GetMapping("/list")
-    public TableDataInfo list(SysJob sysJob)
+    public ApiResult<List<SysJob>> list(SysJob sysJob)
     {
         startPage();
         List<SysJob> list = jobService.selectJobList(sysJob);
-        return getDataTable(list);
+        return ApiResult.success(list);
     }
 
     /**
      * 导出定时任务列表
      */
-    @RequiresPermissions("monitor:job:export")
+//    @RequiresPermissions("monitor:job:export")
     @Log(title = "定时任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysJob sysJob)
@@ -69,7 +71,7 @@ public class SysJobController extends BaseController
     /**
      * 获取定时任务详细信息
      */
-    @RequiresPermissions("monitor:job:query")
+//    @RequiresPermissions("monitor:job:query")
     @GetMapping(value = "/{jobId}")
     public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
     {
@@ -79,11 +81,10 @@ public class SysJobController extends BaseController
     /**
      * 新增定时任务
      */
-    @RequiresPermissions("monitor:job:add")
+//    @RequiresPermissions("monitor:job:add")
     @Log(title = "定时任务", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
-    {
+    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException,TaskException {
         if (!CronUtils.isValid(job.getCronExpression()))
         {
             return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");
@@ -115,11 +116,10 @@ public class SysJobController extends BaseController
     /**
      * 修改定时任务
      */
-    @RequiresPermissions("monitor:job:edit")
+//    @RequiresPermissions("monitor:job:edit")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
-    {
+    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException,TaskException {
         if (!CronUtils.isValid(job.getCronExpression()))
         {
             return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");
@@ -151,7 +151,7 @@ public class SysJobController extends BaseController
     /**
      * 定时任务状态修改
      */
-    @RequiresPermissions("monitor:job:changeStatus")
+//    @RequiresPermissions("monitor:job:changeStatus")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
@@ -164,7 +164,7 @@ public class SysJobController extends BaseController
     /**
      * 定时任务立即执行一次
      */
-    @RequiresPermissions("monitor:job:changeStatus")
+//    @RequiresPermissions("monitor:job:changeStatus")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping("/run")
     public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
@@ -176,7 +176,7 @@ public class SysJobController extends BaseController
     /**
      * 删除定时任务
      */
-    @RequiresPermissions("monitor:job:remove")
+//    @RequiresPermissions("monitor:job:remove")
     @Log(title = "定时任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobIds}")
     public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException

base-modules/service-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java

@@ -1,5 +1,4 @@
 package com.ruoyi.job.controller;
-
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,19 +8,18 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.usky.common.core.utils.poi.ExcelUtil;
+import com.usky.common.core.web.controller.BaseController;
+import com.usky.common.core.web.domain.AjaxResult;
+import com.usky.common.core.web.page.TableDataInfo;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.common.security.annotation.RequiresPermissions;
 import com.ruoyi.job.domain.SysJobLog;
 import com.ruoyi.job.service.ISysJobLogService;
 
 /**
  * 调度日志操作处理
- * 
  * @author ruoyi
  */
 @RestController
@@ -34,7 +32,7 @@ public class SysJobLogController extends BaseController
     /**
      * 查询定时任务调度日志列表
      */
-    @RequiresPermissions("monitor:job:list")
+//    @RequiresPermissions("monitor:job:list")
     @GetMapping("/list")
     public TableDataInfo list(SysJobLog sysJobLog)
     {
@@ -46,7 +44,7 @@ public class SysJobLogController extends BaseController
     /**
      * 导出定时任务调度日志列表
      */
-    @RequiresPermissions("monitor:job:export")
+//    @RequiresPermissions("monitor:job:export")
     @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysJobLog sysJobLog)
@@ -59,7 +57,7 @@ public class SysJobLogController extends BaseController
     /**
      * 根据调度编号获取详细信息
      */
-    @RequiresPermissions("monitor:job:query")
+//    @RequiresPermissions("monitor:job:query")
     @GetMapping(value = "/{configId}")
     public AjaxResult getInfo(@PathVariable Long jobLogId)
     {
@@ -69,7 +67,7 @@ public class SysJobLogController extends BaseController
     /**
      * 删除定时任务调度日志
      */
-    @RequiresPermissions("monitor:job:remove")
+//    @RequiresPermissions("monitor:job:remove")
     @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobLogIds}")
     public AjaxResult remove(@PathVariable Long[] jobLogIds)
@@ -80,7 +78,7 @@ public class SysJobLogController extends BaseController
     /**
      * 清空定时任务调度日志
      */
-    @RequiresPermissions("monitor:job:remove")
+//    @RequiresPermissions("monitor:job:remove")
     @Log(title = "调度日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
     public AjaxResult clean()

base-modules/service-job/src/main/java/com/ruoyi/job/domain/SysJob.java

@@ -6,11 +6,11 @@ import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.constant.ScheduleConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.usky.common.core.annotation.Excel;
+import com.usky.common.core.annotation.Excel.ColumnType;
+import com.usky.common.core.constant.ScheduleConstants;
+import com.usky.common.core.utils.StringUtils;
+import com.usky.common.core.web.domain.BaseEntity;
 import com.ruoyi.job.util.CronUtils;
 
 /**

base-modules/service-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java

@@ -3,8 +3,8 @@ package com.ruoyi.job.domain;
 import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.usky.common.core.annotation.Excel;
+import com.usky.common.core.web.domain.BaseEntity;
 
 /**
  * 定时任务调度日志表 sys_job_log

base-modules/service-job/src/main/java/com/ruoyi/job/service/ISysJobService.java

@@ -2,7 +2,7 @@ package com.ruoyi.job.service;
 
 import java.util.List;
 import org.quartz.SchedulerException;
-import com.ruoyi.common.core.exception.job.TaskException;
+import com.usky.common.core.exception.job.TaskException;
 import com.ruoyi.job.domain.SysJob;
 
 /**

base-modules/service-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java

@@ -9,8 +9,8 @@ import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.core.constant.ScheduleConstants;
-import com.ruoyi.common.core.exception.job.TaskException;
+import com.usky.common.core.constant.ScheduleConstants;
+import com.usky.common.core.exception.job.TaskException;
 import com.ruoyi.job.domain.SysJob;
 import com.ruoyi.job.mapper.SysJobMapper;
 import com.ruoyi.job.util.CronUtils;
@@ -226,7 +226,7 @@ public class SysJobServiceImpl implements ISysJobService
      * @param job 任务对象
      * @param jobGroup 任务组名
      */
-    public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException
+    public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, com.usky.common.core.exception.job.TaskException
     {
         Long jobId = job.getJobId();
         // 判断是否存在

base-modules/service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -1,7 +1,7 @@
 package com.ruoyi.job.task;
 
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.usky.common.core.utils.StringUtils;
 
 /**
  * 定时任务调度测试

base-modules/service-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java

@@ -6,11 +6,11 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.constant.ScheduleConstants;
-import com.ruoyi.common.core.utils.ExceptionUtil;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.usky.common.core.constant.ScheduleConstants;
+import com.usky.common.core.utils.ExceptionUtil;
+import com.usky.common.core.utils.SpringUtils;
+import com.usky.common.core.utils.StringUtils;
+import com.usky.common.core.utils.bean.BeanUtils;
 import com.ruoyi.job.domain.SysJob;
 import com.ruoyi.job.domain.SysJobLog;
 import com.ruoyi.job.service.ISysJobLogService;

base-modules/service-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java

@@ -4,8 +4,8 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.usky.common.core.utils.SpringUtils;
+import com.usky.common.core.utils.StringUtils;
 import com.ruoyi.job.domain.SysJob;
 
 /**

base-modules/service-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java

@@ -10,11 +10,11 @@ import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.quartz.TriggerBuilder;
 import org.quartz.TriggerKey;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.ScheduleConstants;
-import com.ruoyi.common.core.exception.job.TaskException;
-import com.ruoyi.common.core.exception.job.TaskException.Code;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.usky.common.core.constant.Constants;
+import com.usky.common.core.constant.ScheduleConstants;
+import com.usky.common.core.exception.job.TaskException;
+import com.usky.common.core.exception.job.TaskException.Code;
+import com.usky.common.core.utils.StringUtils;
 import com.ruoyi.job.domain.SysJob;
 
 /**

base-modules/service-job/src/main/resources/logback.xml

@@ -1,31 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/var/log/uskycloud/service-job" />
-   <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+    <property name="log.path" value="/var/log/uskycloud/service-job" />
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{26}:%line: %msg%n" />
+    <!--    	<property name="log.pattern" value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) &#45;&#45; [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />-->
+
+
+    <property name="SQL_PACKAGE" value="com.ruoyi.job.mapper"/>
 
     <!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-	</appender>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="file_sql" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sql.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sql.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>3</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
 
     <!-- 系统日志输出 -->
-	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/info.log</file>
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>3</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
             <level>INFO</level>
             <!-- 匹配时的操作：接收（记录） -->
@@ -33,16 +51,16 @@
             <!-- 不匹配时的操作：拒绝（不记录） -->
             <onMismatch>DENY</onMismatch>
         </filter>
-	</appender>
+    </appender>
 
     <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/error.log</file>
+        <file>${log.path}/error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -50,25 +68,27 @@
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
             <level>ERROR</level>
-			<!-- 匹配时的操作：接收（记录） -->
+            <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <!-- 不匹配时的操作：拒绝（不记录） -->
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
-	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+    <!--	<logger name="com.usky" level="info" />-->
+    <!-- Spring日志级别控制  -->
+    <!--	<logger name="org.springframework" level="warn" />-->
+
+    <logger name="${SQL_PACKAGE}" additivity="false" level="debug">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file_sql"/>
+    </logger>
 
-	<root level="info">
-		<appender-ref ref="console" />
-	</root>
-	
-	<!--系统操作日志-->
+    <!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
+        <appender-ref ref="console" />
     </root>
 </configuration>

base-modules/service-job/src/main/resources/mapper/job/SysJobLogMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.job.mapper.SysJobLogMapper">
 
-	<resultMap type="SysJobLog" id="SysJobLogResult">
+	<resultMap type="com.ruoyi.job.domain.SysJobLog" id="SysJobLogResult">
 		<id     property="jobLogId"       column="job_log_id"      />
 		<result property="jobName"        column="job_name"        />
 		<result property="jobGroup"       column="job_group"       />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_job_log
     </sql>
 	
-	<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
+	<select id="selectJobLogList" parameterType="com.ruoyi.job.domain.SysJobLog" resultMap="SysJobLogResult">
 		<include refid="selectJobLogVo"/>
 		<where>
 			<if test="jobName != null and jobName != ''">
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         truncate table sys_job_log
     </update>
  	
- 	<insert id="insertJobLog" parameterType="SysJobLog">
+ 	<insert id="insertJobLog" parameterType="com.ruoyi.job.domain.SysJobLog">
  		insert into sys_job_log(
  			<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
  			<if test="jobName != null and jobName != ''">job_name,</if>

base-modules/service-job/src/main/resources/mapper/job/SysJobMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.job.mapper.SysJobMapper">
 
-	<resultMap type="SysJob" id="SysJobResult">
+	<resultMap type="com.ruoyi.job.domain.SysJob" id="SysJobResult">
 		<id     property="jobId"          column="job_id"          />
 		<result property="jobName"        column="job_name"        />
 		<result property="jobGroup"       column="job_group"       />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_job
     </sql>
 	
-	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
+	<select id="selectJobList" parameterType="com.ruoyi.job.domain.SysJob" resultMap="SysJobResult">
 		<include refid="selectJobVo"/>
 		<where>
 			<if test="jobName != null and jobName != ''">
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach> 
  	</delete>
  	
- 	<update id="updateJob" parameterType="SysJob">
+ 	<update id="updateJob" parameterType="com.ruoyi.job.domain.SysJob">
  		update sys_job
  		<set>
  			<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		where job_id = #{jobId}
 	</update>
  	
- 	<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
+ 	<insert id="insertJob" parameterType="com.ruoyi.job.domain.SysJob" useGeneratedKeys="true" keyProperty="jobId">
  		insert into sys_job(
  			<if test="jobId != null and jobId != 0">job_id,</if>
  			<if test="jobName != null and jobName != ''">job_name,</if>