diff --git a/pom.xml b/pom.xml index ad5a2b4..ba45964 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.2 8.3.0 + 8.1.1.156 2.0.13 5.10.2 diff --git a/pom.xml b/pom.xml index ad5a2b4..ba45964 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.2 8.3.0 + 8.1.1.156 2.0.13 5.10.2 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 638312d..53a6d4c 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -77,6 +77,12 @@ ${project.parent.version} + + com.dameng + DmJdbcDriver18 + 1.8 + + diff --git a/pom.xml b/pom.xml index ad5a2b4..ba45964 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.2 8.3.0 + 8.1.1.156 2.0.13 5.10.2 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 638312d..53a6d4c 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -77,6 +77,12 @@ ${project.parent.version} + + com.dameng + DmJdbcDriver18 + 1.8 + + diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 831bcf6..f090cde 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -70,7 +70,7 @@ connAutoCommit = conn.getAutoCommit(); conn.setAutoCommit(false); - preparedStatement = conn.prepareStatement( "select * from xxl_job_lock where lock_name = 'schedule_lock' for update" ); + preparedStatement = conn.prepareStatement( "select * from \"XXLJOB\".\"XXL_JOB_LOCK\" where lock_name = 'schedule_lock' for update" ); preparedStatement.execute(); // tx start diff --git a/pom.xml b/pom.xml index ad5a2b4..ba45964 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.2 8.3.0 + 8.1.1.156 2.0.13 5.10.2 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 638312d..53a6d4c 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -77,6 +77,12 @@ ${project.parent.version} + + com.dameng + DmJdbcDriver18 + 1.8 + + diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 831bcf6..f090cde 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -70,7 +70,7 @@ connAutoCommit = conn.getAutoCommit(); conn.setAutoCommit(false); - preparedStatement = conn.prepareStatement( "select * from xxl_job_lock where lock_name = 'schedule_lock' for update" ); + preparedStatement = conn.prepareStatement( "select * from \"XXLJOB\".\"XXL_JOB_LOCK\" where lock_name = 'schedule_lock' for update" ); preparedStatement.execute(); // tx start diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties index d438057..958b1d8 100644 --- a/xxl-job-admin/src/main/resources/application.properties +++ b/xxl-job-admin/src/main/resources/application.properties @@ -24,10 +24,15 @@ #mybatis.type-aliases-package=com.xxl.job.admin.core.model ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai -spring.datasource.username=root -spring.datasource.password=root_pwd -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai +#spring.datasource.username=root +#spring.datasource.password=root_pwd +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#dm8 +spring.datasource.url=jdbc:dm://111.198.10.15:11211/XXLJOB?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 +spring.datasource.username=SMARTWELL +spring.datasource.password=Casic203! +spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver ### datasource-pool spring.datasource.type=com.zaxxer.hikari.HikariDataSource diff --git a/pom.xml b/pom.xml index ad5a2b4..ba45964 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.2 8.3.0 + 8.1.1.156 2.0.13 5.10.2 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 638312d..53a6d4c 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -77,6 +77,12 @@ ${project.parent.version} + + com.dameng + DmJdbcDriver18 + 1.8 + + diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 831bcf6..f090cde 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -70,7 +70,7 @@ connAutoCommit = conn.getAutoCommit(); conn.setAutoCommit(false); - preparedStatement = conn.prepareStatement( "select * from xxl_job_lock where lock_name = 'schedule_lock' for update" ); + preparedStatement = conn.prepareStatement( "select * from \"XXLJOB\".\"XXL_JOB_LOCK\" where lock_name = 'schedule_lock' for update" ); preparedStatement.execute(); // tx start diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties index d438057..958b1d8 100644 --- a/xxl-job-admin/src/main/resources/application.properties +++ b/xxl-job-admin/src/main/resources/application.properties @@ -24,10 +24,15 @@ #mybatis.type-aliases-package=com.xxl.job.admin.core.model ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai -spring.datasource.username=root -spring.datasource.password=root_pwd -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai +#spring.datasource.username=root +#spring.datasource.password=root_pwd +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#dm8 +spring.datasource.url=jdbc:dm://111.198.10.15:11211/XXLJOB?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 +spring.datasource.username=SMARTWELL +spring.datasource.password=Casic203! +spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver ### datasource-pool spring.datasource.type=com.zaxxer.hikari.HikariDataSource diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml index 87299f8..a8a67c2 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml @@ -23,46 +23,46 @@ - INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `update_time`) + INSERT INTO "XXLJOB"."XXL_JOB_GROUP" ( app_name, title, address_type, address_list, update_time) values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{updateTime} ); - UPDATE xxl_job_group - SET `app_name` = #{appname}, - `title` = #{title}, - `address_type` = #{addressType}, - `address_list` = #{addressList}, - `update_time` = #{updateTime} + UPDATE "XXLJOB"."XXL_JOB_GROUP" + SET app_name = #{appname}, + title = #{title}, + address_type = #{addressType}, + address_list = #{addressList}, + update_time = #{updateTime} WHERE id = #{id} - DELETE FROM xxl_job_group + DELETE FROM "XXLJOB"."XXL_JOB_GROUP" WHERE id = #{id} SELECT count(1) - FROM xxl_job_group AS t + FROM "XXLJOB"."XXL_JOB_GROUP" AS t AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%') diff --git a/pom.xml b/pom.xml index ad5a2b4..ba45964 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.2 8.3.0 + 8.1.1.156 2.0.13 5.10.2 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 638312d..53a6d4c 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -77,6 +77,12 @@ ${project.parent.version} + + com.dameng + DmJdbcDriver18 + 1.8 + + diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 831bcf6..f090cde 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -70,7 +70,7 @@ connAutoCommit = conn.getAutoCommit(); conn.setAutoCommit(false); - preparedStatement = conn.prepareStatement( "select * from xxl_job_lock where lock_name = 'schedule_lock' for update" ); + preparedStatement = conn.prepareStatement( "select * from \"XXLJOB\".\"XXL_JOB_LOCK\" where lock_name = 'schedule_lock' for update" ); preparedStatement.execute(); // tx start diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties index d438057..958b1d8 100644 --- a/xxl-job-admin/src/main/resources/application.properties +++ b/xxl-job-admin/src/main/resources/application.properties @@ -24,10 +24,15 @@ #mybatis.type-aliases-package=com.xxl.job.admin.core.model ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai -spring.datasource.username=root -spring.datasource.password=root_pwd -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai +#spring.datasource.username=root +#spring.datasource.password=root_pwd +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#dm8 +spring.datasource.url=jdbc:dm://111.198.10.15:11211/XXLJOB?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 +spring.datasource.username=SMARTWELL +spring.datasource.password=Casic203! +spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver ### datasource-pool spring.datasource.type=com.zaxxer.hikari.HikariDataSource diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml index 87299f8..a8a67c2 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml @@ -23,46 +23,46 @@ - INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `update_time`) + INSERT INTO "XXLJOB"."XXL_JOB_GROUP" ( app_name, title, address_type, address_list, update_time) values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{updateTime} ); - UPDATE xxl_job_group - SET `app_name` = #{appname}, - `title` = #{title}, - `address_type` = #{addressType}, - `address_list` = #{addressList}, - `update_time` = #{updateTime} + UPDATE "XXLJOB"."XXL_JOB_GROUP" + SET app_name = #{appname}, + title = #{title}, + address_type = #{addressType}, + address_list = #{addressList}, + update_time = #{updateTime} WHERE id = #{id} - DELETE FROM xxl_job_group + DELETE FROM "XXLJOB"."XXL_JOB_GROUP" WHERE id = #{id} SELECT count(1) - FROM xxl_job_group AS t + FROM "XXLJOB"."XXL_JOB_GROUP" AS t AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%') diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml index 7b3c3a3..432e666 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml @@ -67,7 +67,7 @@ SELECT count(1) - FROM xxl_job_info AS t + FROM "XXLJOB"."XXL_JOB_INFO" AS t AND t.job_group = #{jobGroup} @@ -112,7 +112,7 @@ - INSERT INTO xxl_job_info ( + INSERT INTO "XXLJOB"."XXL_JOB_INFO" ( job_group, job_desc, add_time, @@ -169,12 +169,12 @@ - UPDATE xxl_job_info + UPDATE "XXLJOB"."XXL_JOB_INFO" SET job_group = #{jobGroup}, job_desc = #{jobDesc}, @@ -203,25 +203,25 @@ DELETE - FROM xxl_job_info + FROM "XXLJOB"."XXL_JOB_INFO" WHERE id = #{id} - UPDATE xxl_job_info + UPDATE "XXLJOB"."XXL_JOB_INFO" SET trigger_last_time = #{triggerLastTime}, trigger_next_time = #{triggerNextTime}, diff --git a/pom.xml b/pom.xml index ad5a2b4..ba45964 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.2 8.3.0 + 8.1.1.156 2.0.13 5.10.2 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 638312d..53a6d4c 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -77,6 +77,12 @@ ${project.parent.version} + + com.dameng + DmJdbcDriver18 + 1.8 + + diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 831bcf6..f090cde 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -70,7 +70,7 @@ connAutoCommit = conn.getAutoCommit(); conn.setAutoCommit(false); - preparedStatement = conn.prepareStatement( "select * from xxl_job_lock where lock_name = 'schedule_lock' for update" ); + preparedStatement = conn.prepareStatement( "select * from \"XXLJOB\".\"XXL_JOB_LOCK\" where lock_name = 'schedule_lock' for update" ); preparedStatement.execute(); // tx start diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties index d438057..958b1d8 100644 --- a/xxl-job-admin/src/main/resources/application.properties +++ b/xxl-job-admin/src/main/resources/application.properties @@ -24,10 +24,15 @@ #mybatis.type-aliases-package=com.xxl.job.admin.core.model ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai -spring.datasource.username=root -spring.datasource.password=root_pwd -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai +#spring.datasource.username=root +#spring.datasource.password=root_pwd +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#dm8 +spring.datasource.url=jdbc:dm://111.198.10.15:11211/XXLJOB?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 +spring.datasource.username=SMARTWELL +spring.datasource.password=Casic203! +spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver ### datasource-pool spring.datasource.type=com.zaxxer.hikari.HikariDataSource diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml index 87299f8..a8a67c2 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml @@ -23,46 +23,46 @@ - INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `update_time`) + INSERT INTO "XXLJOB"."XXL_JOB_GROUP" ( app_name, title, address_type, address_list, update_time) values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{updateTime} ); - UPDATE xxl_job_group - SET `app_name` = #{appname}, - `title` = #{title}, - `address_type` = #{addressType}, - `address_list` = #{addressList}, - `update_time` = #{updateTime} + UPDATE "XXLJOB"."XXL_JOB_GROUP" + SET app_name = #{appname}, + title = #{title}, + address_type = #{addressType}, + address_list = #{addressList}, + update_time = #{updateTime} WHERE id = #{id} - DELETE FROM xxl_job_group + DELETE FROM "XXLJOB"."XXL_JOB_GROUP" WHERE id = #{id} SELECT count(1) - FROM xxl_job_group AS t + FROM "XXLJOB"."XXL_JOB_GROUP" AS t AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%') diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml index 7b3c3a3..432e666 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml @@ -67,7 +67,7 @@ SELECT count(1) - FROM xxl_job_info AS t + FROM "XXLJOB"."XXL_JOB_INFO" AS t AND t.job_group = #{jobGroup} @@ -112,7 +112,7 @@ - INSERT INTO xxl_job_info ( + INSERT INTO "XXLJOB"."XXL_JOB_INFO" ( job_group, job_desc, add_time, @@ -169,12 +169,12 @@ - UPDATE xxl_job_info + UPDATE "XXLJOB"."XXL_JOB_INFO" SET job_group = #{jobGroup}, job_desc = #{jobDesc}, @@ -203,25 +203,25 @@ DELETE - FROM xxl_job_info + FROM "XXLJOB"."XXL_JOB_INFO" WHERE id = #{id} - UPDATE xxl_job_info + UPDATE "XXLJOB"."XXL_JOB_INFO" SET trigger_last_time = #{triggerLastTime}, trigger_next_time = #{triggerNextTime}, diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml index 2dd1a96..322134d 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml @@ -24,13 +24,13 @@ - INSERT INTO xxl_job_logglue ( - `job_id`, - `glue_type`, - `glue_source`, - `glue_remark`, - `add_time`, - `update_time` + INSERT INTO "XXLJOB"."XXL_JOB_LOGGLUE" ( + job_id, + glue_type, + glue_source, + glue_remark, + add_time, + update_time ) VALUES ( #{jobId}, #{glueType}, @@ -46,26 +46,26 @@ - DELETE FROM xxl_job_logglue + DELETE FROM "XXLJOB"."XXL_JOB_LOGGLUE" WHERE id NOT in( SELECT id FROM( - SELECT id FROM xxl_job_logglue - WHERE `job_id` = #{jobId} + SELECT id FROM "XXLJOB"."XXL_JOB_LOGGLUE" + WHERE job_id = #{jobId} ORDER BY update_time desc LIMIT 0, #{limit} ) t1 - ) AND `job_id` = #{jobId} + ) AND job_id = #{jobId} - DELETE FROM xxl_job_logglue - WHERE `job_id` = #{jobId} + DELETE FROM "XXLJOB"."XXL_JOB_LOGGLUE" + WHERE job_id = #{jobId} \ No newline at end of file diff --git a/pom.xml b/pom.xml index ad5a2b4..ba45964 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ 2.3.2 8.3.0 + 8.1.1.156 2.0.13 5.10.2 diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 638312d..53a6d4c 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -77,6 +77,12 @@ ${project.parent.version} + + com.dameng + DmJdbcDriver18 + 1.8 + + diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java index 831bcf6..f090cde 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java @@ -70,7 +70,7 @@ connAutoCommit = conn.getAutoCommit(); conn.setAutoCommit(false); - preparedStatement = conn.prepareStatement( "select * from xxl_job_lock where lock_name = 'schedule_lock' for update" ); + preparedStatement = conn.prepareStatement( "select * from \"XXLJOB\".\"XXL_JOB_LOCK\" where lock_name = 'schedule_lock' for update" ); preparedStatement.execute(); // tx start diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties index d438057..958b1d8 100644 --- a/xxl-job-admin/src/main/resources/application.properties +++ b/xxl-job-admin/src/main/resources/application.properties @@ -24,10 +24,15 @@ #mybatis.type-aliases-package=com.xxl.job.admin.core.model ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai -spring.datasource.username=root -spring.datasource.password=root_pwd -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai +#spring.datasource.username=root +#spring.datasource.password=root_pwd +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#dm8 +spring.datasource.url=jdbc:dm://111.198.10.15:11211/XXLJOB?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 +spring.datasource.username=SMARTWELL +spring.datasource.password=Casic203! +spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver ### datasource-pool spring.datasource.type=com.zaxxer.hikari.HikariDataSource diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml index 87299f8..a8a67c2 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml @@ -23,46 +23,46 @@ - INSERT INTO xxl_job_group ( `app_name`, `title`, `address_type`, `address_list`, `update_time`) + INSERT INTO "XXLJOB"."XXL_JOB_GROUP" ( app_name, title, address_type, address_list, update_time) values ( #{appname}, #{title}, #{addressType}, #{addressList}, #{updateTime} ); - UPDATE xxl_job_group - SET `app_name` = #{appname}, - `title` = #{title}, - `address_type` = #{addressType}, - `address_list` = #{addressList}, - `update_time` = #{updateTime} + UPDATE "XXLJOB"."XXL_JOB_GROUP" + SET app_name = #{appname}, + title = #{title}, + address_type = #{addressType}, + address_list = #{addressList}, + update_time = #{updateTime} WHERE id = #{id} - DELETE FROM xxl_job_group + DELETE FROM "XXLJOB"."XXL_JOB_GROUP" WHERE id = #{id} SELECT count(1) - FROM xxl_job_group AS t + FROM "XXLJOB"."XXL_JOB_GROUP" AS t AND t.app_name like CONCAT(CONCAT('%', #{appname}), '%') diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml index 7b3c3a3..432e666 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml @@ -67,7 +67,7 @@ SELECT count(1) - FROM xxl_job_info AS t + FROM "XXLJOB"."XXL_JOB_INFO" AS t AND t.job_group = #{jobGroup} @@ -112,7 +112,7 @@ - INSERT INTO xxl_job_info ( + INSERT INTO "XXLJOB"."XXL_JOB_INFO" ( job_group, job_desc, add_time, @@ -169,12 +169,12 @@ - UPDATE xxl_job_info + UPDATE "XXLJOB"."XXL_JOB_INFO" SET job_group = #{jobGroup}, job_desc = #{jobDesc}, @@ -203,25 +203,25 @@ DELETE - FROM xxl_job_info + FROM "XXLJOB"."XXL_JOB_INFO" WHERE id = #{id} - UPDATE xxl_job_info + UPDATE "XXLJOB"."XXL_JOB_INFO" SET trigger_last_time = #{triggerLastTime}, trigger_next_time = #{triggerNextTime}, diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml index 2dd1a96..322134d 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml @@ -24,13 +24,13 @@ - INSERT INTO xxl_job_logglue ( - `job_id`, - `glue_type`, - `glue_source`, - `glue_remark`, - `add_time`, - `update_time` + INSERT INTO "XXLJOB"."XXL_JOB_LOGGLUE" ( + job_id, + glue_type, + glue_source, + glue_remark, + add_time, + update_time ) VALUES ( #{jobId}, #{glueType}, @@ -46,26 +46,26 @@ - DELETE FROM xxl_job_logglue + DELETE FROM "XXLJOB"."XXL_JOB_LOGGLUE" WHERE id NOT in( SELECT id FROM( - SELECT id FROM xxl_job_logglue - WHERE `job_id` = #{jobId} + SELECT id FROM "XXLJOB"."XXL_JOB_LOGGLUE" + WHERE job_id = #{jobId} ORDER BY update_time desc LIMIT 0, #{limit} ) t1 - ) AND `job_id` = #{jobId} + ) AND job_id = #{jobId} - DELETE FROM xxl_job_logglue - WHERE `job_id` = #{jobId} + DELETE FROM "XXLJOB"."XXL_JOB_LOGGLUE" + WHERE job_id = #{jobId} \ No newline at end of file diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml index 4155f17..64a98e7 100644 --- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml @@ -46,7 +46,7 @@ SELECT count(1) - FROM xxl_job_log AS t + FROM "XXLJOB"."XXL_JOB_LOG" AS t AND t.job_group = #{jobGroup} @@ -112,18 +112,18 @@ - INSERT INTO xxl_job_log ( - `job_group`, - `job_id`, - `trigger_time`, - `trigger_code`, - `handle_code` + INSERT INTO "XXLJOB"."XXL_JOB_LOG" ( + job_group, + job_id, + trigger_time, + trigger_code, + handle_code ) VALUES ( #{jobGroup}, #{jobId}, @@ -132,35 +132,35 @@ #{handleCode} ); - UPDATE xxl_job_log + UPDATE "XXLJOB"."XXL_JOB_LOG" SET - `trigger_time`= #{triggerTime}, - `trigger_code`= #{triggerCode}, - `trigger_msg`= #{triggerMsg}, - `executor_address`= #{executorAddress}, - `executor_handler`=#{executorHandler}, - `executor_param`= #{executorParam}, - `executor_sharding_param`= #{executorShardingParam}, - `executor_fail_retry_count`= #{executorFailRetryCount} - WHERE `id`= #{id} + trigger_time= #{triggerTime}, + trigger_code= #{triggerCode}, + trigger_msg= #{triggerMsg}, + executor_address= #{executorAddress}, + executor_handler=#{executorHandler}, + executor_param= #{executorParam}, + executor_sharding_param= #{executorShardingParam}, + executor_fail_retry_count= #{executorFailRetryCount} + WHERE id= #{id} - UPDATE xxl_job_log - SET - `handle_time`= #{handleTime}, - `handle_code`= #{handleCode}, - `handle_msg`= #{handleMsg} - WHERE `id`= #{id} + UPDATE "XXLJOB"."XXL_JOB_LOG" + SET + handle_time= #{handleTime}, + handle_code= #{handleCode}, + handle_msg= #{handleMsg} + WHERE id= #{id} - + - delete from xxl_job_log + delete from "XXLJOB"."XXL_JOB_LOG" WHERE job_id = #{jobId} @@ -170,7 +170,7 @@ 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 + FROM "XXLJOB"."XXL_JOB_LOG" WHERE trigger_time BETWEEN #{from} and #{to} GROUP BY triggerDay ORDER BY triggerDay @@ -181,12 +181,12 @@ 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 + FROM "XXLJOB"."XXL_JOB_LOG" WHERE trigger_time BETWEEN #{from} and #{to} - delete from xxl_job_log + delete from "XXLJOB"."XXL_JOB_LOG" WHERE id in #{item} + - UPDATE xxl_job_log + UPDATE "XXLJOB"."XXL_JOB_LOG" SET - `alarm_status` = #{newAlarmStatus} - WHERE `id`= #{logId} AND `alarm_status` = #{oldAlarmStatus} + alarm_status = #{newAlarmStatus} + WHERE id= #{logId} AND alarm_status = #{oldAlarmStatus} - UPDATE xxl_job_log + UPDATE "XXLJOB"."XXL_JOB_LOG" SET - `trigger_time`= #{triggerTime}, - `trigger_code`= #{triggerCode}, - `trigger_msg`= #{triggerMsg}, - `executor_address`= #{executorAddress}, - `executor_handler`=#{executorHandler}, - `executor_param`= #{executorParam}, - `executor_sharding_param`= #{executorShardingParam}, - `executor_fail_retry_count`= #{executorFailRetryCount} - WHERE `id`= #{id} + trigger_time= #{triggerTime}, + trigger_code= #{triggerCode}, + trigger_msg= #{triggerMsg}, + executor_address= #{executorAddress}, + executor_handler=#{executorHandler}, + executor_param= #{executorParam}, + executor_sharding_param= #{executorShardingParam}, + executor_fail_retry_count= #{executorFailRetryCount} + WHERE id= #{id} - UPDATE xxl_job_log - SET - `handle_time`= #{handleTime}, - `handle_code`= #{handleCode}, - `handle_msg`= #{handleMsg} - WHERE `id`= #{id} + UPDATE "XXLJOB"."XXL_JOB_LOG" + SET + handle_time= #{handleTime}, + handle_code= #{handleCode}, + handle_msg= #{handleMsg} + WHERE id= #{id} - + - delete from xxl_job_log + delete from "XXLJOB"."XXL_JOB_LOG" WHERE job_id = #{jobId} @@ -170,7 +170,7 @@ 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 + FROM "XXLJOB"."XXL_JOB_LOG" WHERE trigger_time BETWEEN #{from} and #{to} GROUP BY triggerDay ORDER BY triggerDay @@ -181,12 +181,12 @@ 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 + FROM "XXLJOB"."XXL_JOB_LOG" WHERE trigger_time BETWEEN #{from} and #{to} - delete from xxl_job_log + delete from "XXLJOB"."XXL_JOB_LOG" WHERE id in #{item} + - UPDATE xxl_job_log + UPDATE "XXLJOB"."XXL_JOB_LOG" SET - `alarm_status` = #{newAlarmStatus} - WHERE `id`= #{logId} AND `alarm_status` = #{oldAlarmStatus} + alarm_status = #{newAlarmStatus} + WHERE id= #{logId} AND alarm_status = #{oldAlarmStatus} - UPDATE xxl_job_log + UPDATE "XXLJOB"."XXL_JOB_LOG" SET - `trigger_time`= #{triggerTime}, - `trigger_code`= #{triggerCode}, - `trigger_msg`= #{triggerMsg}, - `executor_address`= #{executorAddress}, - `executor_handler`=#{executorHandler}, - `executor_param`= #{executorParam}, - `executor_sharding_param`= #{executorShardingParam}, - `executor_fail_retry_count`= #{executorFailRetryCount} - WHERE `id`= #{id} + trigger_time= #{triggerTime}, + trigger_code= #{triggerCode}, + trigger_msg= #{triggerMsg}, + executor_address= #{executorAddress}, + executor_handler=#{executorHandler}, + executor_param= #{executorParam}, + executor_sharding_param= #{executorShardingParam}, + executor_fail_retry_count= #{executorFailRetryCount} + WHERE id= #{id} - UPDATE xxl_job_log - SET - `handle_time`= #{handleTime}, - `handle_code`= #{handleCode}, - `handle_msg`= #{handleMsg} - WHERE `id`= #{id} + UPDATE "XXLJOB"."XXL_JOB_LOG" + SET + handle_time= #{handleTime}, + handle_code= #{handleCode}, + handle_msg= #{handleMsg} + WHERE id= #{id} - + - delete from xxl_job_log + delete from "XXLJOB"."XXL_JOB_LOG" WHERE job_id = #{jobId} @@ -170,7 +170,7 @@ 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 + FROM "XXLJOB"."XXL_JOB_LOG" WHERE trigger_time BETWEEN #{from} and #{to} GROUP BY triggerDay ORDER BY triggerDay @@ -181,12 +181,12 @@ 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 + FROM "XXLJOB"."XXL_JOB_LOG" WHERE trigger_time BETWEEN #{from} and #{to} - delete from xxl_job_log + delete from "XXLJOB"."XXL_JOB_LOG" WHERE id in #{item} + - UPDATE xxl_job_log + UPDATE "XXLJOB"."XXL_JOB_LOG" SET - `alarm_status` = #{newAlarmStatus} - WHERE `id`= #{logId} AND `alarm_status` = #{oldAlarmStatus} + alarm_status = #{newAlarmStatus} + WHERE id= #{logId} AND alarm_status = #{oldAlarmStatus} - UPDATE xxl_job_log + UPDATE "XXLJOB"."XXL_JOB_LOG" SET - `trigger_time`= #{triggerTime}, - `trigger_code`= #{triggerCode}, - `trigger_msg`= #{triggerMsg}, - `executor_address`= #{executorAddress}, - `executor_handler`=#{executorHandler}, - `executor_param`= #{executorParam}, - `executor_sharding_param`= #{executorShardingParam}, - `executor_fail_retry_count`= #{executorFailRetryCount} - WHERE `id`= #{id} + trigger_time= #{triggerTime}, + trigger_code= #{triggerCode}, + trigger_msg= #{triggerMsg}, + executor_address= #{executorAddress}, + executor_handler=#{executorHandler}, + executor_param= #{executorParam}, + executor_sharding_param= #{executorShardingParam}, + executor_fail_retry_count= #{executorFailRetryCount} + WHERE id= #{id} - UPDATE xxl_job_log - SET - `handle_time`= #{handleTime}, - `handle_code`= #{handleCode}, - `handle_msg`= #{handleMsg} - WHERE `id`= #{id} + UPDATE "XXLJOB"."XXL_JOB_LOG" + SET + handle_time= #{handleTime}, + handle_code= #{handleCode}, + handle_msg= #{handleMsg} + WHERE id= #{id} - + - delete from xxl_job_log + delete from "XXLJOB"."XXL_JOB_LOG" WHERE job_id = #{jobId} @@ -170,7 +170,7 @@ 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 + FROM "XXLJOB"."XXL_JOB_LOG" WHERE trigger_time BETWEEN #{from} and #{to} GROUP BY triggerDay ORDER BY triggerDay @@ -181,12 +181,12 @@ 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 + FROM "XXLJOB"."XXL_JOB_LOG" WHERE trigger_time BETWEEN #{from} and #{to} - delete from xxl_job_log + delete from "XXLJOB"."XXL_JOB_LOG" WHERE id in #{item} + - UPDATE xxl_job_log + UPDATE "XXLJOB"."XXL_JOB_LOG" SET - `alarm_status` = #{newAlarmStatus} - WHERE `id`= #{logId} AND `alarm_status` = #{oldAlarmStatus} + alarm_status = #{newAlarmStatus} + WHERE id= #{logId} AND alarm_status = #{oldAlarmStatus}