Browse Source

拆分xxl-job-core至从common模块

syh 5 years ago
parent
commit
ba19b582bb
42 changed files with 49 additions and 226 deletions
  1. 7 127
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  2. 14 0
      module-common/pom.xml
  3. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/AdminBiz.java
  4. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java
  5. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java
  6. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java
  7. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java
  8. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/model/LogResult.java
  9. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/model/RegistryParam.java
  10. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
  11. 0 0
      module-common/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java
  12. 0 0
      module-common/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java
  13. 0 0
      module-common/src/main/java/com/xxl/job/core/enums/RegistryConfig.java
  14. 0 0
      module-common/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
  15. 0 0
      module-common/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java
  16. 0 0
      module-common/src/main/java/com/xxl/job/core/glue/GlueFactory.java
  17. 0 0
      module-common/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java
  18. 0 0
      module-common/src/main/java/com/xxl/job/core/glue/impl/SpringGlueFactory.java
  19. 0 0
      module-common/src/main/java/com/xxl/job/core/handler/IJobHandler.java
  20. 20 0
      module-common/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java
  21. 0 0
      module-common/src/main/java/com/xxl/job/core/handler/annotation/XxlJob.java
  22. 0 0
      module-common/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java
  23. 0 0
      module-common/src/main/java/com/xxl/job/core/handler/impl/MethodJobHandler.java
  24. 0 0
      module-common/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
  25. 0 0
      module-common/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java
  26. 0 0
      module-common/src/main/java/com/xxl/job/core/log/XxlJobLogger.java
  27. 0 0
      module-common/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
  28. 0 0
      module-common/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java
  29. 0 0
      module-common/src/main/java/com/xxl/job/core/thread/JobThread.java
  30. 0 0
      module-common/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
  31. 0 0
      module-common/src/main/java/com/xxl/job/core/util/DateUtil.java
  32. 0 0
      module-common/src/main/java/com/xxl/job/core/util/FileUtil.java
  33. 0 0
      module-common/src/main/java/com/xxl/job/core/util/ScriptUtil.java
  34. 0 0
      module-common/src/main/java/com/xxl/job/core/util/ShardingUtil.java
  35. 2 2
      xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java
  36. 1 6
      module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java
  37. 2 18
      module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/BytedanceJobApplication.java
  38. 2 18
      module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/KuaishouJobApplication.java
  39. 1 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ReportServiceImpl.java
  40. 0 1
      pom.xml
  41. 0 30
      xxl-job-core/pom.xml
  42. 0 24
      xxl-job-core/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java

+ 7 - 127
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -1,154 +1,34 @@
 package org.jeecg;
 package org.jeecg;
 
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.common.module.utils.HttpUtils;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.service.IPerformanceSaleService;
 import org.junit.Test;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.junit4.SpringRunner;
 
 
-import java.util.List;
+import java.util.Date;
 
 
 @RunWith(SpringRunner.class)
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @SpringBootTest
 @Slf4j
 @Slf4j
 public class SampleTest {
 public class SampleTest {
     @Autowired
     @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
-
-
-    @Autowired
-    private IKuaiShouHistoryReportTaskService reportTaskService;
-    @Autowired
-    private CtopOauthTokenMapper tokenMapper;
-    @Autowired
-    private ICtopOauthTokenService oauthTokenService;
-
-    @Test
-    public void kuaisShouReport() {
-        try {
-            oauthTokenService.getKuaiShouRefreshToken(4801802L, "3874f4adb984a371cf92e5fc9a585e6b", 1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Autowired
     private ICtopOauthTokenService tokenService;
     private ICtopOauthTokenService tokenService;
-    @Test
-    public void wanHuaTong() {
-        String url = "https://ad.oceanengine.com/open_api/2/kaleidoscope/job/smart_cut/submit/";
-
-        JSONObject conditions = new JSONObject();
-        conditions.put("advertiser_id", "1659671533108238");
-        JSONObject job = new JSONObject();
-        job.put("job_conf_id", 10);
-        JSONArray input = new JSONArray();
-        JSONObject inputJson = new JSONObject();
-        inputJson.put("task_id", 1);
-        JSONArray videoIds = new JSONArray();
-        videoIds.add("v02033aa0000bpspgippskdk4jcuso80");
-        inputJson.put("video_ids", videoIds);
-        JSONArray music_id = new JSONArray();
-        JSONArray image_urls = new JSONArray();
-        JSONArray texts = new JSONArray();
-
-        texts.add("哈哈哈哈,这是一个测试文案");
-        inputJson.put("texts", texts);
-
-        JSONArray tts = new JSONArray();
-        tts.add("true");
-        inputJson.put("tts", tts);
-
-        JSONArray video_ratio = new JSONArray();
-        video_ratio.add("1");
-        inputJson.put("video_ratio", video_ratio);
-
-
-        JSONArray music_style = new JSONArray();
-        music_style.add("1");
-        inputJson.put("music_style", music_style);
-
-        JSONArray video_duration = new JSONArray();
-        video_duration.add("8");
-        inputJson.put("video_duration", video_duration);
-
-
-        JSONArray speed = new JSONArray();
-        speed.add("1.2");
-        inputJson.put("speed", speed);
-
-        job.put("input", inputJson);
-        job.put("mesg", "测试万花筒");
-        conditions.put("job", job);
-
-
-        JSONObject jsonObject = HttpUtils.bytedancePostRequest("f925c180e05d585f7a9fce048ba62eecc5dab7c2", url, conditions);
-        System.err.println(jsonObject);
-
-
-    }
-
-
-    @Test
-    public void testSalePerformance() {
-        performanceSaleService.loadSalsePerformance();
-    }
-
-    @Test
-    public void loadBtPlanData() {
-        List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
-        tokens.forEach(token -> {
-            advertiserDataService.getAdvertiserPlan(token, "", null, null);
-        });
-    }
-
-    @Autowired
-    private IByteDanceAdvertiserDataService advertiserDataService;
 
 
     @Autowired
     @Autowired
-    private IPerformanceSaleService performanceSaleService;
-
-    @Autowired
-    private IKuaiShouHistoryReportTaskService historyReportTaskService;
-
-    @Test
-    public void testLoadData() throws Exception {
-        CtopOauthToken token = tokenService.getTokenByAccountId(5473041L);
-        String endDateStr = DateUtils.getDate("yyyy-MM-dd");
-        String startDate = DateUtils.addMonth(endDateStr, -6);
-
-        historyReportTaskService.createTask(token.getAccountId(), token.getAccessToken(), startDate, endDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_HISTORY);
-    }
+    private IReportService reportService;
 
 
     @Test
     @Test
-    public void suZhao() {
-        Long accountId = 3917130L;
-        String token = "0a42e23921e486108105263e75561404";
-//        kuaishouInterfaceService.getVideoList("e91c778d7de1bd0e9d8f3213d1e0e57c",3820093L, null,null,1);
-    }
-
-    @Test
-    public void testLog() {
-        try {
-            System.out.println(1 / 0);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
+    public void kuaisShouReport() {
+        CtopOauthToken token = tokenService.getTokenByAccountId(1666360425745416L);
+        Date getDate = new Date();
+        reportService.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
     }
     }
-
 }
 }
 
 
 
 

+ 14 - 0
module-common/pom.xml

@@ -65,6 +65,20 @@
             <version>3.3.2</version>
             <version>3.3.2</version>
         </dependency>
         </dependency>
 
 
+        <!-- xxl-rpc-core -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-rpc-core</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+
+        <!-- groovy-all -->
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
+
     </dependencies>
     </dependencies>
 
 
 
 

xxl-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java → module-common/src/main/java/com/xxl/job/core/biz/AdminBiz.java


xxl-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java → module-common/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java


xxl-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java → module-common/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java


xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java → module-common/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java


xxl-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java → module-common/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java


xxl-job-core/src/main/java/com/xxl/job/core/biz/model/LogResult.java → module-common/src/main/java/com/xxl/job/core/biz/model/LogResult.java


xxl-job-core/src/main/java/com/xxl/job/core/biz/model/RegistryParam.java → module-common/src/main/java/com/xxl/job/core/biz/model/RegistryParam.java


xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java → module-common/src/main/java/com/xxl/job/core/biz/model/ReturnT.java


xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java → module-common/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java


xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java → module-common/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java


xxl-job-core/src/main/java/com/xxl/job/core/enums/RegistryConfig.java → module-common/src/main/java/com/xxl/job/core/enums/RegistryConfig.java


xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java → module-common/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java


xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java → module-common/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java


xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueFactory.java → module-common/src/main/java/com/xxl/job/core/glue/GlueFactory.java


xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java → module-common/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java


xxl-job-core/src/main/java/com/xxl/job/core/glue/impl/SpringGlueFactory.java → module-common/src/main/java/com/xxl/job/core/glue/impl/SpringGlueFactory.java


xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java → module-common/src/main/java/com/xxl/job/core/handler/IJobHandler.java


+ 20 - 0
module-common/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java

@@ -0,0 +1,20 @@
+package com.xxl.job.core.handler.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * annotation for job handler
+ *
+ * will be replaced by {@link XxlJob}
+ *
+ * @author 2016-5-17 21:06:49
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+@Deprecated
+public @interface JobHandler {
+
+    String value();
+
+}

xxl-job-core/src/main/java/com/xxl/job/core/handler/annotation/XxlJob.java → module-common/src/main/java/com/xxl/job/core/handler/annotation/XxlJob.java


xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java → module-common/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java


xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/MethodJobHandler.java → module-common/src/main/java/com/xxl/job/core/handler/impl/MethodJobHandler.java


xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java → module-common/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java


xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java → module-common/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java


xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java → module-common/src/main/java/com/xxl/job/core/log/XxlJobLogger.java


xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java → module-common/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java


xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java → module-common/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java


xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java → module-common/src/main/java/com/xxl/job/core/thread/JobThread.java


xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java → module-common/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java


xxl-job-core/src/main/java/com/xxl/job/core/util/DateUtil.java → module-common/src/main/java/com/xxl/job/core/util/DateUtil.java


xxl-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java → module-common/src/main/java/com/xxl/job/core/util/FileUtil.java


xxl-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java → module-common/src/main/java/com/xxl/job/core/util/ScriptUtil.java


xxl-job-core/src/main/java/com/xxl/job/core/util/ShardingUtil.java → module-common/src/main/java/com/xxl/job/core/util/ShardingUtil.java


+ 2 - 2
xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java

@@ -41,8 +41,8 @@ public class XxlJobRemotingUtil {
     }
     }
     private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
     private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
         @Override
         @Override
-        public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-            return new java.security.cert.X509Certificate[]{};
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[]{};
         }
         }
 
 
         @Override
         @Override

+ 1 - 6
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -14,9 +14,7 @@ import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.common.module.utils.LoadFileUtil;
 import cn.com.ctop.common.module.utils.LoadFileUtil;
 import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.manage.modules.material.service.IMaterialUploadImageService;
 import cn.com.ctop.manage.modules.material.service.IMaterialUploadImageService;
 import cn.com.ctop.manage.modules.material.service.IMaterialUploadService;
 import cn.com.ctop.manage.modules.material.service.IMaterialUploadService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
@@ -58,13 +56,10 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
     private CtopOauthTokenMapper oauthTokenMapper;
     private CtopOauthTokenMapper oauthTokenMapper;
     @Autowired
     @Autowired
     private MaterialInfoMapper materialInfoMapper;
     private MaterialInfoMapper materialInfoMapper;
-    @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
+
     @Autowired
     @Autowired
     private IFileInfoService fileInfoService;
     private IFileInfoService fileInfoService;
     @Autowired
     @Autowired
-    private IKuaiShouImageGetService iKuaiShouImageGetService;
-    @Autowired
     private IMaterialParameterService materialParameterService;
     private IMaterialParameterService materialParameterService;
     @Autowired
     @Autowired
     private MaterialParameterMapper parameterMapper;
     private MaterialParameterMapper parameterMapper;

+ 2 - 18
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/BytedanceJobApplication.java

@@ -7,18 +7,13 @@ import org.apache.shiro.spring.boot.autoconfigure.ShiroAutoConfiguration;
 import org.apache.shiro.spring.boot.autoconfigure.ShiroBeanAutoConfiguration;
 import org.apache.shiro.spring.boot.autoconfigure.ShiroBeanAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 @Slf4j
 @Slf4j
 @EnableSwagger2
 @EnableSwagger2
 @SpringBootApplication(exclude = {ShiroAnnotationProcessorAutoConfiguration.class, ShiroAutoConfiguration.class, ShiroBeanAutoConfiguration.class})
 @SpringBootApplication(exclude = {ShiroAnnotationProcessorAutoConfiguration.class, ShiroAutoConfiguration.class, ShiroBeanAutoConfiguration.class})
@@ -26,19 +21,8 @@ import java.net.UnknownHostException;
 @Configuration
 @Configuration
 @Import(SpringUtils.class)
 @Import(SpringUtils.class)
 public class BytedanceJobApplication {
 public class BytedanceJobApplication {
-    public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext application = SpringApplication.run(BytedanceJobApplication.class, args);
-        Environment env = application.getEnvironment();
-        String ip = InetAddress.getLocalHost().getHostAddress();
-        String port = env.getProperty("server.port");
-        String path = env.getProperty("server.servlet.context-path");
-        log.info("\n----------------------------------------------------------\n\t" +
-                "Application Jeecg-Boot is running! Access URLs:\n\t" +
-                "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
-                "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
-                "swagger-ui: \thttp://" + ip + ":" + port + path + "/swagger-ui.html\n\t" +
-                "Doc: \t\thttp://" + ip + ":" + port + path + "/doc.html\n" +
-                "----------------------------------------------------------");
+    public static void main(String[] args){
+        SpringApplication.run(BytedanceJobApplication.class, args);
     }
     }
 
 
     @Bean
     @Bean

+ 2 - 18
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/KuaishouJobApplication.java

@@ -6,36 +6,20 @@ import org.apache.shiro.spring.boot.autoconfigure.ShiroAutoConfiguration;
 import org.apache.shiro.spring.boot.autoconfigure.ShiroBeanAutoConfiguration;
 import org.apache.shiro.spring.boot.autoconfigure.ShiroBeanAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 @Slf4j
 @Slf4j
 @EnableSwagger2
 @EnableSwagger2
 @SpringBootApplication(exclude = {ShiroAnnotationProcessorAutoConfiguration.class, ShiroAutoConfiguration.class, ShiroBeanAutoConfiguration.class})
 @SpringBootApplication(exclude = {ShiroAnnotationProcessorAutoConfiguration.class, ShiroAutoConfiguration.class, ShiroBeanAutoConfiguration.class})
 @ComponentScan(basePackages = {"cn.com.ctop", "org.jeecg"})
 @ComponentScan(basePackages = {"cn.com.ctop", "org.jeecg"})
 @Configuration
 @Configuration
 public class KuaishouJobApplication {
 public class KuaishouJobApplication {
-    public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext application = SpringApplication.run(KuaishouJobApplication.class, args);
-        Environment env = application.getEnvironment();
-        String ip = InetAddress.getLocalHost().getHostAddress();
-        String port = env.getProperty("server.port");
-        String path = env.getProperty("server.servlet.context-path");
-        log.info("\n----------------------------------------------------------\n\t" +
-                "Application Jeecg-Boot is running! Access URLs:\n\t" +
-                "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
-                "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
-                "swagger-ui: \thttp://" + ip + ":" + port + path + "/swagger-ui.html\n\t" +
-                "Doc: \t\thttp://" + ip + ":" + port + path + "/doc.html\n" +
-                "----------------------------------------------------------");
+    public static void main(String[] args){
+        SpringApplication.run(KuaishouJobApplication.class, args);
     }
     }
 
 
     @Bean
     @Bean

+ 1 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ReportServiceImpl.java

@@ -73,6 +73,7 @@ public class ReportServiceImpl implements IReportService {
             return;
             return;
         }
         }
         JSONArray dataArray = getObject.getJSONObject("data").getJSONArray("list");
         JSONArray dataArray = getObject.getJSONObject("data").getJSONArray("list");
+        System.out.println(dataArray.toJSONString());
         if (null == dataArray || dataArray.size() <= 0) {
         if (null == dataArray || dataArray.size() <= 0) {
             return;
             return;
         }
         }

+ 0 - 1
pom.xml

@@ -24,7 +24,6 @@
         <module>module-ctop</module>
         <module>module-ctop</module>
         <module>performance-appraisal</module>
         <module>performance-appraisal</module>
         <module>jeecg-boot-module-system</module>
         <module>jeecg-boot-module-system</module>
-        <module>xxl-job-core</module>
         <module>module-job-bytedance</module>
         <module>module-job-bytedance</module>
         <module>module-job-kuaishou</module>
         <module>module-job-kuaishou</module>
 
 

+ 0 - 30
xxl-job-core/pom.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jeecg-boot-parent</artifactId>
-        <groupId>org.jeecgframework.boot</groupId>
-        <version>2.0.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>cn.com.ctop</groupId>
-    <artifactId>xxl-job-core</artifactId>
-
-    <dependencies>
-        <!-- xxl-rpc-core -->
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-rpc-core</artifactId>
-            <version>1.5.0</version>
-        </dependency>
-
-        <!-- groovy-all -->
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>${groovy.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>

+ 0 - 24
xxl-job-core/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java

@@ -1,24 +0,0 @@
-package com.xxl.job.core.handler.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * annotation for job handler
- *
- * will be replaced by {@link com.xxl.job.core.handler.annotation.XxlJob}
- *
- * @author 2016-5-17 21:06:49
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Deprecated
-public @interface JobHandler {
-
-    String value();
-
-}