refactor(xxl-job): 升级xxl-job-admin 3.1.1

pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml

@@ -1,247 +1,247 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxl.job.admin.dao.XxlJobInfoDao">
 
-	<resultMap id="XxlJobInfo" type="com.xxl.job.admin.core.model.XxlJobInfo">
-		<result column="id" property="id"/>
+    <resultMap id="XxlJobInfo" type="com.xxl.job.admin.core.model.XxlJobInfo">
+        <result column="id" property="id"/>
 
-		<result column="job_group" property="jobGroup"/>
-		<result column="job_desc" property="jobDesc"/>
+        <result column="job_group" property="jobGroup"/>
+        <result column="job_desc" property="jobDesc"/>
 
-		<result column="add_time" property="addTime"/>
-		<result column="update_time" property="updateTime"/>
+        <result column="add_time" property="addTime"/>
+        <result column="update_time" property="updateTime"/>
 
-		<result column="author" property="author"/>
-		<result column="alarm_email" property="alarmEmail"/>
+        <result column="author" property="author"/>
+        <result column="alarm_email" property="alarmEmail"/>
 
-		<result column="schedule_type" property="scheduleType"/>
-		<result column="schedule_conf" property="scheduleConf"/>
-		<result column="misfire_strategy" property="misfireStrategy"/>
+        <result column="schedule_type" property="scheduleType"/>
+        <result column="schedule_conf" property="scheduleConf"/>
+        <result column="misfire_strategy" property="misfireStrategy"/>
 
-		<result column="executor_route_strategy" property="executorRouteStrategy"/>
-		<result column="executor_handler" property="executorHandler"/>
-		<result column="executor_param" property="executorParam"/>
-		<result column="executor_block_strategy" property="executorBlockStrategy"/>
-		<result column="executor_timeout" property="executorTimeout"/>
-		<result column="executor_fail_retry_count" property="executorFailRetryCount"/>
+        <result column="executor_route_strategy" property="executorRouteStrategy"/>
+        <result column="executor_handler" property="executorHandler"/>
+        <result column="executor_param" property="executorParam"/>
+        <result column="executor_block_strategy" property="executorBlockStrategy"/>
+        <result column="executor_timeout" property="executorTimeout"/>
+        <result column="executor_fail_retry_count" property="executorFailRetryCount"/>
 
-		<result column="glue_type" property="glueType"/>
-		<result column="glue_source" property="glueSource"/>
-		<result column="glue_remark" property="glueRemark"/>
-		<result column="glue_updatetime" property="glueUpdatetime"/>
+        <result column="glue_type" property="glueType"/>
+        <result column="glue_source" property="glueSource"/>
+        <result column="glue_remark" property="glueRemark"/>
+        <result column="glue_updatetime" property="glueUpdatetime"/>
 
-		<result column="child_jobid" property="childJobId"/>
+        <result column="child_jobid" property="childJobId"/>
 
-		<result column="trigger_status" property="triggerStatus"/>
-		<result column="trigger_last_time" property="triggerLastTime"/>
-		<result column="trigger_next_time" property="triggerNextTime"/>
-	</resultMap>
+        <result column="trigger_status" property="triggerStatus"/>
+        <result column="trigger_last_time" property="triggerLastTime"/>
+        <result column="trigger_next_time" property="triggerNextTime"/>
+    </resultMap>
 
-	<sql id="Base_Column_List">
-		t.id,
-		t.job_group,
-		t.job_desc,
-		t.add_time,
-		t.update_time,
-		t.author,
-		t.alarm_email,
-		t.schedule_type,
-		t.schedule_conf,
-		t.misfire_strategy,
-		t.executor_route_strategy,
-		t.executor_handler,
-		t.executor_param,
-		t.executor_block_strategy,
-		t.executor_timeout,
-		t.executor_fail_retry_count,
-		t.glue_type,
-		t.glue_source,
-		t.glue_remark,
-		t.glue_updatetime,
-		t.child_jobid,
-		t.trigger_status,
-		t.trigger_last_time,
-		t.trigger_next_time
-	</sql>
+    <sql id="Base_Column_List">
+        t.id,
+        t.job_group,
+        t.job_desc,
+        t.add_time,
+        t.update_time,
+        t.author,
+        t.alarm_email,
+        t.schedule_type,
+        t.schedule_conf,
+        t.misfire_strategy,
+        t.executor_route_strategy,
+        t.executor_handler,
+        t.executor_param,
+        t.executor_block_strategy,
+        t.executor_timeout,
+        t.executor_fail_retry_count,
+        t.glue_type,
+        t.glue_source,
+        t.glue_remark,
+        t.glue_updatetime,
+        t.child_jobid,
+        t.trigger_status,
+        t.trigger_last_time,
+        t.trigger_next_time
+    </sql>
 
