修改job里代码的顺序

notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/WorkController.java

@@ -104,8 +104,8 @@ public class WorkController {
                                               @RequestParam int workloadCount,
                                               @RequestParam String msg) {
 
-        businessTreeManagement.saveAction(userId,workId,Action.DELETE_WORK,new Date(),msg);
         workService.deleteWork(workId,personalWorkload,workloadCount);
+        businessTreeManagement.saveAction(userId,workId,Action.DELETE_WORK,new Date(),msg);
         return ok(new JobResponse(workId));
     }
 
@@ -113,8 +113,8 @@ public class WorkController {
     @ApiOperation(value = "修改任务的组员.", notes = "修改任务的组员.")
     public ResponseEntity<JobResponse> update(@RequestBody UpdateCrew updateCrew) {
 
-        businessTreeManagement.saveAction(updateCrew.getUserid(),updateCrew.getWorkId(),Action.UPDATE_WORK_CREW,new Date(),updateCrew.getMsg());
         workService.updateWorkCrew(updateCrew.getWorkId(),updateCrew.getUsers());
+        businessTreeManagement.saveAction(updateCrew.getUserid(),updateCrew.getWorkId(),Action.UPDATE_WORK_CREW,new Date(),updateCrew.getMsg());
         return ok(new JobResponse(updateCrew.getWorkId()));
     }
 
@@ -122,8 +122,9 @@ public class WorkController {
     @ApiOperation(value = "修改任务的工作量、考评系数.")
     public ResponseEntity<JobResponse> updateWorkload(@RequestBody UpdateWorkload updateWorkload) {
 
-        businessTreeManagement.saveAction(updateWorkload.getUserId(),updateWorkload.getWorkId(),Action.UPDATE_WORKLOAD,new Date(),updateWorkload.getMsg());
         workService.updateWorkload(updateWorkload.getWorkId(),updateWorkload.getWorkload(),updateWorkload.getWorkCoefficient());
+        businessTreeManagement.saveAction(updateWorkload.getUserId(),updateWorkload.getWorkId(),Action.UPDATE_WORKLOAD,new Date(),updateWorkload.getMsg());
+
         return ok(new JobResponse(updateWorkload.getWorkId()));
     }
 
@@ -149,8 +150,8 @@ public class WorkController {
 
                 if ("1".equals(re)){
                     //撤回
-                    businessTreeManagement.saveAction(userId,workId,Action.COMMIT_BACK_WORK,new Date(),msg);
                     workService.alterTaskStatus1(workId,status,userId);
+                    businessTreeManagement.saveAction(userId,workId,Action.COMMIT_BACK_WORK,new Date(),msg);
                 }else{
                     workService.alterTaskStatus(workId,status,userId);
                     businessTreeManagement.saveAction(userId,workId,Action.BACK_WORK,new Date(),msg);

notes-misc/src/main/java/com/zjty/tynotes/misc/config/Swagger2Config.java

@@ -29,7 +29,7 @@ public class Swagger2Config {
         return new Docket(DocumentationType.SWAGGER_2)
                 .produces(Sets.newHashSet("application/json"))
                 .consumes(Sets.newHashSet("application/json"))
-                .protocols(Sets.newHashSet("https"))
+                .protocols(Sets.newHashSet("https","http"))
                 .apiInfo(apiInfo())
                 .forCodeGeneration(true)
                 .useDefaultResponseMessages(true)