Browse Source

20211208

master
zy_Java 4 years ago
parent
commit
81acb15c37
  1. 4
      src/main/java/com/ccsens/defaultwbs/api/ProjectController.java
  2. 1
      src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java
  3. 4
      src/main/resources/application.yml
  4. 4
      src/main/resources/druid-dev.yml

4
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<CProjectDto.ProjectById> 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();

1
src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java

@ -534,6 +534,7 @@ public class ClockingInService implements IClockingInService {
}
}
a++;
}
return list;

4
src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: prod
include: common, util-prod
active: dev
include: common, util-dev

4
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

Loading…
Cancel
Save