diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java index 77e85e83..3d32e3ae 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java @@ -29,7 +29,7 @@ public class Result implements Serializable { * 返回处理消息 */ @ApiModelProperty(value = "返回处理消息") - private String message = "操作成功!"; + private String message = "操作成功!"; /** * 返回代码 diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java index 8f52e432..e233bf2d 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java @@ -79,7 +79,7 @@ public class OnlCgformAuthController { public Result addAuthData(@RequestBody OnlAuthData paramOnlAuthData) { try { this.onlAuthDataService.save(paramOnlAuthData); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception exception) { log.error(exception.getMessage(), exception); return Result.error("操作失败"); @@ -143,7 +143,7 @@ public class OnlCgformAuthController { paramOnlAuthPage.setStatus(Integer.valueOf(1)); this.onlAuthPageService.save(paramOnlAuthPage); } - return Result.OK("操作成功!", paramOnlAuthPage); + return Result.OK("操作成功!", paramOnlAuthPage); } catch (Exception exception) { log.error(exception.getMessage(), exception); return Result.error("操作失败"); @@ -221,7 +221,7 @@ public class OnlCgformAuthController { } else { this.onlAuthPageService.disableAuthColumn(paramAuthColumnVO); } - return Result.OK("操作成功!"); + return Result.OK("操作成功!"); } catch (Exception exception) { log.error(exception.getMessage(), exception); return Result.error("操作失败"); @@ -233,7 +233,7 @@ public class OnlCgformAuthController { public Result addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { try { this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO); - return Result.OK("操作成功!"); + return Result.OK("操作成功!"); } catch (Exception exception) { log.error(exception.getMessage(), exception); return Result.error("操作失败"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java index 85ccffbd..18f8285b 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java @@ -404,7 +404,7 @@ public class OnlCgformApiController { public Result a(@PathVariable("code") String var1, @RequestBody JSONObject var2) { try { String var3 = this.onlCgformHeadService.editManyFormData(var1, var2); - Result var4 = Result.OK("修改成功!"); + Result var4 = Result.OK("操作成功!"); var4.setOnlTable(var3); return var4; } catch (Exception var5) { @@ -1168,7 +1168,7 @@ public class OnlCgformApiController { return Result.error("保存失败"); } - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } @AutoLog( diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java index 62861c1d..f77c47bb 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java @@ -51,7 +51,7 @@ public class OnlCgformButtonController { public Result add(@RequestBody OnlCgformButton cgformButton) { try { this.onlCgformButtonService.save(cgformButton); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -66,7 +66,7 @@ public class OnlCgformButtonController { OnlCgformButton cgformButton = (OnlCgformButton)JSONObject.parseObject(jsonObject.toJSONString(), OnlCgformButton.class); this.onlCgformButtonService.saveButton(cgformButton); } - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -81,7 +81,7 @@ public class OnlCgformButtonController { } else { boolean flag = this.onlCgformButtonService.updateById(cgformButton); if (flag) { - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java index 7de989fd..84c1208d 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java @@ -69,7 +69,7 @@ public class OnlCgformFieldController { public Result add(@RequestBody OnlCgformField var1) { try { this.onlCgformFieldService.save(var1); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception var4) { log.error(var4.getMessage(), var4); return Result.error("操作失败"); @@ -84,7 +84,7 @@ public class OnlCgformFieldController { } else { boolean var4 = this.onlCgformFieldService.updateById(var1); if (var4) { - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } return Result.OK(); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java index 92f299d7..b3796d1e 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java @@ -89,7 +89,7 @@ public class OnlCgformHeadController { public Result add(@RequestBody OnlCgformHead var1) { try { this.onlCgformHeadService.save(var1); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception var4) { log.error(var4.getMessage(), var4); return Result.error("操作失败"); @@ -104,7 +104,7 @@ public class OnlCgformHeadController { } else { boolean var4 = this.onlCgformHeadService.updateById(var1); if (var4) { - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } return Result.OK(); @@ -171,7 +171,7 @@ public class OnlCgformHeadController { try { var2.setCgformHeadId(var1); this.onlCgformHeadService.saveEnhance(var2); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } catch (Exception var4) { log.error(var4.getMessage(), var4); return Result.error("保存失败!"); @@ -195,7 +195,7 @@ public class OnlCgformHeadController { try { var2.setCgformHeadId(var1); this.onlCgformHeadService.editEnhance(var2); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } catch (Exception var4) { log.error(var4.getMessage(), var4); return Result.error("保存失败!"); @@ -226,7 +226,7 @@ public class OnlCgformHeadController { var2.setCgformHeadId(var1); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { this.onlCgformEnhanceService.saveEnhanceSql(var2); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } else { return Result.error("保存失败,该按钮已存在增强配置!"); } @@ -243,7 +243,7 @@ public class OnlCgformHeadController { var2.setCgformHeadId(var1); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { this.onlCgformEnhanceService.updateEnhanceSql(var2); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } else { return Result.error("保存失败,该按钮已存在增强配置!"); } @@ -291,7 +291,7 @@ public class OnlCgformHeadController { var2.setCgformHeadId(formId); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { this.onlCgformEnhanceService.saveEnhanceJava(var2); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } else { return Result.error("保存失败,配置重复了!"); } @@ -311,7 +311,7 @@ public class OnlCgformHeadController { var2.setCgformHeadId(var1); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { this.onlCgformEnhanceService.updateEnhanceJava(var2); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } else { return Result.error("保存失败,配置重复了!"); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java index 826f4590..de4f4c69 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java @@ -58,7 +58,7 @@ public class OnlCgformIndexController { public Result add(@RequestBody OnlCgformIndex cgformIndex) { try { this.onlCgformIndexService.save(cgformIndex); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -73,7 +73,7 @@ public class OnlCgformIndexController { } else { boolean flag = this.onlCgformIndexService.updateById(cgformIndex); if (flag) { - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java index 92a42840..84103dd5 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java @@ -164,7 +164,7 @@ public class OnlCgreportHeadController { this.onlCgreportHeadService.save(var4); this.onlCgreportParamService.saveBatch(var5); this.onlCgreportItemService.saveBatch(var6); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception var9) { log.error(var9.getMessage(), var9); return Result.error("操作失败"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java index 4f0e1042..4ebc6bbe 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java @@ -59,13 +59,13 @@ public class OnlCgreportItemController { @PostMapping({"/add"}) public Result a(@RequestBody OnlCgreportItem var1) { this.onlCgreportItemService.save(var1); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } @PutMapping({"/edit"}) public Result b(@RequestBody OnlCgreportItem var1) { this.onlCgreportItemService.updateById(var1); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } @DeleteMapping({"/delete"}) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java index 6247d59b..76aa6b04 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java @@ -59,13 +59,13 @@ public class OnlCgreportParamController { @PostMapping({"/add"}) public Result a(@RequestBody OnlCgreportParam var1) { this.onlCgreportParamService.save(var1); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } @PutMapping({"/edit"}) public Result b(@RequestBody OnlCgreportParam var1) { this.onlCgreportParamService.updateById(var1); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } @DeleteMapping({"/delete"}) diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/json/task_process.json b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/json/task_process.json index b986c8c7..4fc92fee 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/json/task_process.json +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/json/task_process.json @@ -1,6 +1,6 @@ { "success": true, - "message": "操作成功!", + "message": "操作成功!", "code": 0, "result": { "records": [ diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java index 18bfe4de..8b096027 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java @@ -82,7 +82,7 @@ public class JeroDemoController extends JeroController add(@RequestBody JeroDemo jeroDemo) { JeroDemoService.save(jeroDemo); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -240,7 +240,7 @@ public class JeroDemoController extends JeroController testOnlineAdd(@RequestBody JSONObject json) { log.info(json.toJSONString()); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /*----------------------------------------外部获取权限示例------------------------------------*/ diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java index ef16040f..0feb4503 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java @@ -92,7 +92,7 @@ public class JeroOrderMainController extends JeroController addCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { jeroOrderCustomerService.save(jeroOrderCustomer); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -188,7 +188,7 @@ public class JeroOrderTabMainController { @PutMapping("/editCustomer") public Result editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { jeroOrderCustomerService.updateById(jeroOrderCustomer); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -224,7 +224,7 @@ public class JeroOrderTabMainController { @PostMapping(value = "/addTicket") public Result addTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { jeroOrderTicketService.save(jeroOrderTicket); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -236,7 +236,7 @@ public class JeroOrderTabMainController { @PutMapping("/editTicket") public Result editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { jeroOrderTicketService.updateById(jeroOrderTicket); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java index 78a123b6..8de5e2ff 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java @@ -85,7 +85,7 @@ public class JoaDemoController { public Result add(@RequestBody JoaDemo joaDemo) { try { joaDemoService.save(joaDemo); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("操作失败"); @@ -105,7 +105,7 @@ public class JoaDemoController { }else { boolean ok = joaDemoService.updateById(joaDemo); if(ok) { - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java index 8f8474ef..4953fa10 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java @@ -67,7 +67,7 @@ public class SysMessageController extends JeroController add(@RequestBody SysMessage sysMessage) { sysMessageService.save(sysMessage); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -79,7 +79,7 @@ public class SysMessageController extends JeroController edit(@RequestBody SysMessage sysMessage) { sysMessageService.updateById(sysMessage); - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java index d9b8a26f..944691b4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java @@ -73,7 +73,7 @@ public class SysMessageTemplateController extends JeroController add(@RequestBody SysMessageTemplate sysMessageTemplate) { sysMessageTemplateService.save(sysMessageTemplate); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -159,7 +159,7 @@ public class SysMessageTemplateController extends JeroController add(@RequestBody SysAnnouncementSend sysAnnouncementSend) { try { sysAnnouncementSendService.save(sysAnnouncementSend); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("操作失败"); @@ -111,7 +111,7 @@ public class SysAnnouncementSendController { }else { boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend); if(ok) { - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 766a40a7..e56a469f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -99,7 +99,7 @@ public class SysCategoryController { public Result add(@RequestBody SysCategory sysCategory) { try { sysCategoryService.addSysCategory(sysCategory); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("操作失败"); @@ -119,7 +119,7 @@ public class SysCategoryController { return Result.error("未找到对应实体"); }else { sysCategoryService.updateSysCategory(sysCategory); - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java index 5466d242..5bba80d9 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java @@ -101,7 +101,7 @@ public class SysCheckRuleController extends JeroController add(@RequestBody SysDepartPermission sysDepartPermission) { sysDepartPermissionService.save(sysDepartPermission); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -94,7 +94,7 @@ public class SysDepartPermissionController extends JeroController edit(@RequestBody SysDepartPermission sysDepartPermission) { sysDepartPermissionService.updateById(sysDepartPermission); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 91f1abad..b511f794 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -338,7 +338,7 @@ public class SysDictController { sysDictService.save(sysDict); //添加成功后需要刷新缓存 sysDictService.refreshCache(); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("操作失败"); @@ -362,7 +362,7 @@ public class SysDictController { if(ok) { //编辑成功后需要刷新缓存 sysDictService.refreshCache(); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } } return Result.OK(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 2241ab9b..50dbecc8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -81,7 +81,7 @@ public class SysDictItemController { try { sysDictItem.setCreateTime(new Date()); sysDictItemService.save(sysDictItem); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("操作失败"); @@ -105,7 +105,7 @@ public class SysDictItemController { sysDictItem.setUpdateTime(new Date()); boolean ok = sysDictItemService.updateById(sysDictItem); if(ok) { - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } } return Result.OK(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java index 4b40acc5..3b0a9d1a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java @@ -82,7 +82,7 @@ public class SysFillRuleController extends JeroController add(@RequestBody SysFillRule sysFillRule) { sysFillRuleService.save(sysFillRule); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -96,7 +96,7 @@ public class SysFillRuleController extends JeroController edit(@RequestBody SysFillRule sysFillRule) { sysFillRuleService.updateById(sysFillRule); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java index b5c77c00..7561775a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java @@ -33,7 +33,7 @@ public class SysGatewayRouteController extends JeroController updateAll(@RequestBody JSONObject json) { sysGatewayRouteService.updateAll(json); - return Result.OK("操作成功!"); + return Result.OK("操作成功!"); } @GetMapping(value = "/page") diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index 1d11e42f..d6f57fab 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -248,7 +248,7 @@ public class SysPermissionController { try { permission = PermissionDataUtil.intelligentProcessData(permission); sysPermissionService.addPermission(permission); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -266,7 +266,7 @@ public class SysPermissionController { try { permission = PermissionDataUtil.intelligentProcessData(permission); sysPermissionService.editPermission(permission); - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -400,7 +400,7 @@ public class SysPermissionController { String lastPermissionIds = json.getString("lastpermissionIds"); this.sysRolePermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds); log.info("======角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("授权失败!"); @@ -684,7 +684,7 @@ public class SysPermissionController { try { sysPermissionDataRule.setCreateTime(new Date()); sysPermissionDataRuleService.savePermissionDataRule(sysPermissionDataRule); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -771,7 +771,7 @@ public class SysPermissionController { String lastPermissionIds = json.getString("lastpermissionIds"); this.sysDepartPermissionService.saveDepartPermission(departId, permissionIds, lastPermissionIds); log.info("======部门授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("授权失败!"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index ed91abaa..dd010afa 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -117,7 +117,7 @@ public class SysRoleController { try { role.setCreateTime(new Date()); sysRoleService.save(role); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -140,7 +140,7 @@ public class SysRoleController { role.setUpdateTime(new Date()); boolean ok = sysRoleService.updateById(role); if(ok) { - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } @@ -351,7 +351,7 @@ public class SysRoleController { log.error("SysRoleController.saveDatarule()发生异常:" + e.getMessage(),e); return Result.error("保存失败"); } - return Result.OK("保存成功!"); + return Result.OK("操作成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java index d051ebf6..a951e974 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java @@ -65,7 +65,7 @@ public class SysTenantController { try { sysTenantService.save(sysTenant); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -85,7 +85,7 @@ public class SysTenantController { }else { boolean ok = sysTenantService.updateById(tenant); if(ok) { - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } return Result.OK(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 504dbe92..12d8026a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -156,7 +156,7 @@ public class SysUserController { // 保存用户走一个service 保证事务 sysUserService.saveUser(user, selectedRoles, selectedDeparts); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); @@ -198,7 +198,7 @@ public class SysUserController { user.setPassword(sysUser.getPassword()); // 修改用户走一个service 保证事务 sysUserService.editUser(user, roles, departs); - return Result.OK("修改成功!"); + return Result.OK("操作成功!"); } } catch (Exception e) { log.error(e.getMessage(), e); @@ -611,7 +611,7 @@ public class SysUserController { } } - result.setMessage("添加成功!"); + result.setMessage("操作成功!"); result.setSuccess(true); return result; }catch(Exception e) { @@ -741,7 +741,7 @@ public class SysUserController { sysUserDepartService.save(sysUserDepart); } } - result.setMessage("添加成功!"); + result.setMessage("操作成功!"); result.setSuccess(true); return result; }catch(Exception e) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index edeccd1f..7d0265fd 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -87,7 +87,7 @@ public class SysUserServiceImpl extends ServiceImpl impl String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt); sysUser.setPassword(passwordEncode); this.userMapper.updateById(sysUser); - return Result.OK("密码修改成功!"); + return Result.OK("密码操作成功!"); } @Override diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index d9f14f4d..24de95d4 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -91,7 +91,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en ${entityName?uncap_first}.setBpmStatus("1"); ${entityName?uncap_first}Service.add(${entityName?uncap_first}); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -105,7 +105,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @PutMapping(value = "/edit") public Result edit(@Validated @RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.editById(${entityName?uncap_first}); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index d8886b6c..df8ba447 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -108,7 +108,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}.setBpmStatus("1"); ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -128,7 +128,7 @@ public class ${entityName}Controller { return Result.error("未找到对应数据"); } ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index b2dc7bc2..4f45e72d 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -147,7 +147,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.add${entityName}(${entityName?uncap_first}); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -161,7 +161,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @PutMapping(value = "/edit") public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.update${entityName}(${entityName?uncap_first}); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index afb29331..09ad7576 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -93,7 +93,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.save(${entityName?uncap_first}); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -106,7 +106,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @PutMapping(value = "/edit") public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** @@ -184,7 +184,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @PostMapping(value = "/add${sub.entityName}") public Result add${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { ${sub.entityName?uncap_first}Service.save(${sub.entityName?uncap_first}); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -197,7 +197,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e @PutMapping(value = "/edit${sub.entityName}") public Result edit${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) { ${sub.entityName?uncap_first}Service.updateById(${sub.entityName?uncap_first}); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 782e23f7..cefe555e 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -99,7 +99,7 @@ public class ${entityName}Controller { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -119,7 +119,7 @@ public class ${entityName}Controller { return Result.error("未找到对应数据"); } ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 68e11174..c5d7302a 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -108,7 +108,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}.setBpmStatus("1"); ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -128,7 +128,7 @@ public class ${entityName}Controller { return Result.error("未找到对应数据"); } ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index b97336a7..e3926a86 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -99,7 +99,7 @@ public class ${entityName}Controller { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -119,7 +119,7 @@ public class ${entityName}Controller { return Result.error("未找到对应数据"); } ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 75189cbf..3f4c10b6 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -95,7 +95,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.add(${entityName?uncap_first}); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -109,7 +109,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @PutMapping(value = "/edit") public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.editById(${entityName?uncap_first}); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai index b62a720a..ab1f586c 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai @@ -86,7 +86,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @PostMapping(value = "/add") public Result add(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.save(${entityName?uncap_first}); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -100,7 +100,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en @PutMapping(value = "/edit") public Result edit(@RequestBody ${entityName} ${entityName?uncap_first}) { ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index a8c4f38d..75a35bdd 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -98,7 +98,7 @@ public class ${entityName}Controller { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -114,7 +114,7 @@ public class ${entityName}Controller { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 5b203d44..d9c9f02f 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -97,7 +97,7 @@ public class ${entityName}Controller { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName?uncap_first}Service.save(${entityName?uncap_first}); - return Result.OK("添加成功!"); + return Result.OK("操作成功!"); } /** @@ -113,7 +113,7 @@ public class ${entityName}Controller { ${entityName} ${entityName?uncap_first} = new ${entityName}(); BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first}); ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application.yml index 2779e168..c66bdb8e 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application.yml @@ -2,4 +2,4 @@ spring: application: name: jero-system profiles: - active: @profile.name@ \ No newline at end of file + active: dev \ No newline at end of file