-	<select id="pageList" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
-		SELECT
-		<include refid="Base_Column_List"/>
-		FROM xxl_job_info AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR">
-			<if test="jobGroup gt 0">
-				AND t.job_group = #{jobGroup}
-			</if>
+    <select id="pageList" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM xxl_job_info AS t
+        <trim prefix="WHERE" prefixOverrides="AND | OR">
+            <if test="jobGroup gt 0">
+                AND t.job_group = #{jobGroup}
+            </if>
             <if test="triggerStatus gte 0">
                 AND t.trigger_status = #{triggerStatus}
             </if>
-			<if test="jobDesc != null and jobDesc != ''">
-				AND t.job_desc like CONCAT(CONCAT('%', #{jobDesc}), '%')
-			</if>
-			<if test="executorHandler != null and executorHandler != ''">
-				AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%')
-			</if>
-			<if test="author != null and author != ''">
-				AND t.author like CONCAT(CONCAT('%', #{author}), '%')
-			</if>
-		</trim>
-		ORDER BY id DESC
-		LIMIT #{offset}, #{pagesize}
-	</select>
+            <if test="jobDesc != null and jobDesc != ''">
+                AND t.job_desc like CONCAT(CONCAT('%', #{jobDesc}), '%')
+            </if>
+            <if test="executorHandler != null and executorHandler != ''">
+                AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%')
+            </if>
+            <if test="author != null and author != ''">
+                AND t.author like CONCAT(CONCAT('%', #{author}), '%')
+            </if>
+        </trim>
+        ORDER BY id DESC
+        LIMIT #{offset}, #{pagesize}
+    </select>
 
-	<select id="pageListCount" parameterType="java.util.HashMap" resultType="int">
-		SELECT count(1)
-		FROM xxl_job_info AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR">
-			<if test="jobGroup gt 0">
-				AND t.job_group = #{jobGroup}
-			</if>
+    <select id="pageListCount" parameterType="java.util.HashMap" resultType="int">
+        SELECT count(1)
+        FROM xxl_job_info AS t
+        <trim prefix="WHERE" prefixOverrides="AND | OR">
+            <if test="jobGroup gt 0">
+                AND t.job_group = #{jobGroup}
+            </if>
             <if test="triggerStatus gte 0">
                 AND t.trigger_status = #{triggerStatus}
             </if>
-			<if test="jobDesc != null and jobDesc != ''">
-				AND t.job_desc like CONCAT(CONCAT('%', #{jobDesc}), '%')
-			</if>
-			<if test="executorHandler != null and executorHandler != ''">
-				AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%')
-			</if>
-			<if test="author != null and author != ''">
-				AND t.author like CONCAT(CONCAT('%', #{author}), '%')
-			</if>
-		</trim>
-	</select>
+            <if test="jobDesc != null and jobDesc != ''">
+                AND t.job_desc like CONCAT(CONCAT('%', #{jobDesc}), '%')
+            </if>
+            <if test="executorHandler != null and executorHandler != ''">
+                AND t.executor_handler like CONCAT(CONCAT('%', #{executorHandler}), '%')
+            </if>
+            <if test="author != null and author != ''">
+                AND t.author like CONCAT(CONCAT('%', #{author}), '%')
+            </if>
+        </trim>
+    </select>
 
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobInfo" useGeneratedKeys="true" keyProperty="id">
-		INSERT INTO xxl_job_info (
-		job_group,
-		job_desc,
-		add_time,
-		update_time,
-		author,
-		alarm_email,
-		schedule_type,
-		schedule_conf,
-		misfire_strategy,
-		executor_route_strategy,
-		executor_handler,
-		executor_param,
-		executor_block_strategy,
-		executor_timeout,
-		executor_fail_retry_count,
-		glue_type,
-		glue_source,
-		glue_remark,
-		glue_updatetime,
-		child_jobid,
-		trigger_status,
-		trigger_last_time,
-		trigger_next_time
-		) VALUES (
-		#{jobGroup},
-		#{jobDesc},
-		#{addTime},
-		#{updateTime},
-		#{author},
-		#{alarmEmail},
-		#{scheduleType},
-		#{scheduleConf},
-		#{misfireStrategy},
-		#{executorRouteStrategy},
-		#{executorHandler},
-		#{executorParam},
-		#{executorBlockStrategy},
-		#{executorTimeout},
-		#{executorFailRetryCount},
-		#{glueType},
-		#{glueSource},
-		#{glueRemark},
-		#{glueUpdatetime},
-		#{childJobId},
-		#{triggerStatus},
-		#{triggerLastTime},
-		#{triggerNextTime}
-		);
-		<!--<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
+    <insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobInfo" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO xxl_job_info (
+        job_group,
+        job_desc,
+        add_time,
+        update_time,
+        author,
+        alarm_email,
+        schedule_type,
+        schedule_conf,
+        misfire_strategy,
+        executor_route_strategy,
+        executor_handler,
+        executor_param,
+        executor_block_strategy,
+        executor_timeout,
+        executor_fail_retry_count,
+        glue_type,
+        glue_source,
+        glue_remark,
+        glue_updatetime,
+        child_jobid,
+        trigger_status,
+        trigger_last_time,
+        trigger_next_time
+        ) VALUES (
+        #{jobGroup},
+        #{jobDesc},
+        #{addTime},
+        #{updateTime},
+        #{author},
+        #{alarmEmail},
+        #{scheduleType},
+        #{scheduleConf},
+        #{misfireStrategy},
+        #{executorRouteStrategy},
+        #{executorHandler},
+        #{executorParam},
+        #{executorBlockStrategy},
+        #{executorTimeout},
+        #{executorFailRetryCount},
+        #{glueType},
+        #{glueSource},
+        #{glueRemark},
+        #{glueUpdatetime},
+        #{childJobId},
+        #{triggerStatus},
+        #{triggerLastTime},
+        #{triggerNextTime}
+        );
+        <!--<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
             SELECT LAST_INSERT_ID()
             /*SELECT @@IDENTITY AS id*/
         </selectKey>-->
-	</insert>
+    </insert>
 
-	<select id="loadById" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
-		SELECT
-		<include refid="Base_Column_List"/>
-		FROM xxl_job_info AS t
-		WHERE t.id = #{id}
-	</select>
+    <select id="loadById" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM xxl_job_info AS t
+        WHERE t.id = #{id}
+    </select>
 
-	<update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobInfo">
-		UPDATE xxl_job_info
-		SET
-		job_group = #{jobGroup},
-		job_desc = #{jobDesc},
-		update_time = #{updateTime},
-		author = #{author},
-		alarm_email = #{alarmEmail},
-		schedule_type = #{scheduleType},
-		schedule_conf = #{scheduleConf},
-		misfire_strategy = #{misfireStrategy},
-		executor_route_strategy = #{executorRouteStrategy},
-		executor_handler = #{executorHandler},
-		executor_param = #{executorParam},
-		executor_block_strategy = #{executorBlockStrategy},
+    <update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobInfo">
+        UPDATE xxl_job_info
+        SET
+        job_group = #{jobGroup},
+        job_desc = #{jobDesc},
+        update_time = #{updateTime},
+        author = #{author},
+        alarm_email = #{alarmEmail},
+        schedule_type = #{scheduleType},
+        schedule_conf = #{scheduleConf},
+        misfire_strategy = #{misfireStrategy},
+        executor_route_strategy = #{executorRouteStrategy},
+        executor_handler = #{executorHandler},
+        executor_param = #{executorParam},
+        executor_block_strategy = #{executorBlockStrategy},
         executor_timeout = #{executorTimeout},
         executor_fail_retry_count = #{executorFailRetryCount},
-		glue_type = #{glueType},
-		glue_source = #{glueSource},
-		glue_remark = #{glueRemark},
-		glue_updatetime = #{glueUpdatetime},
-		child_jobid = #{childJobId},
-		trigger_status = #{triggerStatus},
-		trigger_last_time = #{triggerLastTime},
-		trigger_next_time = #{triggerNextTime}
-		WHERE id = #{id}
-	</update>
+        glue_type = #{glueType},
+        glue_source = #{glueSource},
+        glue_remark = #{glueRemark},
+        glue_updatetime = #{glueUpdatetime},
+        child_jobid = #{childJobId},
+        trigger_status = #{triggerStatus},
+        trigger_last_time = #{triggerLastTime},
+        trigger_next_time = #{triggerNextTime}
+        WHERE id = #{id}
+    </update>
 
-	<delete id="delete" parameterType="java.util.HashMap">
-		DELETE
-		FROM xxl_job_info
-		WHERE id = #{id}
-	</delete>
+    <delete id="delete" parameterType="java.util.HashMap">
+        DELETE
+        FROM xxl_job_info
+        WHERE id = #{id}
+    </delete>
 
-	<select id="getJobsByGroup" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
-		SELECT
-		<include refid="Base_Column_List"/>
-		FROM xxl_job_info AS t
-		WHERE t.job_group = #{jobGroup}
-	</select>
+    <select id="getJobsByGroup" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM xxl_job_info AS t
+        WHERE t.job_group = #{jobGroup}
+    </select>
 
-	<select id="findAllCount" resultType="int">
-		SELECT count(1)
-		FROM xxl_job_info
-	</select>
+    <select id="findAllCount" resultType="int">
+        SELECT count(1)
+        FROM xxl_job_info
+    </select>
 
 
-	<select id="scheduleJobQuery" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
-		SELECT
-		<include refid="Base_Column_List"/>
-		FROM xxl_job_info AS t
-		WHERE t.trigger_status = 1
-		and t.trigger_next_time <![CDATA[ <= ]]> #{maxNextTime}
-		ORDER BY id ASC
-		LIMIT #{pagesize}
-	</select>
+    <select id="scheduleJobQuery" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM xxl_job_info AS t
+        WHERE t.trigger_status = 1
+        and t.trigger_next_time <![CDATA[ <= ]]> #{maxNextTime}
+        ORDER BY id ASC
+        LIMIT #{pagesize}
+    </select>
 
-	<update id="scheduleUpdate" parameterType="com.xxl.job.admin.core.model.XxlJobInfo">
-		UPDATE xxl_job_info
-		SET
-		trigger_last_time = #{triggerLastTime},
+    <update id="scheduleUpdate" parameterType="com.xxl.job.admin.core.model.XxlJobInfo">
+        UPDATE xxl_job_info
+        SET
+        trigger_last_time = #{triggerLastTime},
         trigger_next_time = #{triggerNextTime}
         <if test="triggerStatus gte 0">
             , trigger_status = #{triggerStatus}
         </if>
-		WHERE id = #{id}
+        WHERE id = #{id}
         AND trigger_status = 1
-	</update>
+    </update>
 
 </mapper>

pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml

@@ -3,17 +3,17 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxl.job.admin.dao.XxlJobLogDao">
 
-	<resultMap id="XxlJobLog" type="com.xxl.job.admin.core.model.XxlJobLog">
-		<result column="id" property="id"/>
+    <resultMap id="XxlJobLog" type="com.xxl.job.admin.core.model.XxlJobLog">
+        <result column="id" property="id"/>
 
-		<result column="job_group" property="jobGroup"/>
-		<result column="job_id" property="jobId"/>
+        <result column="job_group" property="jobGroup"/>
+        <result column="job_id" property="jobId"/>
 
-		<result column="executor_address" property="executorAddress"/>
-		<result column="executor_handler" property="executorHandler"/>
+        <result column="executor_address" property="executorAddress"/>
+        <result column="executor_handler" property="executorHandler"/>
         <result column="executor_param" property="executorParam"/>
-		<result column="executor_sharding_param" property="executorShardingParam"/>
-		<result column="executor_fail_retry_count" property="executorFailRetryCount"/>
+        <result column="executor_sharding_param" property="executorShardingParam"/>
+        <result column="executor_fail_retry_count" property="executorFailRetryCount"/>
 
         <result column="trigger_time" property="triggerTime"/>
         <result column="trigger_code" property="triggerCode"/>
@@ -23,124 +23,124 @@
         <result column="handle_code" property="handleCode"/>
         <result column="handle_msg" property="handleMsg"/>
 
-		<result column="alarm_status" property="alarmStatus"/>
-	</resultMap>
+        <result column="alarm_status" property="alarmStatus"/>
+    </resultMap>
 
-	<sql id="Base_Column_List">
-		t.id,
-		t.job_group,
-		t.job_id,
-		t.executor_address,
-		t.executor_handler,
-		t.executor_param,
-		t.executor_sharding_param,
-		t.executor_fail_retry_count,
-		t.trigger_time,
-		t.trigger_code,
-		t.trigger_msg,
-		t.handle_time,
-		t.handle_code,
-		t.handle_msg,
-		t.alarm_status
-	</sql>
+    <sql id="Base_Column_List">
+        t.id,
+        t.job_group,
+        t.job_id,
+        t.executor_address,
+        t.executor_handler,
+        t.executor_param,
+        t.executor_sharding_param,
+        t.executor_fail_retry_count,
+        t.trigger_time,
+        t.trigger_code,
+        t.trigger_msg,
+        t.handle_time,
+        t.handle_code,
+        t.handle_msg,
+        t.alarm_status
+    </sql>
 
     <select id="pageList" resultMap="XxlJobLog">
-		SELECT
-		<include refid="Base_Column_List"/>
-		FROM xxl_job_log AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR">
-			<if test="jobId==0 and jobGroup gt 0">
-				AND t.job_group = #{jobGroup}
-			</if>
-			<if test="jobId gt 0">
-				AND t.job_id = #{jobId}
-			</if>
-			<if test="triggerTimeStart != null">
-				AND t.trigger_time <![CDATA[ >= ]]> #{triggerTimeStart}
-			</if>
-			<if test="triggerTimeEnd != null">
-				AND t.trigger_time <![CDATA[ <= ]]> #{triggerTimeEnd}
-			</if>
-			<if test="logStatus == 1">
-				AND t.handle_code = 200
-			</if>
-			<if test="logStatus == 2">
-				AND (
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM xxl_job_log AS t
+        <trim prefix="WHERE" prefixOverrides="AND | OR">
+            <if test="jobId==0 and jobGroup gt 0">
+                AND t.job_group = #{jobGroup}
+            </if>
+            <if test="jobId gt 0">
+                AND t.job_id = #{jobId}
+            </if>
+            <if test="triggerTimeStart != null">
+                AND t.trigger_time <![CDATA[ >= ]]> #{triggerTimeStart}
+            </if>
+            <if test="triggerTimeEnd != null">
+                AND t.trigger_time <![CDATA[ <= ]]> #{triggerTimeEnd}
+            </if>
+            <if test="logStatus == 1">
+                AND t.handle_code = 200
+            </if>
+            <if test="logStatus == 2">
+                AND (
                 t.trigger_code NOT IN (0, 200) OR
                 t.handle_code NOT IN (0, 200)
-				)
-			</if>
-			<if test="logStatus == 3">
-				AND t.trigger_code = 200
-				AND t.handle_code = 0
-			</if>
-		</trim>
-		ORDER BY t.trigger_time DESC
-		LIMIT #{offset}, #{pagesize}
-	</select>
+                )
+            </if>
+            <if test="logStatus == 3">
+                AND t.trigger_code = 200
+                AND t.handle_code = 0
+            </if>
+        </trim>
+        ORDER BY t.trigger_time DESC
+        LIMIT #{offset}, #{pagesize}
+    </select>
 
     <select id="pageListCount" resultType="int">
-		SELECT count(1)
-		FROM xxl_job_log AS t
-		<trim prefix="WHERE" prefixOverrides="AND | OR">
-			<if test="jobId==0 and jobGroup gt 0">
-				AND t.job_group = #{jobGroup}
-			</if>
-			<if test="jobId gt 0">
-				AND t.job_id = #{jobId}
-			</if>
-			<if test="triggerTimeStart != null">
-				AND t.trigger_time <![CDATA[ >= ]]> #{triggerTimeStart}
-			</if>
-			<if test="triggerTimeEnd != null">
-				AND t.trigger_time <![CDATA[ <= ]]> #{triggerTimeEnd}
-			</if>
-			<if test="logStatus == 1">
-				AND t.handle_code = 200
-			</if>
-			<if test="logStatus == 2">
-				AND (
+        SELECT count(1)
+        FROM xxl_job_log AS t
+        <trim prefix="WHERE" prefixOverrides="AND | OR">
+            <if test="jobId==0 and jobGroup gt 0">
+                AND t.job_group = #{jobGroup}
+            </if>
+            <if test="jobId gt 0">
+                AND t.job_id = #{jobId}
+            </if>
+            <if test="triggerTimeStart != null">
+                AND t.trigger_time <![CDATA[ >= ]]> #{triggerTimeStart}
+            </if>
+            <if test="triggerTimeEnd != null">
+                AND t.trigger_time <![CDATA[ <= ]]> #{triggerTimeEnd}
+            </if>
+            <if test="logStatus == 1">
+                AND t.handle_code = 200
+            </if>
+            <if test="logStatus == 2">
+                AND (
                 t.trigger_code NOT IN (0, 200) OR
                 t.handle_code NOT IN (0, 200)
-				)
-			</if>
-			<if test="logStatus == 3">
-				AND t.trigger_code = 200
-				AND t.handle_code = 0
-			</if>
-		</trim>
-	</select>
+                )
+            </if>
+            <if test="logStatus == 3">
+                AND t.trigger_code = 200
+                AND t.handle_code = 0
+            </if>
+        </trim>
+    </select>
 
     <select id="load" parameterType="java.lang.Long" resultMap="XxlJobLog">
-		SELECT
-		<include refid="Base_Column_List"/>
-		FROM xxl_job_log AS t
-		WHERE t.id = #{id}
-	</select>
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM xxl_job_log AS t
+        WHERE t.id = #{id}
+    </select>
 
 
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLog" useGeneratedKeys="true" keyProperty="id">
-		INSERT INTO xxl_job_log (
+    <insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLog" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO xxl_job_log (
         `job_group`,
         `job_id`,
         `trigger_time`,
         `trigger_code`,
         `handle_code`
-		) VALUES (
+        ) VALUES (
         #{jobGroup},
         #{jobId},
         #{triggerTime},
         #{triggerCode},
         #{handleCode}
-		);
-		<!--<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
+        );
+        <!--<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
             SELECT LAST_INSERT_ID()
         </selectKey>-->
-	</insert>
+    </insert>
 
-	<update id="updateTriggerInfo">
-		UPDATE xxl_job_log
-		SET
+    <update id="updateTriggerInfo">
+        UPDATE xxl_job_log
+        SET
         `trigger_time`= #{triggerTime},
         `trigger_code`= #{triggerCode},
         `trigger_msg`= #{triggerMsg},
@@ -150,21 +150,21 @@
         `executor_sharding_param`= #{executorShardingParam},
         `executor_fail_retry_count`= #{executorFailRetryCount}
         WHERE `id`= #{id}
-	</update>
+    </update>
 
-	<update id="updateHandleInfo">
-		UPDATE xxl_job_log
+    <update id="updateHandleInfo">
+        UPDATE xxl_job_log
         SET
         `handle_time`= #{handleTime},
         `handle_code`= #{handleCode},
         `handle_msg`= #{handleMsg}
         WHERE `id`= #{id}
-	</update>
+    </update>
 
-	<delete id="delete">
-		delete from xxl_job_log
-		WHERE job_id = #{jobId}
-	</delete>
+    <delete id="delete">
+        delete from xxl_job_log
+        WHERE job_id = #{jobId}
+    </delete>
 
     <!--<select id="triggerCountByDay" resultType="java.util.Map" >
 		SELECT
@@ -179,87 +179,87 @@
     </select>-->
 
     <select id="findLogReport" resultType="java.util.Map">
-		SELECT
+        SELECT
         COUNT(handle_code) `triggerDayCount`,
         SUM(CASE WHEN (trigger_code in (0, 200) and handle_code = 0) then 1 else 0 end) as `triggerDayCountRunning`,
         SUM(CASE WHEN handle_code = 200 then 1 else 0 end) as `triggerDayCountSuc`
-		FROM xxl_job_log
-		WHERE trigger_time BETWEEN #{from} and #{to}
+        FROM xxl_job_log
+        WHERE trigger_time BETWEEN #{from} and #{to}
     </select>
 
-	<select id="findClearLogIds" resultType="long">
-		SELECT id FROM xxl_job_log
-		<trim prefix="WHERE" prefixOverrides="AND | OR">
-			<if test="jobGroup gt 0">
-				AND job_group = #{jobGroup}
-			</if>
-			<if test="jobId gt 0">
-				AND job_id = #{jobId}
-			</if>
-			<if test="clearBeforeTime != null">
-				AND trigger_time <![CDATA[ <= ]]> #{clearBeforeTime}
-			</if>
-			<if test="clearBeforeNum gt 0">
-				AND id NOT in(
-				SELECT id FROM(
-				SELECT id FROM xxl_job_log AS t
-				<trim prefix="WHERE" prefixOverrides="AND | OR">
-					<if test="jobGroup gt 0">
-						AND t.job_group = #{jobGroup}
-					</if>
-					<if test="jobId gt 0">
-						AND t.job_id = #{jobId}
-					</if>
-				</trim>
-				ORDER BY t.trigger_time desc
-				LIMIT 0, #{clearBeforeNum}
-				) t1
-				)
-			</if>
-		</trim>
-		order by id asc
-		LIMIT #{pagesize}
-	</select>
+    <select id="findClearLogIds" resultType="long">
+        SELECT id FROM xxl_job_log
+        <trim prefix="WHERE" prefixOverrides="AND | OR">
+            <if test="jobGroup gt 0">
+                AND job_group = #{jobGroup}
+            </if>
+            <if test="jobId gt 0">
+                AND job_id = #{jobId}
+            </if>
+            <if test="clearBeforeTime != null">
+                AND trigger_time <![CDATA[ <= ]]> #{clearBeforeTime}
+            </if>
+            <if test="clearBeforeNum gt 0">
+                AND id NOT in(
+                SELECT id FROM(
+                SELECT id FROM xxl_job_log AS t
+                <trim prefix="WHERE" prefixOverrides="AND | OR">
+                    <if test="jobGroup gt 0">
+                        AND t.job_group = #{jobGroup}
+                    </if>
+                    <if test="jobId gt 0">
+                        AND t.job_id = #{jobId}
+                    </if>
+                </trim>
+                ORDER BY t.trigger_time desc
+                LIMIT 0, #{clearBeforeNum}
+                ) t1
+                )
+            </if>
+        </trim>
+        order by id asc
+        LIMIT #{pagesize}
+    </select>
 
-	<delete id="clearLog">
-		delete from xxl_job_log
-		WHERE id in
-		<foreach collection="logIds" item="item" open="(" close=")" separator=",">
-			#{item}
-		</foreach>
-	</delete>
+    <delete id="clearLog">
+        delete from xxl_job_log
+        WHERE id in
+        <foreach collection="logIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </delete>
 
-	<select id="findFailJobLogIds" resultType="long">
+    <select id="findFailJobLogIds" resultType="long">
         SELECT id FROM `xxl_job_log`
         WHERE !(
         (trigger_code in (0, 200) and handle_code = 0)
         OR
         (handle_code = 200)
-		)
+        )
         AND `alarm_status` = 0
-		ORDER BY id ASC
-		LIMIT #{pagesize}
-	</select>
+        ORDER BY id ASC
+        LIMIT #{pagesize}
+    </select>
 
-	<update id="updateAlarmStatus">
-		UPDATE xxl_job_log
-		SET
+    <update id="updateAlarmStatus">
+        UPDATE xxl_job_log
+        SET
         `alarm_status` = #{newAlarmStatus}
         WHERE `id`= #{logId} AND `alarm_status` = #{oldAlarmStatus}
-	</update>
+    </update>
 
-	<select id="findLostJobIds" resultType="long">
-		SELECT
+    <select id="findLostJobIds" resultType="long">
+        SELECT
         t.id
-		FROM
+        FROM
         xxl_job_log t
         LEFT JOIN xxl_job_registry t2 ON t.executor_address = t2.registry_value
-		WHERE
+        WHERE
         t.trigger_code = 200
         AND t.handle_code = 0
         AND t.trigger_time <![CDATA[ <= ]]> #{losedTime}
         AND t2.id IS NULL;
-	</select>
+    </select>
     <!--
     SELECT t.id
     FROM xxl_job_log AS t

pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml

@@ -3,41 +3,41 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxl.job.admin.dao.XxlJobLogReportDao">
 
-	<resultMap id="XxlJobLogReport" type="com.xxl.job.admin.core.model.XxlJobLogReport">
-		<result column="id" property="id"/>
+    <resultMap id="XxlJobLogReport" type="com.xxl.job.admin.core.model.XxlJobLogReport">
+        <result column="id" property="id"/>
         <result column="trigger_day" property="triggerDay"/>
-		<result column="running_count" property="runningCount"/>
+        <result column="running_count" property="runningCount"/>
         <result column="suc_count" property="sucCount"/>
         <result column="fail_count" property="failCount"/>
-	</resultMap>
+    </resultMap>
 
-	<sql id="Base_Column_List">
-		t.id,
-		t.trigger_day,
-		t.running_count,
-		t.suc_count,
-		t.fail_count
-	</sql>
+    <sql id="Base_Column_List">
+        t.id,
+        t.trigger_day,
+        t.running_count,
+        t.suc_count,
+        t.fail_count
+    </sql>
 
-	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLogReport" useGeneratedKeys="true"
-			keyProperty="id">
-		INSERT INTO xxl_job_log_report (
+    <insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLogReport" useGeneratedKeys="true"
+            keyProperty="id">
+        INSERT INTO xxl_job_log_report (
         `trigger_day`,
         `running_count`,
         `suc_count`,
         `fail_count`
-		) VALUES (
+        ) VALUES (
         #{triggerDay},
         #{runningCount},
         #{sucCount},
         #{failCount}
-		);
-		<!--<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
+        );
+        <!--<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
             SELECT LAST_INSERT_ID()
         </selectKey>-->
-	</insert>
+    </insert>
 
-	<update id="update">
+    <update id="update">
         UPDATE xxl_job_log_report
         SET `running_count` = #{runningCount},
         `suc_count` = #{sucCount},
@@ -45,20 +45,20 @@
         WHERE `trigger_day` = #{triggerDay}
     </update>
 
-	<select id="queryLogReport" resultMap="XxlJobLogReport">
-		SELECT
-		<include refid="Base_Column_List"/>
-		FROM xxl_job_log_report AS t
-		WHERE t.trigger_day between #{triggerDayFrom} and #{triggerDayTo}
-		ORDER BY t.trigger_day ASC
-	</select>
+    <select id="queryLogReport" resultMap="XxlJobLogReport">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM xxl_job_log_report AS t
+        WHERE t.trigger_day between #{triggerDayFrom} and #{triggerDayTo}
+        ORDER BY t.trigger_day ASC
+    </select>
 
-	<select id="queryLogReportTotal" resultMap="XxlJobLogReport">
-		SELECT
+    <select id="queryLogReportTotal" resultMap="XxlJobLogReport">
+        SELECT
         SUM(running_count) running_count,
         SUM(suc_count) suc_count,
         SUM(fail_count) fail_count
-		FROM xxl_job_log_report AS t
-	</select>
+        FROM xxl_job_log_report AS t
+    </select>
 
 </mapper>

pigx-visual/pigx-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml

@@ -3,42 +3,42 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxl.job.admin.dao.XxlJobRegistryDao">
 
-	<resultMap id="XxlJobRegistry" type="com.xxl.job.admin.core.model.XxlJobRegistry">
-		<result column="id" property="id"/>
+    <resultMap id="XxlJobRegistry" type="com.xxl.job.admin.core.model.XxlJobRegistry">
+        <result column="id" property="id"/>
         <result column="registry_group" property="registryGroup"/>
         <result column="registry_key" property="registryKey"/>
         <result column="registry_value" property="registryValue"/>
-		<result column="update_time" property="updateTime"/>
-	</resultMap>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
 
-	<sql id="Base_Column_List">
-		t.id,
-		t.registry_group,
-		t.registry_key,
-		t.registry_value,
-		t.update_time
-	</sql>
+    <sql id="Base_Column_List">
+        t.id,
+        t.registry_group,
+        t.registry_key,
+        t.registry_value,
+        t.update_time
+    </sql>
 
-	<select id="findDead" parameterType="java.util.HashMap" resultType="java.lang.Integer">
-		SELECT t.id
-		FROM xxl_job_registry AS t
+    <select id="findDead" parameterType="java.util.HashMap" resultType="java.lang.Integer">
+        SELECT t.id
+        FROM xxl_job_registry AS t
         WHERE t.update_time <![CDATA[ < ]]> DATE_ADD(#{nowTime},INTERVAL -#{timeout} SECOND)
-	</select>
+    </select>
 
-	<delete id="removeDead" parameterType="java.lang.Integer">
-		DELETE FROM xxl_job_registry
-		WHERE id in
-		<foreach collection="ids" item="item" open="(" close=")" separator=",">
-			#{item}
-		</foreach>
-	</delete>
+    <delete id="removeDead" parameterType="java.lang.Integer">
+        DELETE FROM xxl_job_registry
+        WHERE id in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </delete>
 
-	<select id="findAll" parameterType="java.util.HashMap" resultMap="XxlJobRegistry">
-		SELECT
-		<include refid="Base_Column_List"/>
-		FROM xxl_job_registry AS t
+    <select id="findAll" parameterType="java.util.HashMap" resultMap="XxlJobRegistry">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM xxl_job_registry AS t
         WHERE t.update_time <![CDATA[ > ]]> DATE_ADD(#{nowTime},INTERVAL -#{timeout} SECOND)
-	</select>
+    </select>
 
     <insert id="registrySaveOrUpdate">
         INSERT INTO xxl_job_registry( `registry_group` , `registry_key` , `registry_value`, `update_time`)
@@ -62,11 +62,11 @@
     </insert>
     -->
 
-	<delete id="registryDelete">
-		DELETE FROM xxl_job_registry
-		WHERE registry_group = #{registryGroup}
+    <delete id="registryDelete">
+        DELETE FROM xxl_job_registry
+        WHERE registry_group = #{registryGroup}
         AND registry_key = #{registryKey}
         AND registry_value = #{registryValue}
-	</delete>
+    </delete>
 
 </mapper>