Browse Source

update document

xuxueli 6 years ago
parent
commit
ba3a695a3b

+ 8 - 8
doc/XXL-JOB官方文档.md View File

@@ -778,13 +778,13 @@ try{
778 778
 ### 5.2 “调度数据库”配置
779 779
 XXL-JOB调度模块基于自研调度组件并支持集群部署,调度数据库表说明如下:
780 780
 
781
-    - XXL_JOB_LOCK:任务调度锁表;
782
-    - XXL_JOB_GROUP:执行器信息表,维护任务执行器信息;
783
-    - XXL_JOB_INFO:调度扩展信息表: 用于保存XXL-JOB调度任务的扩展信息,如任务分组、任务名、机器地址、执行器、执行入参和报警邮件等等;
784
-    - XXL_JOB_LOG:调度日志表: 用于保存XXL-JOB任务调度的历史信息,如调度结果、执行结果、调度入参、调度机器和执行器等等;
785
-    - XXL_JOB_LOGGLUE:任务GLUE日志:用于保存GLUE更新历史,用于支持GLUE的版本回溯功能;
786
-    - XXL_JOB_REGISTRY:执行器注册表,维护在线的执行器和调度中心机器地址信息;
787
-    - XXL_JOB_USER:系统用户表;
781
+    - xxl_job_lock:任务调度锁表;
782
+    - xxl_job_group:执行器信息表,维护任务执行器信息;
783
+    - xxl_job_info:调度扩展信息表: 用于保存XXL-JOB调度任务的扩展信息,如任务分组、任务名、机器地址、执行器、执行入参和报警邮件等等;
784
+    - xxl_job_log:调度日志表: 用于保存XXL-JOB任务调度的历史信息,如调度结果、执行结果、调度入参、调度机器和执行器等等;
785
+    - xxl_job_logglue:任务GLUE日志:用于保存GLUE更新历史,用于支持GLUE的版本回溯功能;
786
+    - xxl_job_registry:执行器注册表,维护在线的执行器和调度中心机器地址信息;
787
+    - xxl_job_user:系统用户表;
788 788
 
789 789
 
790 790
 ### 5.3 架构设计
@@ -958,7 +958,7 @@ XXL-JOB会为每次调度请求生成一个单独的日志文件,需要通过
958 958
 自v1.5版本之后, 任务取消了"任务执行机器"属性, 改为通过任务注册和自动发现的方式, 动态获取远程执行器地址并执行。
959 959
 
960 960
     AppName: 每个执行器机器集群的唯一标示, 任务注册以 "执行器" 为最小粒度进行注册; 每个任务通过其绑定的执行器可感知对应的执行器机器列表;
961
-    注册表: 见"XXL_JOB_REGISTRY"表, "执行器" 在进行任务注册时将会周期性维护一条注册记录,即机器地址和AppName的绑定关系; "调度中心" 从而可以动态感知每个AppName在线的机器列表;
961
+    注册表: 见"xxl_job_registry"表, "执行器" 在进行任务注册时将会周期性维护一条注册记录,即机器地址和AppName的绑定关系; "调度中心" 从而可以动态感知每个AppName在线的机器列表;
962 962
     执行器注册: 任务注册Beat周期默认30s; 执行器以一倍Beat进行执行器注册, 调度中心以一倍Beat进行动态任务发现; 注册信息的失效时间被三倍Beat; 
963 963
     执行器注册摘除:执行器销毁时,将会主动上报调度中心并摘除对应的执行器机器信息,提高心跳注册的实时性;
964 964
     

+ 11 - 11
doc/db/tables_xxl_job.sql View File

@@ -3,7 +3,7 @@ use `xxl-job`;
3 3
 
4 4
 
5 5
 
6
-CREATE TABLE `XXL_JOB_INFO` (
6
+CREATE TABLE `xxl_job_info` (
7 7
   `id` int(11) NOT NULL AUTO_INCREMENT,
8 8
   `job_group` int(11) NOT NULL COMMENT '执行器主键ID',
9 9
   `job_cron` varchar(128) NOT NULL COMMENT '任务执行CRON',
@@ -29,7 +29,7 @@ CREATE TABLE `XXL_JOB_INFO` (
29 29
   PRIMARY KEY (`id`)
30 30
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
31 31
 
32
-CREATE TABLE `XXL_JOB_LOG` (
32
+CREATE TABLE `xxl_job_log` (
33 33
   `id` int(11) NOT NULL AUTO_INCREMENT,
34 34
   `job_group` int(11) NOT NULL COMMENT '执行器主键ID',
35 35
   `job_id` int(11) NOT NULL COMMENT '任务,主键ID',
@@ -50,7 +50,7 @@ CREATE TABLE `XXL_JOB_LOG` (
50 50
   KEY `I_handle_code` (`handle_code`)
51 51
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
52 52
 
53
-CREATE TABLE `XXL_JOB_LOGGLUE` (
53
+CREATE TABLE `xxl_job_logglue` (
54 54
   `id` int(11) NOT NULL AUTO_INCREMENT,
55 55
   `job_id` int(11) NOT NULL COMMENT '任务,主键ID',
56 56
   `glue_type` varchar(50) DEFAULT NULL COMMENT 'GLUE类型',
@@ -61,7 +61,7 @@ CREATE TABLE `XXL_JOB_LOGGLUE` (
61 61
   PRIMARY KEY (`id`)
62 62
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
63 63
 
64
-CREATE TABLE `XXL_JOB_REGISTRY` (
64
+CREATE TABLE `xxl_job_registry` (
65 65
   `id` int(11) NOT NULL AUTO_INCREMENT,
66 66
   `registry_group` varchar(255) NOT NULL,
67 67
   `registry_key` varchar(255) NOT NULL,
@@ -71,7 +71,7 @@ CREATE TABLE `XXL_JOB_REGISTRY` (
71 71
   KEY `i_g_k_v` (`registry_group`,`registry_key`,`registry_value`)
72 72
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
73 73
 
74
-CREATE TABLE `XXL_JOB_GROUP` (
74
+CREATE TABLE `xxl_job_group` (
75 75
   `id` int(11) NOT NULL AUTO_INCREMENT,
76 76
   `app_name` varchar(64) NOT NULL COMMENT '执行器AppName',
77 77
   `title` varchar(12) NOT NULL COMMENT '执行器名称',
@@ -81,7 +81,7 @@ CREATE TABLE `XXL_JOB_GROUP` (
81 81
   PRIMARY KEY (`id`)
82 82
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
83 83
 
84
-CREATE TABLE `XXL_JOB_USER` (
84
+CREATE TABLE `xxl_job_user` (
85 85
   `id` int(11) NOT NULL AUTO_INCREMENT,
86 86
   `username` varchar(50) NOT NULL COMMENT '账号',
87 87
   `password` varchar(50) NOT NULL COMMENT '密码',
@@ -91,16 +91,16 @@ CREATE TABLE `XXL_JOB_USER` (
91 91
   UNIQUE KEY `i_username` (`username`) USING BTREE
92 92
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
93 93
 
94
-CREATE TABLE `XXL_JOB_LOCK` (
94
+CREATE TABLE `xxl_job_lock` (
95 95
   `lock_name` varchar(50) NOT NULL COMMENT '锁名称',
96 96
   PRIMARY KEY (`lock_name`)
97 97
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
98 98
 
99 99
 
100
-INSERT INTO `XXL_JOB_GROUP`(`id`, `app_name`, `title`, `order`, `address_type`, `address_list`) VALUES (1, 'xxl-job-executor-sample', '示例执行器', 1, 0, NULL);
101
-INSERT INTO `XXL_JOB_INFO`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `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`) VALUES (1, 1, '0 0 0 * * ? *', '测试任务1', '2018-11-03 22:21:31', '2018-11-03 22:21:31', 'XXL', '', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', '');
102
-INSERT INTO `XXL_JOB_USER`(`id`, `username`, `password`, `role`, `permission`) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL);
103
-INSERT INTO `XXL_JOB_LOCK` ( `lock_name`) VALUES ( 'schedule_lock');
100
+INSERT INTO `xxl_job_group`(`id`, `app_name`, `title`, `order`, `address_type`, `address_list`) VALUES (1, 'xxl-job-executor-sample', '示例执行器', 1, 0, NULL);
101
+INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `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`) VALUES (1, 1, '0 0 0 * * ? *', '测试任务1', '2018-11-03 22:21:31', '2018-11-03 22:21:31', 'XXL', '', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', '');
102
+INSERT INTO `xxl_job_user`(`id`, `username`, `password`, `role`, `permission`) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL);
103
+INSERT INTO `xxl_job_lock` ( `lock_name`) VALUES ( 'schedule_lock');
104 104
 
105 105
 commit;
106 106
 

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java View File

@@ -58,7 +58,7 @@ public class JobScheduleHelper {
58 58
                         }
59 59
                         conn.setAutoCommit(false);
60 60
 
61
-                        preparedStatement = conn.prepareStatement(  "select * from XXL_JOB_LOCK where lock_name = 'schedule_lock' for update" );
61
+                        preparedStatement = conn.prepareStatement(  "select * from xxl_job_lock where lock_name = 'schedule_lock' for update" );
62 62
                         preparedStatement.execute();
63 63
 
64 64
                         // tx start

+ 6 - 6
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml View File

@@ -23,24 +23,24 @@
23 23
 
24 24
 	<select id="findAll" resultMap="XxlJobGroup">
25 25
 		SELECT <include refid="Base_Column_List" />
26
-		FROM XXL_JOB_GROUP AS t
26
+		FROM xxl_job_group AS t
27 27
 		ORDER BY t.order ASC
28 28
 	</select>
29 29
 
30 30
 	<select id="findByAddressType" parameterType="java.lang.Integer" resultMap="XxlJobGroup">
31 31
 		SELECT <include refid="Base_Column_List" />
32
-		FROM XXL_JOB_GROUP AS t
32
+		FROM xxl_job_group AS t
33 33
 		WHERE t.address_type = #{addressType}
34 34
 		ORDER BY t.order ASC
35 35
 	</select>
36 36
 
37 37
 	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobGroup" useGeneratedKeys="true" keyProperty="id" >
38
-		INSERT INTO XXL_JOB_GROUP ( `app_name`, `title`, `order`, `address_type`, `address_list`)
38
+		INSERT INTO xxl_job_group ( `app_name`, `title`, `order`, `address_type`, `address_list`)
39 39
 		values ( #{appName}, #{title}, #{order}, #{addressType}, #{addressList});
40 40
 	</insert>
41 41
 
42 42
 	<update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobGroup" >
43
-		UPDATE XXL_JOB_GROUP
43
+		UPDATE xxl_job_group
44 44
 		SET `app_name` = #{appName},
45 45
 			`title` = #{title},
46 46
 			`order` = #{order},
@@ -50,13 +50,13 @@
50 50
 	</update>
51 51
 
52 52
 	<delete id="remove" parameterType="java.lang.Integer" >
53
-		DELETE FROM XXL_JOB_GROUP
53
+		DELETE FROM xxl_job_group
54 54
 		WHERE id = #{id}
55 55
 	</delete>
56 56
 
57 57
 	<select id="load" parameterType="java.lang.Integer" resultMap="XxlJobGroup">
58 58
 		SELECT <include refid="Base_Column_List" />
59
-		FROM XXL_JOB_GROUP AS t
59
+		FROM xxl_job_group AS t
60 60
 		WHERE t.id = #{id}
61 61
 	</select>
62 62
 

+ 10 - 10
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml View File

@@ -62,7 +62,7 @@
62 62
 
63 63
 	<select id="pageList" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
64 64
 		SELECT <include refid="Base_Column_List" />
65
-		FROM XXL_JOB_INFO AS t
65
+		FROM xxl_job_info AS t
66 66
 		<trim prefix="WHERE" prefixOverrides="AND | OR" >
67 67
 			<if test="jobGroup gt 0">
68 68
 				AND t.job_group = #{jobGroup}
@@ -83,7 +83,7 @@
83 83
 
84 84
 	<select id="pageListCount" parameterType="java.util.HashMap" resultType="int">
85 85
 		SELECT count(1)
86
-		FROM XXL_JOB_INFO AS t
86
+		FROM xxl_job_info AS t
87 87
 		<trim prefix="WHERE" prefixOverrides="AND | OR" >
88 88
 			<if test="jobGroup gt 0">
89 89
 				AND t.job_group = #{jobGroup}
@@ -101,7 +101,7 @@
101 101
 	</select>
102 102
 
103 103
 	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobInfo" useGeneratedKeys="true" keyProperty="id" >
104
-		INSERT INTO XXL_JOB_INFO (
104
+		INSERT INTO xxl_job_info (
105 105
 			job_group,
106 106
 			job_cron,
107 107
 			job_desc,
@@ -154,12 +154,12 @@
154 154
 
155 155
 	<select id="loadById" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
156 156
 		SELECT <include refid="Base_Column_List" />
157
-		FROM XXL_JOB_INFO AS t
157
+		FROM xxl_job_info AS t
158 158
 		WHERE t.id = #{id}
159 159
 	</select>
160 160
 
161 161
 	<update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobInfo" >
162
-		UPDATE XXL_JOB_INFO
162
+		UPDATE xxl_job_info
163 163
 		SET
164 164
 			job_group = #{jobGroup},
165 165
 			job_cron = #{jobCron},
@@ -186,31 +186,31 @@
186 186
 
187 187
 	<delete id="delete" parameterType="java.util.HashMap">
188 188
 		DELETE
189
-		FROM XXL_JOB_INFO
189
+		FROM xxl_job_info
190 190
 		WHERE id = #{id}
191 191
 	</delete>
192 192
 
193 193
 	<select id="getJobsByGroup" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
194 194
 		SELECT <include refid="Base_Column_List" />
195
-		FROM XXL_JOB_INFO AS t
195
+		FROM xxl_job_info AS t
196 196
 		WHERE t.job_group = #{jobGroup}
197 197
 	</select>
198 198
 
199 199
 	<select id="findAllCount" resultType="int">
200 200
 		SELECT count(1)
201
-		FROM XXL_JOB_INFO
201
+		FROM xxl_job_info
202 202
 	</select>
203 203
 
204 204
 
205 205
 	<select id="scheduleJobQuery" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
206 206
 		SELECT <include refid="Base_Column_List" />
207
-		FROM XXL_JOB_INFO AS t
207
+		FROM xxl_job_info AS t
208 208
 		WHERE t.trigger_status = 1
209 209
 			and t.trigger_next_time<![CDATA[ < ]]> #{maxNextTime}
210 210
 	</select>
211 211
 
212 212
 	<update id="scheduleUpdate" parameterType="com.xxl.job.admin.core.model.XxlJobInfo"  >
213
-		UPDATE XXL_JOB_INFO
213
+		UPDATE xxl_job_info
214 214
 		SET
215 215
 			trigger_last_time = #{triggerLastTime},
216 216
 			trigger_next_time = #{triggerNextTime}

+ 5 - 5
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml View File

@@ -24,7 +24,7 @@
24 24
 	</sql>
25 25
 	
26 26
 	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLogGlue" useGeneratedKeys="true" keyProperty="id" >
27
-		INSERT INTO XXL_JOB_LOGGLUE (
27
+		INSERT INTO xxl_job_logglue (
28 28
 			`job_id`,
29 29
 			`glue_type`,
30 30
 			`glue_source`,
@@ -46,16 +46,16 @@
46 46
 	
47 47
 	<select id="findByJobId" parameterType="java.lang.Integer" resultMap="XxlJobLogGlue">
48 48
 		SELECT <include refid="Base_Column_List" />
49
-		FROM XXL_JOB_LOGGLUE AS t
49
+		FROM xxl_job_logglue AS t
50 50
 		WHERE t.job_id = #{jobId}
51 51
 		ORDER BY id DESC
52 52
 	</select>
53 53
 	
54 54
 	<delete id="removeOld" >
55
-		DELETE FROM XXL_JOB_LOGGLUE
55
+		DELETE FROM xxl_job_logglue
56 56
 		WHERE id NOT in(
57 57
 			SELECT id FROM(
58
-				SELECT id FROM XXL_JOB_LOGGLUE
58
+				SELECT id FROM xxl_job_logglue
59 59
 				WHERE `job_id` = #{jobId}
60 60
 				ORDER BY update_time desc
61 61
 				LIMIT 0, #{limit}
@@ -64,7 +64,7 @@
64 64
 	</delete>
65 65
 	
66 66
 	<delete id="deleteByJobId" parameterType="java.lang.Integer" >
67
-		DELETE FROM XXL_JOB_LOGGLUE
67
+		DELETE FROM xxl_job_logglue
68 68
 		WHERE `job_id` = #{jobId}
69 69
 	</delete>
70 70
 	

+ 13 - 13
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml View File

@@ -46,7 +46,7 @@
46 46
 	
47 47
 	<select id="pageList" resultMap="XxlJobLog">
48 48
 		SELECT <include refid="Base_Column_List" />
49
-		FROM XXL_JOB_LOG AS t
49
+		FROM xxl_job_log AS t
50 50
 		<trim prefix="WHERE" prefixOverrides="AND | OR" >
51 51
 			<if test="jobId==0 and jobGroup gt 0">
52 52
 				AND t.job_group = #{jobGroup}
@@ -80,7 +80,7 @@
80 80
 	
81 81
 	<select id="pageListCount" resultType="int">
82 82
 		SELECT count(1)
83
-		FROM XXL_JOB_LOG AS t
83
+		FROM xxl_job_log AS t
84 84
 		<trim prefix="WHERE" prefixOverrides="AND | OR" >
85 85
 			<if test="jobId==0 and jobGroup gt 0">
86 86
 				AND t.job_group = #{jobGroup}
@@ -112,13 +112,13 @@
112 112
 	
113 113
 	<select id="load" parameterType="java.lang.Integer" resultMap="XxlJobLog">
114 114
 		SELECT <include refid="Base_Column_List" />
115
-		FROM XXL_JOB_LOG AS t
115
+		FROM xxl_job_log AS t
116 116
 		WHERE t.id = #{id}
117 117
 	</select>
118 118
 
119 119
 	
120 120
 	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobLog" useGeneratedKeys="true" keyProperty="id" >
121
-		INSERT INTO XXL_JOB_LOG (
121
+		INSERT INTO xxl_job_log (
122 122
 			`job_group`,
123 123
 			`job_id`,
124 124
 			`trigger_time`,
@@ -137,7 +137,7 @@
137 137
 	</insert>
138 138
 
139 139
 	<update id="updateTriggerInfo" >
140
-		UPDATE XXL_JOB_LOG
140
+		UPDATE xxl_job_log
141 141
 		SET
142 142
 			`trigger_time`= #{triggerTime},
143 143
 			`trigger_code`= #{triggerCode},
@@ -151,7 +151,7 @@
151 151
 	</update>
152 152
 
153 153
 	<update id="updateHandleInfo">
154
-		UPDATE XXL_JOB_LOG
154
+		UPDATE xxl_job_log
155 155
 		SET 
156 156
 			`handle_time`= #{handleTime}, 
157 157
 			`handle_code`= #{handleCode},
@@ -160,13 +160,13 @@
160 160
 	</update>
161 161
 	
162 162
 	<delete id="delete" >
163
-		delete from XXL_JOB_LOG
163
+		delete from xxl_job_log
164 164
 		WHERE job_id = #{jobId}
165 165
 	</delete>
166 166
 
167 167
 	<select id="triggerCountByHandleCode" resultType="int" >
168 168
 		SELECT count(1)
169
-		FROM XXL_JOB_LOG AS t
169
+		FROM xxl_job_log AS t
170 170
 		<trim prefix="WHERE" prefixOverrides="AND | OR" >
171 171
 			<if test="handleCode gt 0">
172 172
 				AND t.handle_code = #{handleCode}
@@ -180,13 +180,13 @@
180 180
 			COUNT(handle_code) triggerDayCount,
181 181
 			SUM(CASE WHEN (trigger_code in (0, 200) and handle_code = 0) then 1 else 0 end) as triggerDayCountRunning,
182 182
 			SUM(CASE WHEN handle_code = 200 then 1 else 0 end) as triggerDayCountSuc
183
-		FROM XXL_JOB_LOG
183
+		FROM xxl_job_log
184 184
 		WHERE trigger_time BETWEEN #{from} and #{to}
185 185
 		GROUP BY triggerDay;
186 186
     </select>
187 187
 
188 188
 	<delete id="clearLog" >
189
-		delete from XXL_JOB_LOG
189
+		delete from xxl_job_log
190 190
 		<trim prefix="WHERE" prefixOverrides="AND | OR" >
191 191
 			<if test="jobGroup gt 0">
192 192
 				AND job_group = #{jobGroup}
@@ -200,7 +200,7 @@
200 200
 			<if test="clearBeforeNum gt 0">
201 201
 				AND id NOT in(
202 202
 					SELECT id FROM(
203
-						SELECT id FROM XXL_JOB_LOG AS t
203
+						SELECT id FROM xxl_job_log AS t
204 204
 						<trim prefix="WHERE" prefixOverrides="AND | OR" >
205 205
 							<if test="jobGroup gt 0">
206 206
 								AND t.job_group = #{jobGroup}
@@ -218,7 +218,7 @@
218 218
 	</delete>
219 219
 
220 220
 	<select id="findFailJobLogIds" resultType="int" >
221
-		SELECT id FROM `XXL_JOB_LOG`
221
+		SELECT id FROM `xxl_job_log`
222 222
 		WHERE !(
223 223
 			(trigger_code in (0, 200) and handle_code = 0)
224 224
 			OR
@@ -229,7 +229,7 @@
229 229
 	</select>
230 230
 
231 231
 	<update id="updateAlarmStatus" >
232
-		UPDATE XXL_JOB_LOG
232
+		UPDATE xxl_job_log
233 233
 		SET
234 234
 			`alarm_status` = #{newAlarmStatus}
235 235
 		WHERE `id`= #{logId} AND `alarm_status` = #{oldAlarmStatus}

+ 5 - 5
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml View File

@@ -20,18 +20,18 @@
20 20
 	</sql>
21 21
 	
22 22
 	<delete id="removeDead" parameterType="java.lang.Integer" >
23
-		DELETE FROM XXL_JOB_REGISTRY
23
+		DELETE FROM xxl_job_registry
24 24
 		WHERE update_time <![CDATA[ < ]]> DATE_ADD(NOW(),INTERVAL -#{timeout} SECOND)
25 25
 	</delete>
26 26
 
27 27
 	<select id="findAll" parameterType="java.lang.Integer" resultMap="XxlJobRegistry">
28 28
 		SELECT <include refid="Base_Column_List" />
29
-		FROM XXL_JOB_REGISTRY AS t
29
+		FROM xxl_job_registry AS t
30 30
 		WHERE t.update_time <![CDATA[ > ]]> DATE_ADD(NOW(),INTERVAL -#{timeout} SECOND)
31 31
 	</select>
32 32
 
33 33
     <update id="registryUpdate" >
34
-        UPDATE XXL_JOB_REGISTRY
34
+        UPDATE xxl_job_registry
35 35
         SET `update_time` = NOW()
36 36
         WHERE `registry_group` = #{registryGroup}
37 37
           AND `registry_key` = #{registryKey}
@@ -39,12 +39,12 @@
39 39
     </update>
40 40
 
41 41
     <insert id="registrySave" >
42
-        INSERT INTO XXL_JOB_REGISTRY( `registry_group` , `registry_key` , `registry_value`, `update_time`)
42
+        INSERT INTO xxl_job_registry( `registry_group` , `registry_key` , `registry_value`, `update_time`)
43 43
         VALUES( #{registryGroup}  , #{registryKey} , #{registryValue}, NOW())
44 44
     </insert>
45 45
 
46 46
 	<delete id="registryDelete" >
47
-		DELETE FROM XXL_JOB_REGISTRY
47
+		DELETE FROM xxl_job_registry
48 48
 		WHERE registry_group = #{registryGroup}
49 49
 			AND registry_key = #{registryKey}
50 50
 			AND registry_value = #{registryValue}

+ 6 - 6
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 	<select id="pageList" parameterType="java.util.HashMap" resultMap="XxlJobUser">
23 23
 		SELECT <include refid="Base_Column_List" />
24
-		FROM XXL_JOB_USER AS t
24
+		FROM xxl_job_user AS t
25 25
 		<trim prefix="WHERE" prefixOverrides="AND | OR" >
26 26
 			<if test="username != null and username != ''">
27 27
 				AND t.username like CONCAT(CONCAT('%', #{username}), '%')
@@ -36,7 +36,7 @@
36 36
 
37 37
 	<select id="pageListCount" parameterType="java.util.HashMap" resultType="int">
38 38
 		SELECT count(1)
39
-		FROM XXL_JOB_USER AS t
39
+		FROM xxl_job_user AS t
40 40
 		<trim prefix="WHERE" prefixOverrides="AND | OR" >
41 41
 			<if test="username != null and username != ''">
42 42
 				AND t.username like CONCAT(CONCAT('%', #{username}), '%')
@@ -49,12 +49,12 @@
49 49
 
50 50
 	<select id="loadByUserName" parameterType="java.util.HashMap" resultMap="XxlJobUser">
51 51
 		SELECT <include refid="Base_Column_List" />
52
-		FROM XXL_JOB_USER AS t
52
+		FROM xxl_job_user AS t
53 53
 		WHERE t.username = #{username}
54 54
 	</select>
55 55
 
56 56
 	<insert id="save" parameterType="com.xxl.job.admin.core.model.XxlJobUser" useGeneratedKeys="true" keyProperty="id" >
57
-		INSERT INTO XXL_JOB_USER (
57
+		INSERT INTO xxl_job_user (
58 58
 			username,
59 59
 			password,
60 60
 			role,
@@ -68,7 +68,7 @@
68 68
 	</insert>
69 69
 
70 70
 	<update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobUser" >
71
-		UPDATE XXL_JOB_USER
71
+		UPDATE xxl_job_user
72 72
 		SET
73 73
 			<if test="password != null and password != ''">
74 74
 				password = #{password},
@@ -80,7 +80,7 @@
80 80
 
81 81
 	<delete id="delete" parameterType="java.util.HashMap">
82 82
 		DELETE
83
-		FROM XXL_JOB_USER
83
+		FROM xxl_job_user
84 84
 		WHERE id = #{id}
85 85
 	</delete>
86 86