From 07c20f36c90e5128dfcf2eb9a468492abc8e2931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 9 Nov 2019 18:37:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(pigx-common-job):=20#751=20XxlJobAutoConfig?= =?UTF-8?q?uration=E7=B1=BB=E6=B3=A8=E8=A7=A3=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #751 --- db/2pigxx.sql | 4 +--- .../pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/db/2pigxx.sql b/db/2pigxx.sql index 5dd394f59..7f3203a2f 100644 --- a/db/2pigxx.sql +++ b/db/2pigxx.sql @@ -778,14 +778,13 @@ CREATE TABLE `sys_user` ( KEY `user_wx_openid` (`wx_openid`) USING BTREE, KEY `user_qq_openid` (`qq_openid`) USING BTREE, KEY `user_idx1_username` (`username`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='用户表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='用户表'; -- ---------------------------- -- Records of sys_user -- ---------------------------- BEGIN; INSERT INTO `sys_user` VALUES (1, 'admin', '$2a$10$IVzj1Wd.ZQdOIWdb1htQjexU94uoNeuk1crlQ9ExVupPi0Iy1uv.C', '', '17034642888', '/admin/sys-file/lengleng/c5a85e0770cd4fe78bc14b63b3bd05ae.jpg', 1, '2018-04-20 07:15:18', '2019-11-02 22:12:11', '0', '0', 'o_0FT0uyg_H1vVy2H0JpSwlVGhWQ', 'oBxPy5E-v82xWGsfzZVzkD3wEX64', NULL, 'log4j', '2303656', 1); -INSERT INTO `sys_user` VALUES (2, 'admin', '$2a$10$cU7NwyNX05YMBmmeX.qK1Orcelw37n.huo0d6iCiTs9mse.JwCEA.', NULL, '17034642119', '/admin/sys-file/lengleng/376220c58bc34593930ca835ebab6090.jpg', 13, '2019-08-27 23:27:36', '2019-10-21 13:31:53', '0', '0', NULL, NULL, NULL, NULL, NULL, 2); COMMIT; -- ---------------------------- @@ -803,7 +802,6 @@ CREATE TABLE `sys_user_role` ( -- ---------------------------- BEGIN; INSERT INTO `sys_user_role` VALUES (1, 1); -INSERT INTO `sys_user_role` VALUES (2, 2); COMMIT; SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java index e8495e3af..7e81e44bd 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java @@ -20,7 +20,6 @@ package com.pig4cloud.pigx.common.job; import com.pig4cloud.pigx.common.job.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -34,7 +33,6 @@ import org.springframework.context.annotation.Configuration; @Configuration @EnableAutoConfiguration @ComponentScan("com.pig4cloud.pigx.common.job.properties") -@EnableConfigurationProperties(XxlJobAutoConfiguration.class) public class XxlJobAutoConfiguration { @Bean(initMethod = "start", destroyMethod = "destroy")