Ver código fonte

测试二进制与运算

syh 5 anos atrás
pai
commit
4a4cd989c4

+ 4 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CrawlerController.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.ctop.controller;
 
 import org.jeecg.modules.ctop.service.ICrawlerService;
 import org.jeecg.modules.ctop.vo.KuaishouAppiumJobVO;
-import org.jeecg.modules.fegin.LogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -13,16 +12,15 @@ import java.util.Map;
 public class CrawlerController {
     @Autowired
     private ICrawlerService crawlerService;
-    @Autowired
-    private LogService logService;
 
     @PostMapping("startJob")
     public Map<String, Object> runTask(@RequestBody KuaishouAppiumJobVO jobVO) {
         return crawlerService.startJob(jobVO);
     }
 
-    @GetMapping("log")
-    public String home(String name) {
-        return logService.home(name);
+    public static void main(String[] args) {
+        int a = 2;
+        int b = 7791;
+        System.out.println(a & b);
     }
 }

+ 11 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fegin/LogService.java

@@ -1,11 +1,11 @@
-package org.jeecg.modules.fegin;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(name = "log-service")
-public interface LogService {
-    @GetMapping("hi")
-    String home(@RequestParam(value = "name") String name);
-}
+//package org.jeecg.modules.fegin;
+//
+//import org.springframework.cloud.openfeign.FeignClient;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//@FeignClient(name = "log-service")
+//public interface LogService {
+//    @GetMapping("hi")
+//    String home(@RequestParam(value = "name") String name);
+//}

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

@@ -2,7 +2,6 @@ package org.jeecg;
 
 import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.common.module.utils.HttpUtils2;
-import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumJobService;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
@@ -167,8 +166,6 @@ public class SampleTest {
         JSONObject jsonObject = JSONObject.parseObject(result);
         System.err.println(jsonObject);
     }
-
-
 }
 
 

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -58,7 +58,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         String path = materialInfo.getUrl().substring(materialInfo.getUrl().indexOf("/", 10) + 1, materialInfo.getUrl().length());
         System.out.println(path);
         String jobId = mpsUtils.videoWaterMark(path, videoWatermarkTemplate.getTemplatePath(), videoWatermarkTemplate.getTemplateId(), videoWatermarkTemplate.getHeight());
-        QueryJobListResponse.Job job = mpsUtils.getJobStatus(jobId);
+        QueryJobListResponse.Job job = MpsUtils.getJobStatus(jobId);
         VideoWatermarkTask videoWatermarkTask = new VideoWatermarkTask();
         videoWatermarkTask.setJobId(jobId);
         videoWatermarkTask.setUserId(userId);