Merge branch 'master' into dev-xym-add-match-video

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/XxlJobService.java

@@ -8,6 +8,7 @@ import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.tzld.longarticle.recommend.server.common.CommonThreadPoolExecutor;
+import com.tzld.longarticle.recommend.server.common.HttpPoolFactory;
 import com.tzld.longarticle.recommend.server.common.enums.FieshuTableColumnDataTypeEnum;
 import com.tzld.longarticle.recommend.server.common.enums.aigc.MiniprogramUseTypeEnum;
 import com.tzld.longarticle.recommend.server.common.enums.aigc.ProduceContentAuditStatusEnum;
@@ -50,6 +51,10 @@ import lombok.Setter;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.data.domain.Page;
@@ -871,7 +876,7 @@ public class XxlJobService {
                         .distinct().collect(Collectors.toList());
                 for (Integer useType : useTypeList) {
                     if (useType.equals(MiniprogramUseTypeEnum.Touliu.getVal())
-                            || useType.equals(MiniprogramUseTypeEnum.Daitou.getVal()))  {
+                            || useType.equals(MiniprogramUseTypeEnum.Daitou.getVal())) {
                         type = MiniprogramUseTypeEnum.from(useType).getDescription();
                         break;
                     }
@@ -930,4 +935,20 @@ public class XxlJobService {
         return columns;
     }
 
+    @XxlJob("AutoRestart")
+    public ReturnT<String> autoRestart(String param) {
+        CloseableHttpClient client = HttpPoolFactory.defaultPool();
+        try {
+            URIBuilder uriBuilder = new URIBuilder("https://cs.console.aliyun.com/hook/trigger");
+            uriBuilder.setParameter("token", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbHVzdGVySWQiOiJjZjBhOTQ2MmU2NGVjNDQwYzgxYzM3ODYyZjg5ZGU5NjkiLCJpZCI6Ijc5NzQxNzk0NTM0ODE3OTcxIn0.BWuBBuP3_q_lagIzh2oNCwf9hp2-8wzAFnsb7ZUv2-7qnLEia5f6j_KjY5r7Ach1Zr4cuRxvOBXg4NuQz5-P-61yWA5_apaRimpKiIt0qbaKXAlvLn7-5VKxKICA2_GdmdKyczssa-A5zvn8P2vzNpEKiYkvPYKVxe0tbuABtrk"); // 假设需要传递gzhId参数
+            HttpGet httpGet = new HttpGet();
+            httpGet.setURI(uriBuilder.build());
+
+            CloseableHttpResponse response = client.execute(httpGet);
+        } catch (Exception e) {
+            log.error("AutoRestart error", e);
+        }
+        return ReturnT.SUCCESS;
+    }
+
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/XxlJobController.java

@@ -112,4 +112,9 @@ public class XxlJobController {
         service.refreshAccount(null);
     }
 
+    @GetMapping("/autoRestart")
+    public void autoRestart() {
+        service.autoRestart(null);
+    }
+
 }