ソースを参照

:recycle: Refactoring code.一直重构一直爽,重构原先的daemon工程增加子包名,避免一些未知问题

萌萌哒Sakura酱 6 年 前
コミット
066be6b1af
19 ファイル変更40 行追加40 行削除
  1. 6 6
      pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml
  2. 1 1
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java
  3. 3 3
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java
  4. 3 3
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java
  5. 1 1
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java
  6. 1 1
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java
  7. 1 1
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java
  8. 1 1
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java
  9. 1 1
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java
  10. 1 1
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java
  11. 1 1
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java
  12. 2 2
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java
  13. 2 2
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java
  14. 2 2
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java
  15. 2 2
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java
  16. 4 4
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java
  17. 4 4
      pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java
  18. 2 2
      pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml
  19. 2 2
      pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml

+ 6 - 6
pigx-config/src/main/resources/config/pigx-daemon-elastic-job-dev.yml

@@ -22,31 +22,31 @@ spring:
     # 普通任务
     simples:
       spring-simple-job:
-        job-class: com.pig4cloud.pigx.daemon.job.PigxSimpleJob
+        job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob
         cron: 0 0 0/1 * * ?
         sharding-total-count: 3
         sharding-item-parameters: 0=service1,1=service2,2=service3
         eventTraceRdbDataSource: 'dataSource'
         listener:
-          listener-class: com.pig4cloud.pigx.daemon.listener.PigxElasticJobListener
+          listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener
       spring-simple-job2:
-        job-class: com.pig4cloud.pigx.daemon.job.PigxSimpleJob2
+        job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxSimpleJob2
         cron: 0 0 0/1 * * ?
         sharding-total-count: 3
         sharding-item-parameters: 0=service1,1=service2,2=service3
         eventTraceRdbDataSource: 'dataSource'
         listener:
-          listener-class: com.pig4cloud.pigx.daemon.listener.PigxElasticJobListener
+          listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxElasticJobListener
     # 简单任务
     dataflows:
       spring-dataflow-job:
-        job-class: com.pig4cloud.pigx.daemon.job.PigxDataflowJob
+        job-class: com.pig4cloud.pigx.daemon.elastic.job.PigxDataflowJob
         cron: 0 0 0/1 * * ?
         sharding-total-count: 3
         sharding-item-parameters: 0=service1,1=service2,2=service3
         streaming-process: true
         eventTraceRdbDataSource: 'dataSource'
         listener:
-          distributed-listener-class: com.pig4cloud.pigx.daemon.listener.PigxDistributeElasticJobListener
+          distributed-listener-class: com.pig4cloud.pigx.daemon.elastic.listener.PigxDistributeElasticJobListener
           started-timeout-milliseconds: 5000
           completed-timeout-milliseconds: 10000

+ 1 - 1
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonElasticJobApplication.java

@@ -15,7 +15,7 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.pig4cloud.pigx.daemon;
+package com.pig4cloud.pigx.daemon.elastic;
 
 import com.pig4cloud.pigx.common.job.annotation.EnablePigxJob;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxFeignClients;

+ 3 - 3
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java

@@ -15,14 +15,14 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.pig4cloud.pigx.daemon.controller;
+package com.pig4cloud.pigx.daemon.elastic.controller;
 
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.daemon.entity.ExecutionLog;
-import com.pig4cloud.pigx.daemon.service.ExecutionLogService;
+import com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog;
+import com.pig4cloud.pigx.daemon.elastic.service.ExecutionLogService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 

+ 3 - 3
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java

@@ -15,13 +15,13 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.pig4cloud.pigx.daemon.controller;
+package com.pig4cloud.pigx.daemon.elastic.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.daemon.entity.StatusTraceLog;
-import com.pig4cloud.pigx.daemon.service.StatusTraceLogService;
+import com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog;
+import com.pig4cloud.pigx.daemon.elastic.service.StatusTraceLogService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 

+ 1 - 1
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java

@@ -1,4 +1,4 @@
-package com.pig4cloud.pigx.daemon.entity;
+package com.pig4cloud.pigx.daemon.elastic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java

@@ -1,4 +1,4 @@
-package com.pig4cloud.pigx.daemon.entity;
+package com.pig4cloud.pigx.daemon.elastic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java

@@ -15,7 +15,7 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.pig4cloud.pigx.daemon.job;
+package com.pig4cloud.pigx.daemon.elastic.job;
 
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.dataflow.DataflowJob;

+ 1 - 1
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java

@@ -15,7 +15,7 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.pig4cloud.pigx.daemon.job;
+package com.pig4cloud.pigx.daemon.elastic.job;
 
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.simple.SimpleJob;

+ 1 - 1
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob2.java

@@ -15,7 +15,7 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.pig4cloud.pigx.daemon.job;
+package com.pig4cloud.pigx.daemon.elastic.job;
 
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.simple.SimpleJob;

+ 1 - 1
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxDistributeElasticJobListener.java

