diff --git a/docker/zayac-admin/Dockerfile b/docker/zayac-admin/Dockerfile index 7a147155..b8158dab 100644 --- a/docker/zayac-admin/Dockerfile +++ b/docker/zayac-admin/Dockerfile @@ -6,8 +6,6 @@ MAINTAINER zayac stupidzayac@gmail.com # 复制 JAR 文件和配置文件到容器中 COPY ./bin/zayac-admin.jar /app/bin/app.jar -COPY ./config /app/config/ -COPY ./lib /app/lib/ # 设置工作目录 WORKDIR /app/bin diff --git a/docker/zayac-admin/config/application-prod.yml b/docker/zayac-admin/config/application-prod.yml index ab4b109e..e2e24b45 100644 --- a/docker/zayac-admin/config/application-prod.yml +++ b/docker/zayac-admin/config/application-prod.yml @@ -1,6 +1,6 @@ --- ### 项目配置 project: - # URL(跨域配置默认放行此 URL,请注意更改为你实际的前端 URL) + # URL(跨域配置默认放行此 URL,第三方登录回调默认使用此 URL 为前缀,请注意更改为你实际的前端 URL) url: http://localhost:5173 # 是否为生产环境 production: true @@ -8,7 +8,7 @@ project: --- ### 服务器配置 server: # HTTP 端口(默认 8080) - port: 18000 + port: 8000 --- ### 数据源配置 spring.datasource: @@ -60,7 +60,7 @@ spring.datasource: ## Liquibase 配置 spring.liquibase: # 是否启用 - enabled: true + enabled: false # 配置文件路径 change-log: classpath:/db/changelog/db.changelog-master.yaml diff --git a/zayac-admin-agent/src/main/java/com/zayac/admin/schedule/DailyReport.java b/zayac-admin-agent/src/main/java/com/zayac/admin/schedule/DailyReport.java index 8209e388..7556ec80 100644 --- a/zayac-admin-agent/src/main/java/com/zayac/admin/schedule/DailyReport.java +++ b/zayac-admin-agent/src/main/java/com/zayac/admin/schedule/DailyReport.java @@ -62,7 +62,7 @@ import java.util.stream.Collectors; @Component @RequiredArgsConstructor @Slf4j -@Profile("dev") +//@Profile("prod") public class DailyReport { private final TeamService teamService; private final DeptService deptService; @@ -80,7 +80,7 @@ public class DailyReport { private static final String ASSISTANT_ROLE_CODE = "assistant"; private static final String SEO_ROLE_CODE = "seo"; - @Scheduled(cron = "0 40 11,14,17,21 * * ?") + @Scheduled(cron = "0 51 11,14,17,21 * * ?") public void teamAccountDailyReport() { LocalDateTime nowDateTime = LocalDateTime.now(); LocalDate nowDate = LocalDate.now(); @@ -98,7 +98,7 @@ public class DailyReport { var ministerUser = usersByRole.get(MINISTER_ROLE_CODE).get(0); //获取账号不为空的用户 - var deptUsers = dept.getUsers().stream().filter(user -> CollUtil.isEmpty(user.getAccounts())).toList(); + var deptUsers = dept.getUsers().stream().filter(user -> CollUtil.isNotEmpty(user.getAccounts())).toList(); var assistants = usersByRole.get(ASSISTANT_ROLE_CODE); sendDailyReport(nowDate, nowDate.atStartOfDay(), nowDateTime, ministerUser, assistants, deptUsers); }); @@ -130,7 +130,7 @@ public class DailyReport { var ministerUser = usersByRole.get(MINISTER_ROLE_CODE).get(0); //获取账号不为空的用户 - var deptUsers = dept.getUsers().stream().filter(user -> CollUtil.isEmpty(user.getAccounts())).toList(); + var deptUsers = dept.getUsers().stream().filter(user -> CollUtil.isNotEmpty(user.getAccounts())).toList(); var assistants = usersByRole.get(ASSISTANT_ROLE_CODE); sendDailyReport(yesterday, yesterday.atStartOfDay(), LocalDateTime @@ -160,12 +160,8 @@ public class DailyReport { .mapping(Map.Entry::getValue, Collectors.toList()))); var userWithRolesAndAccountsResps = usersByRole.get(MINISTER_ROLE_CODE); - var assistants = usersByRole.get(ASSISTANT_ROLE_CODE); - userWithRolesAndAccountsResps.forEach(ministerUser -> { - if (ministerUser.getNeedNotify() == DisEnableStatusEnum.ENABLE) { - generateAndSendTeamReport(ministerUser, nowDate.atStartOfDay(), nowDateTime, assistants); - } - }); + userWithRolesAndAccountsResps.forEach(ministerUser -> + generateAndSendTeamReport(ministerUser, nowDate.atStartOfDay(), nowDateTime, null)); }); } @@ -290,7 +286,7 @@ public class DailyReport { List deptUsers) { List> tasks = new ArrayList<>(); - tasks.add(generateAndSendTeamReport(ministerUser, startDateTime, endDateTime, assistants)); + //tasks.add(generateAndSendTeamReport(ministerUser, startDateTime, endDateTime, assistants)); AgentDataVisualListReq agentDataVisualListReq = AgentDataVisualListReq.builder().monthDate(reportDate).build(); diff --git a/zayac-admin-agent/src/main/java/com/zayac/admin/service/CompletableFutureWebClientService.java b/zayac-admin-agent/src/main/java/com/zayac/admin/service/CompletableFutureWebClientService.java index 1c9e08b5..a33f4f24 100644 --- a/zayac-admin-agent/src/main/java/com/zayac/admin/service/CompletableFutureWebClientService.java +++ b/zayac-admin-agent/src/main/java/com/zayac/admin/service/CompletableFutureWebClientService.java @@ -88,10 +88,10 @@ public class CompletableFutureWebClientService { .onStatus(HttpStatusCode::isError, response -> Mono.error(new BusinessException("API call failed"))) .bodyToMono(String.class) .doOnNext(resStr -> { - log.info("request url:{}", url); - log.info("request headers :{}", headers); - log.info("request params:{}", params); - log.info("response {}", resStr); + log.debug("request url:{}", url); + log.debug("request headers :{}", headers); + log.debug("request params:{}", params); + log.debug("response {}", resStr); }) .flatMap(body -> { try {