Jelajahi Sumber

Merge remote-tracking branch 'origin/master'

yumeng 4 tahun lalu
induk
melakukan
6565de2cd8

+ 1 - 7
jeecg-boot-base-common/src/main/java/org/jeecg/common/system/controller/CommonController.java

@@ -5,12 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.RestUtil;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -41,10 +39,6 @@ import java.net.URLDecoder;
 @RestController
 @RequestMapping("/sys/common")
 public class CommonController {
-
-	@Autowired
-	private ISysBaseApi sysBaseAPI;
-
 	@Value(value = "${jeecg.path.upload}")
 	private String uploadpath;
 
@@ -98,7 +92,7 @@ public class CommonController {
 				savePath = this.uploadLocal(file,bizPath);
 			}
 		}else{
-			savePath = sysBaseAPI.upload(file,bizPath,uploadType);
+//			savePath = sysBaseApi.upload(file,bizPath,uploadType);
 		}
 		if(oConvertUtils.isNotEmpty(savePath)){
 			result.setMessage(savePath);

+ 1 - 1
module-job-bytedance/pom.xml

@@ -8,7 +8,7 @@
         <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <version>2.0.2</version>
     <artifactId>module-job-bytedance</artifactId>
     <name>module-job-bytedance</name>
     <properties>

+ 1 - 7
module-job-kuaishou/pom.xml

@@ -8,7 +8,7 @@
         <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <version>2.0.2</version>
     <artifactId>module-job-kuaishou</artifactId>
 
     <properties>
@@ -79,12 +79,6 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>performance-appraisal</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>3.5.0</version>

+ 18 - 0
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -121,6 +121,24 @@ mybatis-plus:
       table-underline: true
 #jeecg专用配置
 jeecg:
+  elasticsearch:
+    cluster-nodes:
+    check-enabled: false
+  uploadType:
+  oss:
+    endpoint:
+    accessKey:
+    secretKey:
+    bucketName:
+    staticDomain:
+  sms:
+    accessKeyId:
+    accessKeySecret:
+  minio:
+    minio_url:
+    minio_name:
+    minio_pass:
+    bucketName:
   ffmpeg:
     bin: ffmpeg
   path:

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

@@ -2,7 +2,8 @@ server:
   port: 8092
 spring:
   profiles:
-    active: @activatedProperties@
+#    active: @activatedProperties@
+    active: prod
   application:
     name: system-web
 swagger:

+ 2 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceAdvertisePlanController.java

@@ -53,7 +53,7 @@ public class ByteDanceAdvertisePlanController {
         }
         QueryWrapper<ByteDanceAdvertisePlan> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertisePlan, req.getParameterMap());
         if(status!=null&&!status.trim().equals("")){
-            queryWrapper.eq("opt_status",status);
+            queryWrapper.eq("opt_status","AD_STATUS_"+status);
         }
         if(null!=startDate&&!"".equals(startDate)){
             queryWrapper.ge("ad_create_time",startDate+" 00:00:00");
@@ -61,6 +61,7 @@ public class ByteDanceAdvertisePlanController {
         if(null!=endDate&&!"".equals(endDate)){
             queryWrapper.le("ad_create_time",endDate+" 11:59:59");
         }
+        queryWrapper.ne("opt_status","AD_STATUS_DELETE");
         Page<ByteDanceAdvertisePlan> page = new Page<>(pageNo, pageSize);
         IPage<ByteDanceAdvertisePlan> pageList = byteDanceAdvertisePlanService.page(page, queryWrapper);
         //处理计划投放状态