From 81acb15c3787bd52d57163a896dc4efd55a57032 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 8 Dec 2021 10:16:22 +0800 Subject: [PATCH] 20211208 --- .../java/com/ccsens/defaultwbs/api/ProjectController.java | 4 ++-- .../java/com/ccsens/defaultwbs/service/ClockingInService.java | 1 + src/main/resources/application.yml | 4 ++-- src/main/resources/druid-dev.yml | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ccsens/defaultwbs/api/ProjectController.java b/src/main/java/com/ccsens/defaultwbs/api/ProjectController.java index 725784d..8d6d4c5 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/ProjectController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/ProjectController.java @@ -51,7 +51,7 @@ public class ProjectController { @ApiOperation(value = "删除项目", notes = "删除项目") @RequestMapping(value = "/deleteProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse deleteProject(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ - log.info("删除项目开始"); + log.info("删除项目开始:{}" ,params); projectService.deleteProjectById(params.getParam(), params.getUserId()); log.info("删除项目结束"); return JsonResponse.newInstance().ok(); @@ -59,7 +59,7 @@ public class ProjectController { @RequestMapping(value = "/tallDelProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse deleteProject(@ApiParam @Validated @RequestBody CProjectDto.ProjectById params) throws Exception{ - log.info("删除项目开始"); + log.info("删除项目开始:{}" ,params); projectService.deleteProjectById(params,null); log.info("删除项目结束"); return JsonResponse.newInstance().ok(); diff --git a/src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java b/src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java index db71f77..29e2fd5 100644 --- a/src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java +++ b/src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java @@ -534,6 +534,7 @@ public class ClockingInService implements IClockingInService { } } + a++; } return list; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5abf242..2fb38e5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev diff --git a/src/main/resources/druid-dev.yml b/src/main/resources/druid-dev.yml index 0e658fd..c823ae7 100644 --- a/src/main/resources/druid-dev.yml +++ b/src/main/resources/druid-dev.yml @@ -28,8 +28,8 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://49.233.89.188:3306/defaultwbs?useUnicode=true&characterEncoding=UTF-8 -# url: jdbc:mysql://www.tall.wiki/defaultwbs?useUnicode=true&characterEncoding=UTF-8 +# url: jdbc:mysql://49.233.89.188:3306/defaultwbs?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://www.tall.wiki/defaultwbs?useUnicode=true&characterEncoding=UTF-8 # url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL