From 5f1b4909541b2fbd9a5214d8b47ed2b2e645d763 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Fri, 21 Oct 2022 10:20:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E4=BB=A5=E5=8F=8A=E8=BE=93=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/login/rest/LoginRestController.java | 1 + .../src/main/java/com/adc/da/search/conf/SchedulerConf.java | 4 ++-- .../com/adc/da/slrs/tsTask/controller/TbTaskController.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index c5481e35..bb8e2292 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -176,6 +176,7 @@ public class LoginRestController { } String token = jwtUtils.generateToken(userEO.getUsid()); + log.info(token); // 加密重要信息 BASE64Encoder encoder = new BASE64Encoder(); userEO.setToken(token); diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java index f17c5c7b..648dc42d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/conf/SchedulerConf.java @@ -123,9 +123,9 @@ public class SchedulerConf { Runnable runnable = (Runnable) clazz.newInstance(); Thread runTaskThread = new Thread(runnable); runTaskThread.start(); - log.info("{}，任务开始启动执行！", task.getTaskName()); + log.info("{}，任务开始启动执行！", task.getTaskDesc()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { - log.error("{}，任务启动失败...", task.getTaskName()); + log.error("{}，任务启动失败...", task.getTaskDesc()); log.error(e.getMessage(),e); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java index af60d66c..62f7ce02 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsTask/controller/TbTaskController.java @@ -58,13 +58,13 @@ public class TbTaskController extends BaseController { return "操作成功"; } - + @ApiOperation(value = "手动启动定时任务") @GetMapping("/manualRunTask/{taskId}") public ResponseMessage manualRunTask(@PathVariable("taskId") String taskId) { TbTask tbTask = schedulerConf.manualRunTask(taskId); if(tbTask!=null){ - return Result.success("开始启动定时任务：《"+tbTask.getTaskName()+"》"); + return Result.success("开始启动定时任务：《"+tbTask.getTaskDesc()+"》"); }else{ return Result.error("定时任务未找到："+taskId); }