diff --git a/admin/src/main/java/com/baiye/AdminApplication.java b/admin/src/main/java/com/baiye/AdminApplication.java index 216dfea..aca2393 100644 --- a/admin/src/main/java/com/baiye/AdminApplication.java +++ b/admin/src/main/java/com/baiye/AdminApplication.java @@ -5,6 +5,7 @@ import org.ballcat.springsecurity.oauth2.server.resource.annotation.EnableOauth2 import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; /** * @author Hccake @@ -13,6 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableOauth2ResourceServer @MapperScan({ "com.baiye.**.mapper" }) @SpringBootApplication +@EnableScheduling public class AdminApplication { public static void main(String[] args) { diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/OceanEngineController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/OceanEngineController.java index 913c590..1e7bd60 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/OceanEngineController.java +++ b/admin/src/main/java/com/baiye/modules/distribute/controller/OceanEngineController.java @@ -1,5 +1,9 @@ package com.baiye.modules.distribute.controller; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.modules.distribute.dto.OceanEngineTokenDto; +import com.baiye.modules.distribute.qo.OceanEnginQo; import com.baiye.modules.distribute.service.OceanEngineClueService; import com.baiye.modules.distribute.service.OceanEngineService; import com.baiye.modules.distribute.vo.OceanEnginVO; @@ -10,6 +14,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; diff --git a/admin/src/main/java/com/baiye/task/RefreshTokenTask.java b/admin/src/main/java/com/baiye/task/RefreshTokenTask.java index 773c2dd..9ed3fdb 100644 --- a/admin/src/main/java/com/baiye/task/RefreshTokenTask.java +++ b/admin/src/main/java/com/baiye/task/RefreshTokenTask.java @@ -14,6 +14,7 @@ import com.baiye.properties.OceanEngineConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -35,7 +36,8 @@ public class RefreshTokenTask { /** * 定时刷新token */ - @Scheduled(cron = "0 45 23 * * ?") + @Scheduled(cron = "0 0/1 * * * ?") + // @Scheduled(cron = "0 45 23 * * ?") public void updateAccountMassNum() { List engineTokens = oceanEngineService.findByStatus(DefaultNumberConstants.ONE_NUMBER); diff --git a/admin/src/main/resources/application-prod.yml b/admin/src/main/resources/application-prod.yml index ed40b44..3f6d4cd 100644 --- a/admin/src/main/resources/application-prod.yml +++ b/admin/src/main/resources/application-prod.yml @@ -31,4 +31,5 @@ ocean: engine: appId: 1744002574259247 appSecret: f1bef553cd635b7cd8057052654ebaaa30fa92a5 - redirectUrl: http:///39.100.77.21:8866/api/oceanEngine/callback + redirectUrl: https://byffp.top/api/oceanEngine/callback + diff --git a/admin/src/main/resources/application-test.yml b/admin/src/main/resources/application-test.yml index 8310c4d..b775943 100644 --- a/admin/src/main/resources/application-test.yml +++ b/admin/src/main/resources/application-test.yml @@ -36,6 +36,6 @@ springdoc: # 巨量引擎配置 ocean: engine: - appId: 1744002574259247 - appSecret: f1bef553cd635b7cd8057052654ebaaa30fa92a5 - redirectUrl: http:///39.100.77.21:8866/api/oceanEngine/callback + appId: 1780961834344489 + appSecret: 155c1019be762c6be1c634439eab354370f2a097 + redirectUrl: http://39.100.77.21:8899/api-management/api/oceanEngine/callback