فهرست منبع

Merge branch 'master' into test

yumeng 4 سال پیش
والد
کامیت
4bf770eab4

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: @activatedProperties@
   application:
     name: system-web
 #分页pageHelper

+ 1 - 0
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -215,6 +215,7 @@ public class SampleTest {
         RuleResult resultParam = new RuleResult();
         kieSession.insert(resultParam);
         kieSession.fireAllRules();
+        System.out.println(resultParam.isPostCodeResult());
     }
 }
 

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/utils/HttpUtils.java

@@ -276,7 +276,7 @@ public class HttpUtils {
             if (param != null && param.size() > 0) {
                 httppost.setEntity(new StringEntity(new Gson().toJson(param), Charset.forName("UTF-8")));
             }
-            RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(120 * 1000).setConnectTimeout(120 * 1000).build();
+            RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(300 * 1000).setConnectTimeout(300 * 1000).build();
             httppost.setConfig(requestConfig);
             HttpEntity respentity;
 

+ 1 - 1
module-job-bytedance/src/main/resources/application.yml

@@ -21,4 +21,4 @@ xxl:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
-      addresses: http://39.106.184.70:8090/xxl-job-admin
+      addresses: http://139.186.29.76:8090

+ 1 - 1
module-job-kuaishou/src/main/resources/application.yml

@@ -21,4 +21,4 @@ xxl:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
-      addresses: http://39.106.184.70:8090/xxl-job-admin
+      addresses: http://139.186.29.76:8090

+ 6 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/MaterialRefuseController.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
+@Slf4j
 @RestController
 @RequestMapping("/MaterialRefuse")
 public class MaterialRefuseController {
@@ -43,6 +45,8 @@ public class MaterialRefuseController {
         try {
 
             QueryWrapper<KuaiShouCreative> queryWrapper = QueryGenerator.initQueryWrapper(creative, req.getParameterMap());
+            queryWrapper.eq("status", 42);
+            queryWrapper.orderByDesc("creative_create_time");
             Page<KuaiShouCreative> page = new Page<KuaiShouCreative>(pageNo, pageSize);
             IPage<KuaiShouCreative> pageList = creativeService.page(page, queryWrapper);
             result.setSuccess(true);
@@ -129,16 +133,17 @@ public class MaterialRefuseController {
                     Long creativeId = creativeJson.getLong("creativeId");
                     JSONObject requestJson = new JSONObject();
                     requestJson.put("creativeId", creativeId);
-                    System.err.println(creativeId);
                     String description = creativeJson.getString("description");
                     if (!Check.isNull(description)) {
                         requestJson.put("description", convertMoString(description));
                         Map<String, Object> creativeMap = updateService.updateCreative(ctopOauthToken.getAccessToken(), accountId, requestJson);
                         Integer code = (Integer) creativeMap.get("code");
                         if (code == 0) {
+                            log.info("拒审重提成功,accountId:{},creativeId:{}", accountId, creativeId);
                             successCount += 1;
 
                         } else {
+                            log.info("拒审重提失败,accountId:{},creativeId:{}", accountId, creativeId);
                             failCount += 1;
                         }
                     }