@@ -15,7 +15,7 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.pig4cloud.pigx.daemon.listener;
+package com.pig4cloud.pigx.daemon.elastic.listener;
 
 import com.dangdang.ddframe.job.executor.ShardingContexts;
 import com.dangdang.ddframe.job.lite.api.listener.AbstractDistributeOnceElasticJobListener;

+ 1 - 1
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/listener/PigxElasticJobListener.java

@@ -15,7 +15,7 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.pig4cloud.pigx.daemon.listener;
+package com.pig4cloud.pigx.daemon.elastic.listener;
 
 import com.dangdang.ddframe.job.executor.ShardingContexts;
 import com.dangdang.ddframe.job.lite.api.listener.ElasticJobListener;

+ 2 - 2
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java

@@ -1,7 +1,7 @@
-package com.pig4cloud.pigx.daemon.mapper;
+package com.pig4cloud.pigx.daemon.elastic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.pig4cloud.pigx.daemon.entity.ExecutionLog;
+import com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog;
 
 /**
  * 任务日志处理

+ 2 - 2
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java

@@ -1,7 +1,7 @@
-package com.pig4cloud.pigx.daemon.mapper;
+package com.pig4cloud.pigx.daemon.elastic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.pig4cloud.pigx.daemon.entity.StatusTraceLog;
+import com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog;
 
 /**
  * 任务轨迹处理

+ 2 - 2
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/ExecutionLogService.java

@@ -1,7 +1,7 @@
-package com.pig4cloud.pigx.daemon.service;
+package com.pig4cloud.pigx.daemon.elastic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.pigx.daemon.entity.ExecutionLog;
+import com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog;
 
 /**
  * 任务日志处理

+ 2 - 2
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/StatusTraceLogService.java

@@ -1,7 +1,7 @@
-package com.pig4cloud.pigx.daemon.service;
+package com.pig4cloud.pigx.daemon.elastic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pig4cloud.pigx.daemon.entity.StatusTraceLog;
+import com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog;
 
 /**
  * 任务轨迹处理

+ 4 - 4
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java

@@ -1,9 +1,9 @@
-package com.pig4cloud.pigx.daemon.service.impl;
+package com.pig4cloud.pigx.daemon.elastic.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pig4cloud.pigx.daemon.entity.ExecutionLog;
-import com.pig4cloud.pigx.daemon.mapper.ExecutionLogMapper;
-import com.pig4cloud.pigx.daemon.service.ExecutionLogService;
+import com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog;
+import com.pig4cloud.pigx.daemon.elastic.mapper.ExecutionLogMapper;
+import com.pig4cloud.pigx.daemon.elastic.service.ExecutionLogService;
 import org.springframework.stereotype.Service;
 
 /**

+ 4 - 4
pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java

@@ -1,9 +1,9 @@
-package com.pig4cloud.pigx.daemon.service.impl;
+package com.pig4cloud.pigx.daemon.elastic.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pig4cloud.pigx.daemon.entity.StatusTraceLog;
-import com.pig4cloud.pigx.daemon.mapper.StatusTraceLogMapper;
-import com.pig4cloud.pigx.daemon.service.StatusTraceLogService;
+import com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog;
+import com.pig4cloud.pigx.daemon.elastic.mapper.StatusTraceLogMapper;
+import com.pig4cloud.pigx.daemon.elastic.service.StatusTraceLogService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

+ 2 - 2
pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/ExecutionLogMapper.xml

@@ -1,10 +1,10 @@
 <?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">
 
-<mapper namespace="com.pig4cloud.pigx.daemon.mapper.ExecutionLogMapper">
+<mapper namespace="com.pig4cloud.pigx.daemon.elastic.mapper.ExecutionLogMapper">
 
 	<!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.pig4cloud.pigx.daemon.entity.ExecutionLog" id="executionLogMap">
+    <resultMap type="com.pig4cloud.pigx.daemon.elastic.entity.ExecutionLog" id="executionLogMap">
         <id property="id" column="id"/>
         <result property="jobName" column="job_name"/>
         <result property="taskId" column="task_id"/>

+ 2 - 2
pigx-visual/pigx-daemon-elastic-job/src/main/resources/mapper/StatusTraceLogMapper.xml

@@ -1,10 +1,10 @@
 <?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">
 
-<mapper namespace="com.pig4cloud.pigx.daemon.mapper.StatusTraceLogMapper">
+<mapper namespace="com.pig4cloud.pigx.daemon.elastic.mapper.StatusTraceLogMapper">
 
 	<!-- 可根据自己的需求,是否要使用 -->
-	<resultMap type="com.pig4cloud.pigx.daemon.entity.StatusTraceLog" id="statusTraceLogMap">
+	<resultMap type="com.pig4cloud.pigx.daemon.elastic.entity.StatusTraceLog" id="statusTraceLogMap">
 		<id property="id" column="id"/>
 		<result property="jobName" column="job_name"/>
 		<result property="originalTaskId" column="original_task_id"/>