diff --git a/cdp-iaas/authorization-server/src/main/resources/config/application-dev.yml b/cdp-iaas/authorization-server/src/main/resources/config/application-dev.yml
index 73e1ac6..3bc28cc 100644
--- a/cdp-iaas/authorization-server/src/main/resources/config/application-dev.yml
+++ b/cdp-iaas/authorization-server/src/main/resources/config/application-dev.yml
@@ -17,8 +17,8 @@ spring:
timeout: 5000
cloud:
nacos:
+# server-addr: 8.130.96.163:8848
server-addr: 127.0.0.1:8848
-# server-addr: 101.35.109.129:8848
config:
server-addr: ${spring.cloud.nacos.server-addr}
file-extension: yml
diff --git a/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml b/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml
index 59f4556..e49729f 100644
--- a/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml
+++ b/cdp-iaas/gateway-server/src/main/resources/config/application-dev.yml
@@ -14,7 +14,6 @@ spring:
password: ${MYSQL_PASSWORD:y7z7noq2}
nacos:
server-addr: 127.0.0.1:8848
- # server-addr: 101.35.109.129
config:
server-addr: ${spring.cloud.nacos.server-addr}
file-extension: yml
diff --git a/cdp-task/pom.xml b/cdp-task/pom.xml
index 5132b26..8ac4ba1 100644
--- a/cdp-task/pom.xml
+++ b/cdp-task/pom.xml
@@ -20,6 +20,7 @@
org.apache.curator
curator-framework
+ 2.12.0
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokHotCommentSopController.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokHotCommentSopController.java
index d88adb4..5887cfc 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokHotCommentSopController.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokHotCommentSopController.java
@@ -107,16 +107,23 @@ public class TiktokHotCommentSopController {
@GetMapping("/test")
@ApiOperation("测试接口")
- public void test(){
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.eq("implement_type", DefaultNumberConstants.ONE_NUMBER);
- List sopEntityList = hotCommentSopService.list(wrapper);
- Date date = new Date();
- // 1、取出要执行的sop
- List collect = sopEntityList.stream()
- .filter(st -> date.compareTo(st.getBeginTime()) > 0 && date.compareTo(st.getEndTime()) < 0)
- .collect(Collectors.toList());
- // 2、执行sop规则
- hotCommentSopService.userWorkTask(collect.get(0));
+ public void test(@RequestParam("id") Long id){
+// QueryWrapper wrapper = new QueryWrapper<>();
+// wrapper.eq("implement_type", DefaultNumberConstants.ONE_NUMBER);
+// List sopEntityList = hotCommentSopService.list(wrapper);
+// Date date = new Date();
+// // 1、取出要执行的sop
+// List collect = sopEntityList.stream()
+// .filter(st -> date.compareTo(st.getBeginTime()) > 0 && date.compareTo(st.getEndTime()) < 0)
+// .collect(Collectors.toList());
+// // 2、执行sop规则
+// hotCommentSopService.userWorkTask(collect.get(0));
+
+
+
+// TiktokHotCommentSopEntity sopEntity = hotCommentSopService.getById(id);
+// hotCommentSopService.userWorkTask(sopEntity);
+
+ hotCommentSopService.refreshVideo();
}
}
diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokLabelOrganizeController.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokLabelOrganizeController.java
index 5c220e7..abfaf11 100644
--- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokLabelOrganizeController.java
+++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokLabelOrganizeController.java
@@ -7,6 +7,7 @@ import com.baiye.core.page.PageResult;
import com.baiye.dto.TiktokLabelOrganizeDto;
import com.baiye.entity.TiktokLabelOrganizeEntity;
import com.baiye.service.TiktokLabelOrganizeService;
+import com.baiye.service.TiktokLabelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -32,7 +33,27 @@ public class TiktokLabelOrganizeController {
@PostMapping("/save")
@ApiOperation("标签组新增")
public Result> add(@Validated({AddGroup.class}) @RequestBody TiktokLabelOrganizeEntity labelOrganizeEntity) {
- labelOrganizeService.save(labelOrganizeEntity);
+ labelOrganizeService.add(labelOrganizeEntity);
+ return Result.success();
+ }
+
+ /**
+ * 修改
+ */
+ @PostMapping("/update")
+ @ApiOperation("标签组信息修改")
+ public Result> update(@Validated({UpdateGroup.class}) @RequestBody TiktokLabelOrganizeEntity labelOrganizeEntity){
+ labelOrganizeService.updateInfo(labelOrganizeEntity);
+ return Result.success();
+ }
+
+ /**
+ * 删除
+ */
+ @GetMapping("/del")
+ @ApiOperation("标签组删除")
+ public Result> del(@RequestParam("id") Long id){
+ labelOrganizeService.del(id);
return Result.success();
}
@@ -64,13 +85,12 @@ public class TiktokLabelOrganizeController {
}
/**
- * 修改
+ * 查询未绑定标签组的sop列表
*/
- @PostMapping("/update")
- @ApiOperation("标签组信息修改")
- public Result> update(@Validated({UpdateGroup.class}) @RequestBody TiktokLabelOrganizeEntity labelOrganizeEntity ){
- labelOrganizeService.updateById(labelOrganizeEntity);
- return Result.success();
+ @GetMapping("/sopList")
+ @ApiOperation("查询未绑定标签组的sop列表")
+ public Result