diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index 4787177..0b78806 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -40,11 +40,6 @@ casic-server-support 1.0.0 - - com.casic - casic-job-support - 2.0.0.alpha - com.squareup.okhttp3 diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index 4787177..0b78806 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -40,11 +40,6 @@ casic-server-support 1.0.0 - - com.casic - casic-job-support - 2.0.0.alpha - com.squareup.okhttp3 diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java deleted file mode 100644 index d4c11c8..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.Job; - -import com.casic.missiles.core.annotation.CasicSimpleJob; -import com.casic.missiles.modular.system.service.ITyphoonService; -import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.springframework.stereotype.Component; - -/** - * 台风数据定时任务 - *

- * 每小时执行一次 - * - * @author a203 - */ -@Component -@CasicSimpleJob(cron = "0 0 */1 * * ?", - jobName = "TyphoonJob") -public class TyphoonJob implements SimpleJob { - - private final ITyphoonService typhoonService; - - public TyphoonJob(ITyphoonService typhoonService) { - this.typhoonService = typhoonService; - } - - @Override - public void execute(ShardingContext shardingContext) { - typhoonService.saveTyphoonList(); - } -} diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index 4787177..0b78806 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -40,11 +40,6 @@ casic-server-support 1.0.0 - - com.casic - casic-job-support - 2.0.0.alpha - com.squareup.okhttp3 diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java deleted file mode 100644 index d4c11c8..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.Job; - -import com.casic.missiles.core.annotation.CasicSimpleJob; -import com.casic.missiles.modular.system.service.ITyphoonService; -import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.springframework.stereotype.Component; - -/** - * 台风数据定时任务 - *

- * 每小时执行一次 - * - * @author a203 - */ -@Component -@CasicSimpleJob(cron = "0 0 */1 * * ?", - jobName = "TyphoonJob") -public class TyphoonJob implements SimpleJob { - - private final ITyphoonService typhoonService; - - public TyphoonJob(ITyphoonService typhoonService) { - this.typhoonService = typhoonService; - } - - @Override - public void execute(ShardingContext shardingContext) { - typhoonService.saveTyphoonList(); - } -} diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java new file mode 100644 index 0000000..a582f9d --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java @@ -0,0 +1,26 @@ +package com.casic.missiles.Job; + +import com.casic.missiles.modular.system.service.ITyphoonService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @author lwh + * 台风数据定时任务，每小时执行一次 + * @ClassName TyphoonQuartzJob + * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling + */ +@Component +public class TyphoonQuartzJob { + + private final ITyphoonService typhoonService; + + public TyphoonQuartzJob(ITyphoonService typhoonService) { + this.typhoonService = typhoonService; + } + + @Scheduled(cron = "0 0 */1 * * ?") + public void execute() { + typhoonService.saveTyphoonList(); + } +} diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index 4787177..0b78806 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -40,11 +40,6 @@ casic-server-support 1.0.0 - - com.casic - casic-job-support - 2.0.0.alpha - com.squareup.okhttp3 diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java deleted file mode 100644 index d4c11c8..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.Job; - -import com.casic.missiles.core.annotation.CasicSimpleJob; -import com.casic.missiles.modular.system.service.ITyphoonService; -import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.springframework.stereotype.Component; - -/** - * 台风数据定时任务 - *

- * 每小时执行一次 - * - * @author a203 - */ -@Component -@CasicSimpleJob(cron = "0 0 */1 * * ?", - jobName = "TyphoonJob") -public class TyphoonJob implements SimpleJob { - - private final ITyphoonService typhoonService; - - public TyphoonJob(ITyphoonService typhoonService) { - this.typhoonService = typhoonService; - } - - @Override - public void execute(ShardingContext shardingContext) { - typhoonService.saveTyphoonList(); - } -} diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java new file mode 100644 index 0000000..a582f9d --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java @@ -0,0 +1,26 @@ +package com.casic.missiles.Job; + +import com.casic.missiles.modular.system.service.ITyphoonService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @author lwh + * 台风数据定时任务，每小时执行一次 + * @ClassName TyphoonQuartzJob + * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling + */ +@Component +public class TyphoonQuartzJob { + + private final ITyphoonService typhoonService; + + public TyphoonQuartzJob(ITyphoonService typhoonService) { + this.typhoonService = typhoonService; + } + + @Scheduled(cron = "0 0 */1 * * ?") + public void execute() { + typhoonService.saveTyphoonList(); + } +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java deleted file mode 100644 index b27361a..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; - -/** - * Test Json Data - * - * @author a203 - */ -public class ReadFile { - public static String read(String filePath) { - File file = new File(filePath); - try { - return FileUtils.readFileToString(file, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } -} diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index 4787177..0b78806 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -40,11 +40,6 @@ casic-server-support 1.0.0 - - com.casic - casic-job-support - 2.0.0.alpha - com.squareup.okhttp3 diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java deleted file mode 100644 index d4c11c8..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.Job; - -import com.casic.missiles.core.annotation.CasicSimpleJob; -import com.casic.missiles.modular.system.service.ITyphoonService; -import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.springframework.stereotype.Component; - -/** - * 台风数据定时任务 - *

- * 每小时执行一次 - * - * @author a203 - */ -@Component -@CasicSimpleJob(cron = "0 0 */1 * * ?", - jobName = "TyphoonJob") -public class TyphoonJob implements SimpleJob { - - private final ITyphoonService typhoonService; - - public TyphoonJob(ITyphoonService typhoonService) { - this.typhoonService = typhoonService; - } - - @Override - public void execute(ShardingContext shardingContext) { - typhoonService.saveTyphoonList(); - } -} diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java new file mode 100644 index 0000000..a582f9d --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java @@ -0,0 +1,26 @@ +package com.casic.missiles.Job; + +import com.casic.missiles.modular.system.service.ITyphoonService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @author lwh + * 台风数据定时任务，每小时执行一次 + * @ClassName TyphoonQuartzJob + * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling + */ +@Component +public class TyphoonQuartzJob { + + private final ITyphoonService typhoonService; + + public TyphoonQuartzJob(ITyphoonService typhoonService) { + this.typhoonService = typhoonService; + } + + @Scheduled(cron = "0 0 */1 * * ?") + public void execute() { + typhoonService.saveTyphoonList(); + } +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java deleted file mode 100644 index b27361a..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; - -/** - * Test Json Data - * - * @author a203 - */ -public class ReadFile { - public static String read(String filePath) { - File file = new File(filePath); - try { - return FileUtils.readFileToString(file, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index e1efe3a..bf6b182 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -107,7 +107,7 @@ com.casic - casic-job-starter + casic-job-quartz 2.0.0.alpha diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index 4787177..0b78806 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -40,11 +40,6 @@ casic-server-support 1.0.0 - - com.casic - casic-job-support - 2.0.0.alpha - com.squareup.okhttp3 diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java deleted file mode 100644 index d4c11c8..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.Job; - -import com.casic.missiles.core.annotation.CasicSimpleJob; -import com.casic.missiles.modular.system.service.ITyphoonService; -import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.springframework.stereotype.Component; - -/** - * 台风数据定时任务 - *

- * 每小时执行一次 - * - * @author a203 - */ -@Component -@CasicSimpleJob(cron = "0 0 */1 * * ?", - jobName = "TyphoonJob") -public class TyphoonJob implements SimpleJob { - - private final ITyphoonService typhoonService; - - public TyphoonJob(ITyphoonService typhoonService) { - this.typhoonService = typhoonService; - } - - @Override - public void execute(ShardingContext shardingContext) { - typhoonService.saveTyphoonList(); - } -} diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java new file mode 100644 index 0000000..a582f9d --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java @@ -0,0 +1,26 @@ +package com.casic.missiles.Job; + +import com.casic.missiles.modular.system.service.ITyphoonService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @author lwh + * 台风数据定时任务，每小时执行一次 + * @ClassName TyphoonQuartzJob + * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling + */ +@Component +public class TyphoonQuartzJob { + + private final ITyphoonService typhoonService; + + public TyphoonQuartzJob(ITyphoonService typhoonService) { + this.typhoonService = typhoonService; + } + + @Scheduled(cron = "0 0 */1 * * ?") + public void execute() { + typhoonService.saveTyphoonList(); + } +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java deleted file mode 100644 index b27361a..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; - -/** - * Test Json Data - * - * @author a203 - */ -public class ReadFile { - public static String read(String filePath) { - File file = new File(filePath); - try { - return FileUtils.readFileToString(file, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index e1efe3a..bf6b182 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -107,7 +107,7 @@ com.casic - casic-job-starter + casic-job-quartz 2.0.0.alpha diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 739eb99..29094cf 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -6,6 +6,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -19,6 +20,7 @@ @EnableTransactionManagement(proxyTargetClass = true) @EnableAsync @Slf4j +@EnableScheduling public class CasicApplication { public static void main(String[] args) { SpringApplication.run(CasicApplication.class, args); diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index 4787177..0b78806 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -40,11 +40,6 @@ casic-server-support 1.0.0 - - com.casic - casic-job-support - 2.0.0.alpha - com.squareup.okhttp3 diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java deleted file mode 100644 index d4c11c8..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.Job; - -import com.casic.missiles.core.annotation.CasicSimpleJob; -import com.casic.missiles.modular.system.service.ITyphoonService; -import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.springframework.stereotype.Component; - -/** - * 台风数据定时任务 - *

- * 每小时执行一次 - * - * @author a203 - */ -@Component -@CasicSimpleJob(cron = "0 0 */1 * * ?", - jobName = "TyphoonJob") -public class TyphoonJob implements SimpleJob { - - private final ITyphoonService typhoonService; - - public TyphoonJob(ITyphoonService typhoonService) { - this.typhoonService = typhoonService; - } - - @Override - public void execute(ShardingContext shardingContext) { - typhoonService.saveTyphoonList(); - } -} diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java new file mode 100644 index 0000000..a582f9d --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java @@ -0,0 +1,26 @@ +package com.casic.missiles.Job; + +import com.casic.missiles.modular.system.service.ITyphoonService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @author lwh + * 台风数据定时任务，每小时执行一次 + * @ClassName TyphoonQuartzJob + * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling + */ +@Component +public class TyphoonQuartzJob { + + private final ITyphoonService typhoonService; + + public TyphoonQuartzJob(ITyphoonService typhoonService) { + this.typhoonService = typhoonService; + } + + @Scheduled(cron = "0 0 */1 * * ?") + public void execute() { + typhoonService.saveTyphoonList(); + } +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java deleted file mode 100644 index b27361a..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; - -/** - * Test Json Data - * - * @author a203 - */ -public class ReadFile { - public static String read(String filePath) { - File file = new File(filePath); - try { - return FileUtils.readFileToString(file, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index e1efe3a..bf6b182 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -107,7 +107,7 @@ com.casic - casic-job-starter + casic-job-quartz 2.0.0.alpha diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 739eb99..29094cf 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -6,6 +6,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -19,6 +20,7 @@ @EnableTransactionManagement(proxyTargetClass = true) @EnableAsync @Slf4j +@EnableScheduling public class CasicApplication { public static void main(String[] args) { SpringApplication.run(CasicApplication.class, args); diff --git a/casic-web/src/main/java/com/casic/missiles/ZookeeperNameSpace.java b/casic-web/src/main/java/com/casic/missiles/ZookeeperNameSpace.java deleted file mode 100644 index 9f69678..0000000 --- a/casic-web/src/main/java/com/casic/missiles/ZookeeperNameSpace.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles; - -import com.casic.missiles.core.util.ZkUtil; -import org.apache.zookeeper.ZooDefs; - -/** - * @author a203 - */ -public class ZookeeperNameSpace { - public static void main(String[] args) throws Exception { - String zkPath = "/ss-job"; - String connectString = "localhost:2181"; - int perms = ZooDefs.Perms.ALL; - String scheme = "digest"; - String auth = "admin:Casic203"; - ZkUtil.addDigests(scheme, perms, null, connectString, zkPath); -// ZkUtil.deletePath(scheme, connectString, zkPath, auth, null); - } -} diff --git a/casic-ship/pom.xml b/casic-ship/pom.xml index 4787177..0b78806 100644 --- a/casic-ship/pom.xml +++ b/casic-ship/pom.xml @@ -40,11 +40,6 @@ casic-server-support 1.0.0 - - com.casic - casic-job-support - 2.0.0.alpha - com.squareup.okhttp3 diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java deleted file mode 100644 index d4c11c8..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonJob.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.Job; - -import com.casic.missiles.core.annotation.CasicSimpleJob; -import com.casic.missiles.modular.system.service.ITyphoonService; -import org.apache.shardingsphere.elasticjob.api.ShardingContext; -import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob; -import org.springframework.stereotype.Component; - -/** - * 台风数据定时任务 - *

- * 每小时执行一次 - * - * @author a203 - */ -@Component -@CasicSimpleJob(cron = "0 0 */1 * * ?", - jobName = "TyphoonJob") -public class TyphoonJob implements SimpleJob { - - private final ITyphoonService typhoonService; - - public TyphoonJob(ITyphoonService typhoonService) { - this.typhoonService = typhoonService; - } - - @Override - public void execute(ShardingContext shardingContext) { - typhoonService.saveTyphoonList(); - } -} diff --git a/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java new file mode 100644 index 0000000..a582f9d --- /dev/null +++ b/casic-ship/src/main/java/com/casic/missiles/Job/TyphoonQuartzJob.java @@ -0,0 +1,26 @@ +package com.casic.missiles.Job; + +import com.casic.missiles.modular.system.service.ITyphoonService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @author lwh + * 台风数据定时任务，每小时执行一次 + * @ClassName TyphoonQuartzJob + * @Description 依赖casic-job-quartz,并在CasicApplication上增加注解 @EnableScheduling + */ +@Component +public class TyphoonQuartzJob { + + private final ITyphoonService typhoonService; + + public TyphoonQuartzJob(ITyphoonService typhoonService) { + this.typhoonService = typhoonService; + } + + @Scheduled(cron = "0 0 */1 * * ?") + public void execute() { + typhoonService.saveTyphoonList(); + } +} diff --git a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java b/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java deleted file mode 100644 index b27361a..0000000 --- a/casic-ship/src/main/java/com/casic/missiles/modular/system/utils/ReadFile.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; - -/** - * Test Json Data - * - * @author a203 - */ -public class ReadFile { - public static String read(String filePath) { - File file = new File(filePath); - try { - return FileUtils.readFileToString(file, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index e1efe3a..bf6b182 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -107,7 +107,7 @@ com.casic - casic-job-starter + casic-job-quartz 2.0.0.alpha diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 739eb99..29094cf 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -6,6 +6,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -19,6 +20,7 @@ @EnableTransactionManagement(proxyTargetClass = true) @EnableAsync @Slf4j +@EnableScheduling public class CasicApplication { public static void main(String[] args) { SpringApplication.run(CasicApplication.class, args); diff --git a/casic-web/src/main/java/com/casic/missiles/ZookeeperNameSpace.java b/casic-web/src/main/java/com/casic/missiles/ZookeeperNameSpace.java deleted file mode 100644 index 9f69678..0000000 --- a/casic-web/src/main/java/com/casic/missiles/ZookeeperNameSpace.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.casic.missiles; - -import com.casic.missiles.core.util.ZkUtil; -import org.apache.zookeeper.ZooDefs; - -/** - * @author a203 - */ -public class ZookeeperNameSpace { - public static void main(String[] args) throws Exception { - String zkPath = "/ss-job"; - String connectString = "localhost:2181"; - int perms = ZooDefs.Perms.ALL; - String scheme = "digest"; - String auth = "admin:Casic203"; - ZkUtil.addDigests(scheme, perms, null, connectString, zkPath); -// ZkUtil.deletePath(scheme, connectString, zkPath, auth, null); - } -} diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index e773bdc..3601b21 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -10,12 +10,15 @@ max-request-size: 80MB #mybatis-plus: # sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector -elasticjob: - enabled: true - reg-center: - serverLists: localhost:2181 - namespace: ss-job + +################### zoonkeeper定时器 ################### +#elasticjob: +# enabled: true +# reg-center: +# serverLists: localhost:2181 +# namespace: ss-job # digest: admin:Casic203 + ################### mybatis-plus配置 ################### ################### guns配置 ################### casic: