Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/ExecutorMainDemoHandler.java

 package com.liquidnet.service.executor.main.handler;
 
-import com.alibaba.fastjson.JSON;
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -23,7 +19,7 @@ public class ExecutorMainDemoHandler {
 //    private FeignSequenceClient feignSequenceClient;
 //
 //    @XxlJob(value = "sev-sequence:mainDemoJobHandler")
-//    public ReturnT<String> mainDemoJobHandler(String param) {
+//    public void mainDemoJobHandler(String param) {
 //        log.info("liquidnet.mainDemoJobHandler");
 //        Long test = feignSequenceClient.nextId();
 //        log.info("test : " + test);
@@ -31,11 +27,10 @@ public class ExecutorMainDemoHandler {
 //        log.info("tests: " + JSON.toJSONString(tests));
 //        Long nextIncrId = feignSequenceClient.nextIncrId("SEQ_WL_N01_1784");
 //        log.info("incrid:" + nextIncrId);
-//        return ReturnT.SUCCESS;
 //    }
 
 //    @XxlJob(value = "sev-recon:accountCheckTask")
-//    public ReturnT<String> accountCheckTask(String param) {
+//    public void accountCheckTask(String param) {
 //        XxlJobLogger.log("start:liquidnet.accountCheckTask:[{}]", param);
 //
 //        String bankChannel = null;
@@ -47,6 +42,5 @@ public class ExecutorMainDemoHandler {
 //        }
 //        feignTaskReconAccountCheckClient.accountCheck(bankChannel,billDate);
 //        XxlJobLogger.log("end:liquidnet.accountCheckTask:[{}]", JSON.toJSONString(ResponseDto.success()));
-//        return ReturnT.SUCCESS;
 //    }
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/KylinTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
-import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.service.feign.kylin.task.FeignPlatformTaskClient;
-import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * XxlJob开发示例（Bean模式）
@@ -21,98 +16,56 @@ import org.springframework.web.bind.annotation.RequestParam;
  */
 @Component
 public class KylinTaskHandler {
-    private static final Logger log = LoggerFactory.getLogger(KylinTaskHandler.class);
-
     @Autowired
     private FeignPlatformTaskClient feignPlatformTaskClient;
 
     @XxlJob(value = "sev-platform:checkOrderTimeHandler")
-    public ReturnT<String> checkOrderTimeHandler() {
+    public void checkOrderTimeHandler() {
         try {
-            boolean result = feignPlatformTaskClient.checkOrderTime().getData();
-            log.info("checkOrderTimeHandler：结果：" + result);
-            return ReturnT.SUCCESS;
+            XxlJobHelper.handleSuccess("结果：" + feignPlatformTaskClient.checkOrderTime().getData());
         } catch (Exception e) {
-            return ReturnT.FAIL;
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 
     @XxlJob(value = "sev-platform:checkGoblinOrderTimeHandler")
-    public ReturnT<String> checkGoblinOrderTimeHandler() {
+    public void checkGoblinOrderTimeHandler() {
         try {
-            boolean result = feignPlatformTaskClient.checkGoblinOrderTime().getData();
-            log.info("checkGoblinOrderTimeHandler：结果：" + result);
-            return ReturnT.SUCCESS;
+            XxlJobHelper.handleSuccess("结果：" + feignPlatformTaskClient.checkGoblinOrderTime().getData());
         } catch (Exception e) {
-            return ReturnT.FAIL;
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 
     @XxlJob(value = "sev-platform:checkPerformanceTimeHandler")
-    public ReturnT<String> checkPerformanceTimeHandler() {
+    public void checkPerformanceTimeHandler() {
         try {
-            String result = feignPlatformTaskClient.checkPerformanceTime().getData();
-            log.info("checkPerformanceTimeHandler：结果：" + result);
-            return ReturnT.SUCCESS;
+            XxlJobHelper.handleSuccess("结果：" + feignPlatformTaskClient.checkPerformanceTime().getData());
         } catch (Exception e) {
-            return ReturnT.FAIL;
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 
     @XxlJob(value = "sev-platform:checkTransferOrderHandler")
-    public ReturnT<String> checkTransferOrderHandler() {
+    public void checkTransferOrderHandler() {
         try {
-            String minute = XxlJobHelper.getJobParam(); //执行参数
-            log.debug("minute = " + Integer.parseInt(minute));
-            boolean result = feignPlatformTaskClient.checkTransferOrder(Integer.parseInt(minute)).getData();
-            log.info("checkTransferOrderHandler：结果：" + result);
-            return ReturnT.SUCCESS;
+            XxlJobHelper.handleSuccess("结果：" + feignPlatformTaskClient.checkTransferOrder(Integer.parseInt(XxlJobHelper.getJobParam())).getData());
         } catch (Exception e) {
-            log.info("exception = ", e);
-            return ReturnT.FAIL;
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 
     @XxlJob(value = "sev-platform:performanceLine")
-    public ReturnT<String> performanceLineHandler() {
+    public void performanceLineHandler() {
         try {
-            boolean result = feignPlatformTaskClient.performanceLine().getData();
-            log.info("performanceLineHandler：结果：" + result);
-            return ReturnT.SUCCESS;
+            XxlJobHelper.handleSuccess("结果：" + feignPlatformTaskClient.performanceLine().getData());
         } catch (Exception e) {
-            log.info("exception = ", e);
-            return ReturnT.FAIL;
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
-
-//    @Autowired
-//    private FeignSequenceClient feignSequenceClient;
-//
-//    @XxlJob(value = "sev-sequence:mainDemoJobHandler")
-//    public ReturnT<String> mainDemoJobHandler(String param) {
-//        log.info("liquidnet.mainDemoJobHandler");
-//        Long test = feignSequenceClient.nextId();
-//        log.info("test : " + test);
-//        Long[] tests = feignSequenceClient.nextId(2);
-//        log.info("tests: " + JSON.toJSONString(tests));
-//        Long nextIncrId = feignSequenceClient.nextIncrId("SEQ_WL_N01_1784");
-//        log.info("incrid:" + nextIncrId);
-//        return ReturnT.SUCCESS;
-//    }
-
-//    @XxlJob(value = "sev-recon:accountCheckTask")
-//    public ReturnT<String> accountCheckTask(String param) {
-//        XxlJobLogger.log("start:liquidnet.accountCheckTask:[{}]", param);
-//
-//        String bankChannel = null;
-//        String billDate = null;
-//        if (!StringUtils.isEmpty(param)) {
-//            JSONObject jsonParam = JSON.parseObject(param);
-//            bankChannel = jsonParam.getString("bankChannel");
-//            billDate = jsonParam.getString("billDate");
-//        }
-//        feignTaskReconAccountCheckClient.accountCheck(bankChannel,billDate);
-//        XxlJobLogger.log("end:liquidnet.accountCheckTask:[{}]", JSON.toJSONString(ResponseDto.success()));
-//        return ReturnT.SUCCESS;
-//    }
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformGoblinTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.feign.platform.task.FeignPlatformGoblinTaskClient;
-import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -15,35 +11,26 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class PlatformGoblinTaskHandler {
-    private static final Logger log = LoggerFactory.getLogger(PlatformGoblinTaskHandler.class);
     @Autowired
     private FeignPlatformGoblinTaskClient feignPlatformGoblinTaskClient;
 
-    // 商城:商品预约上架
     @XxlJob(value = "sev-platform:goblinGoodsOnShelvesHandler")
-    public ReturnT<String> goblinGoodsOnShelvesHandler() {
+    public void goblinGoodsOnShelvesHandler() {// 商城:商品预约上架
         try {
-            ResponseDto<String> dto = feignPlatformGoblinTaskClient.goodsOnShelvesHandler();
-            String dtoStr = JsonUtils.toJson(dto);
-            log.info("result of handler:{}", dtoStr);
-            return new ReturnT<>(ReturnT.SUCCESS_CODE, dtoStr);
+            XxlJobHelper.handleSuccess("结果：" + feignPlatformGoblinTaskClient.goodsOnShelvesHandler().toJson());
         } catch (Exception e) {
-            log.error("exception of handler:{}", e.getMessage(), e);
-            return new ReturnT<>(ReturnT.FAIL_CODE, e.getLocalizedMessage());
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 
-    // 商城:商铺活动开启关闭
     @XxlJob(value = "sev-platform:goblinStoreMarketActivityHandler")
-    public ReturnT<String> goblinStoreMarketActivityHandler() {
+    public void goblinStoreMarketActivityHandler() {// 商城:商铺活动开启关闭
         try {
-            ResponseDto<String> dto = feignPlatformGoblinTaskClient.storeMarketActivityHandler();
-            String dtoStr = JsonUtils.toJson(dto);
-            log.info("result of handler:{}", dtoStr);
-            return new ReturnT<>(ReturnT.SUCCESS_CODE, dtoStr);
+            XxlJobHelper.handleSuccess("结果：" + feignPlatformGoblinTaskClient.storeMarketActivityHandler().toJson());
         } catch (Exception e) {
-            log.error("exception of handler:{}", e.getMessage(), e);
-            return new ReturnT<>(ReturnT.FAIL_CODE, e.getLocalizedMessage());
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/SweetCityVoteTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
 import com.liquidnet.service.feign.sweet.task.FeignSweetTaskActivityClient;
-import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,32 +11,22 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SweetCityVoteTaskHandler {
-    private static final Logger log = LoggerFactory.getLogger(SweetCityVoteTaskHandler.class);
-
     @Autowired
     private FeignSweetTaskActivityClient feignSweetTaskActivityClient;
 
     @XxlJob(value = "sev-sweet:cityVoteStat")
-    public ReturnT<String> cityVoteStatHandler() {
+    public void cityVoteStatHandler() {
         try {
-            String jobParam = XxlJobHelper.getJobParam();//执行参数
-            log.info("jobParam = " + jobParam);
+            String jobParam = XxlJobHelper.getJobParam();
             String[] paramArray = jobParam.split(",");
 
-            ReturnT<String> success = new ReturnT<>();
-            success.setCode(ReturnT.SUCCESS_CODE);
-
             for (String type : paramArray) {
-                log.info("type = " + type);
                 Boolean data = feignSweetTaskActivityClient.setStatList(Integer.parseInt(type)).getData();
-                log.info("cityVoteStatHandler：结果：{}", data);
-                success.setMsg(String.valueOf(data));
+                XxlJobHelper.log("type:{},结果:{}", data);
             }
-
-            return success;
         } catch (Exception e) {
-            log.error("exception of handler:{}", e.getMessage(), e);
-            return new ReturnT<>(ReturnT.FAIL_CODE, e.getLocalizedMessage());
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/SweetTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
 import com.liquidnet.service.feign.sweet.task.FeignSweetTaskClient;
-import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,49 +10,38 @@ import org.springframework.stereotype.Component;
  * XxlJob开发示例（Bean模式）
  * <p>
  * 开发步骤：
- * 1、在Spring Bean实例中，开发Job方法，方式格式要求为 "public ReturnT<String> execute(String param)"
+ * 1、在Spring Bean实例中，开发Job方法，方式格式要求为 "public void execute(String param)"
  * 2、为Job方法添加注解 "@XxlJob(value="自定义jobhandler名称", init = "JobHandler初始化方法", destroy = "JobHandler销毁方法")"，注解value值对应的是调度中心新建任务的JobHandler属性的值。
  * 3、执行日志：需要通过 "XxlJobLogger.log" 打印执行日志；
  */
 @Component
 public class SweetTaskHandler {
-    private static final Logger log = LoggerFactory.getLogger(SweetTaskHandler.class);
-
     @Autowired
     private FeignSweetTaskClient feignSweetTaskClient;
 
     @XxlJob(value = "sev-sweet:drawLuckAdd")
-    public ReturnT<String> drawLuckAdd() {
+    public void drawLuckAdd() {
         try {
-            boolean result = feignSweetTaskClient.drawLuckAdd().getData();
-            log.info("drawLuckAdd：结果："+result);
-            return ReturnT.SUCCESS;
+            XxlJobHelper.handleSuccess("结果：" + feignSweetTaskClient.drawLuckAdd().getData());
         } catch (Exception e) {
-            return ReturnT.FAIL;
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 
     @XxlJob(value = "sev-sweet:setDrawAllList")
-    public ReturnT<String> setDrawAllListHandler() {
+    public void setDrawAllListHandler() {
         try {
-            String jobParam = XxlJobHelper.getJobParam();//执行参数
-            log.info("jobParam = " + jobParam);
+            String jobParam = XxlJobHelper.getJobParam();
             String[] paramArray = jobParam.split(",");
 
-            ReturnT<String> success = new ReturnT<>();
-            success.setCode(ReturnT.SUCCESS_CODE);
-
             for (String id : paramArray) {
-                log.info("id = " + id);
                 Boolean data = feignSweetTaskClient.setDrawAllList(id).getData();
-                log.info("setDrawAllListHandler：结果：{}", data);
-                success.setMsg(String.valueOf(data));
+                XxlJobHelper.log("id:{},结果:{}", data);
             }
-
-            return success;
         } catch (Exception e) {
-            log.error("exception of handler:{}", e.getMessage(), e);
-            return new ReturnT<>(ReturnT.FAIL_CODE, e.getLocalizedMessage());
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/SweetWechatTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
 import com.liquidnet.service.feign.sweet.task.FeignSweetWechatClient;
-import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,43 +11,32 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SweetWechatTaskHandler {
-    private static final Logger log = LoggerFactory.getLogger(SweetWechatTaskHandler.class);
-
     @Autowired
     private FeignSweetWechatClient feignSweetWechatClient;
 
     @XxlJob(value = "sev-sweet:sendMsg")
-    public ReturnT<String> sendWechatMsgHandler() {
+    public void sendWechatMsgHandler() {
         try {
-            Object data = feignSweetWechatClient.send().getData();
-            log.info("sendWechatMsgHandler：结果：{}", data);
-            return new ReturnT<>(ReturnT.SUCCESS_CODE, String.valueOf(data));
+            XxlJobHelper.handleSuccess("结果：" + feignSweetWechatClient.send().getData());
         } catch (Exception e) {
-            log.error("exception of handler:{}", e.getMessage(), e);
-            return new ReturnT<>(ReturnT.FAIL_CODE, e.getLocalizedMessage());
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }
 
     @XxlJob(value = "sev-sweet:sendSubMsg")
-    public ReturnT<String> sendSubMsgHandler() {
+    public void sendSubMsgHandler() {
         try {
-            String jobParam = XxlJobHelper.getJobParam();//执行参数
-            log.info("jobParam = " + jobParam);
+            String jobParam = XxlJobHelper.getJobParam();
             String[] paramArray = jobParam.split(",");
 
-            ReturnT<String> success = new ReturnT<>();
-            success.setCode(ReturnT.SUCCESS_CODE);
-
             for (String type : paramArray) {
                 Object data = feignSweetWechatClient.sendSubMsg(Integer.parseInt(type)).getData();
-                log.info("sendSubMsgHandler：结果：{}", data);
-                success.setMsg(String.valueOf(data));
+                XxlJobHelper.log("type:{},结果:{}", data);
             }
-
-            return success;
         } catch (Exception e) {
-            log.error("exception of handler:{}", e.getMessage(), e);
-            return new ReturnT<>(ReturnT.FAIL_CODE, e.getLocalizedMessage());
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
         }
     }