Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -33,6 +33,11 @@
             <artifactId>data-statistical-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-third-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/ComponentAccessTokenService.java

@@ -0,0 +1,13 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.utils.Result;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/20 10:21
+ */
+public interface ComponentAccessTokenService {
+
+    Result componentAccessTokenJob();
+
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/RefreshAuthAccessTokenService.java

@@ -0,0 +1,13 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.utils.Result;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/20 10:44
+ */
+public interface RefreshAuthAccessTokenService {
+
+    Result refreshAuthorizerAccessTokenJob();
+
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java

@@ -0,0 +1,25 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.EpmetThirdFeignClient;
+import com.epmet.service.ComponentAccessTokenService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/20 10:22
+ */
+@Slf4j
+@Service
+public class ComponentAccessTokenServiceImpl implements ComponentAccessTokenService {
+
+    @Autowired
+    private EpmetThirdFeignClient epmetThirdFeignClient;
+
+    @Override
+    public Result componentAccessTokenJob() {
+        return epmetThirdFeignClient.getComponentAccessTokenJob();
+    }
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java

@@ -0,0 +1,23 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.EpmetThirdFeignClient;
+import com.epmet.service.RefreshAuthAccessTokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/20 10:44
+ */
+@Service
+public class RefreshAuthAccessTokenServiceImpl implements RefreshAuthAccessTokenService {
+
+    @Autowired
+    private EpmetThirdFeignClient epmetThirdFeignClient;
+
+    @Override
+    public Result refreshAuthorizerAccessTokenJob() {
+        return epmetThirdFeignClient.refreshAuthorizerAccessTokenJob();
+    }
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ComponentAccessTokenTask.java

@@ -0,0 +1,34 @@
+package com.epmet.task;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.ComponentAccessTokenService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/20 10:28
+ */
+@Component("componentAccessToken")
+public class ComponentAccessTokenTask implements ITask{
+
+    @Autowired
+    private ComponentAccessTokenService componentAccessTokenService;
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+
+    @Override
+    public void run(String params) {
+        logger.info("ComponentAccessTokenTask正在执行定时任务，参数为{}",params);
+        Result result = componentAccessTokenService.componentAccessTokenJob();
+        if (result.success()){
+            logger.info("ComponentAccessTokenTask定时任务执行成功");
+        }else {
+            logger.error("ComponentAccessTokenTask定时任务执行失败:" + result.getMsg());
+        }
+    }
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/RefreshAuthAccessTokenTask.java

@@ -0,0 +1,32 @@
+package com.epmet.task;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.RefreshAuthAccessTokenService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/20 10:46
+ */
+@Component("refreshAuthAccessTokenTask")
+public class RefreshAuthAccessTokenTask implements ITask {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private RefreshAuthAccessTokenService refreshAuthAccessTokenService;
+
+    @Override
+    public void run(String params) {
+        logger.info("RefreshAuthAccessTokenTask正在执行定时任务，参数为{}",params);
+        Result result = refreshAuthAccessTokenService.refreshAuthorizerAccessTokenJob();
+        if (result.success()){
+            logger.info("RefreshAuthAccessTokenTask定时任务执行成功");
+        }else {
+            logger.error("RefreshAuthAccessTokenTask定时任务执行失败:" + result.getMsg());
+        }
+    }
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java

@@ -68,4 +68,20 @@ public interface EpmetThirdFeignClient {
      **/
     @PostMapping(value = "third/pacustomer/updatecustomer/{customerId}")
     Result updateCustomer(@PathVariable("customerId") String customerId);
+
+    /**
+     * @Description  获取【component_access_token】的定时任务 15min/次
+     * @param
+     * @author zxc
+     */
+    @PostMapping(value = "third/wechatthird/componentaccesstoken")
+    Result getComponentAccessTokenJob();
+
+    /**
+     * @Description  获取/刷新接口调用令牌  15min/次
+     * @param
+     * @author zxc
+     */
+    @PostMapping(value = "third/wechatthird/refreshtoken")
+    Result refreshAuthorizerAccessTokenJob();
 }

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java

@@ -42,4 +42,14 @@ public class EpmetThirdFeignClientFallback implements EpmetThirdFeignClient {
     public Result updateCustomer(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "updateCustomer", customerId);
     }
+
+    @Override
+    public Result getComponentAccessTokenJob() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getComponentAccessTokenJob");
+    }
+
+    @Override
+    public Result refreshAuthorizerAccessTokenJob() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "refreshAuthorizerAccessTokenJob");
+    }
 }

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PreAuthTokenDao.xml

@@ -32,7 +32,7 @@
 
     <!-- 逻辑删pre_auth_code -->
     <update id="updateOldPreAuthCode">
-        update pre_auth_token set  del_flag = 0
+        update pre_auth_token set  del_flag = 1
     </update>
 
 </mapper>