diff --git a/src/main/java/com/gxwebsoft/common/system/controller/ChatConversationController.java b/src/main/java/com/gxwebsoft/common/system/controller/ChatConversationController.java index 21d154e..88f6fd8 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/ChatConversationController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/ChatConversationController.java @@ -30,7 +30,6 @@ public class ChatConversationController extends BaseController { private ChatConversationService chatConversationService; @PreAuthorize("hasAuthority('sys:notice:list')") - @OperationLog @ApiOperation("查询全部聊天消息表") @GetMapping("/app") public ApiResult> appList() { @@ -39,7 +38,6 @@ public class ChatConversationController extends BaseController { return success(chatConversationService.getFriendList(param)); } - @OperationLog @ApiOperation("标记已读") @PostMapping("/app/read") public ApiResult read(@RequestBody ChatConversationParam param) { @@ -52,7 +50,6 @@ public class ChatConversationController extends BaseController { @PreAuthorize("hasAuthority('sys:notice:list')") - @OperationLog @ApiOperation("分页查询聊天消息表") @GetMapping("/page") public ApiResult> page(ChatConversationParam param) { @@ -64,7 +61,6 @@ public class ChatConversationController extends BaseController { } @PreAuthorize("hasAuthority('sys:notice:list')") - @OperationLog @ApiOperation("查询全部聊天消息表") @GetMapping() public ApiResult> list(ChatConversationParam param) { @@ -76,7 +72,6 @@ public class ChatConversationController extends BaseController { } @PreAuthorize("hasAuthority('sys:notice:list')") - @OperationLog @ApiOperation("根据id查询聊天消息表") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { @@ -102,7 +97,6 @@ public class ChatConversationController extends BaseController { } @PreAuthorize("hasAuthority('sys:notice:update')") - @OperationLog @ApiOperation("修改聊天消息表") @PutMapping() public ApiResult update(@RequestBody ChatConversation chatConversation) { @@ -112,7 +106,6 @@ public class ChatConversationController extends BaseController { return fail("修改失败"); } - @OperationLog @ApiOperation("删除聊天消息表") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { @@ -123,7 +116,6 @@ public class ChatConversationController extends BaseController { } @PreAuthorize("hasAuthority('sys:notice:save')") - @OperationLog @ApiOperation("批量添加聊天消息表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { @@ -134,7 +126,6 @@ public class ChatConversationController extends BaseController { } @PreAuthorize("hasAuthority('sys:notice:update')") - @OperationLog @ApiOperation("批量修改聊天消息表") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { @@ -145,7 +136,6 @@ public class ChatConversationController extends BaseController { } @PreAuthorize("hasAuthority('sys:notice:remove')") - @OperationLog @ApiOperation("批量删除聊天消息表") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index 9bc5040..a0dce2d 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -172,29 +172,12 @@ public class MainController extends BaseController { company.setBusinessEntity(null); company.setPhone(null); company.setCompanyCode(null); - tenant.setCompany(company); - // 网站菜单 - ArrayList list = new ArrayList<>(); - final Menu menu = new Menu(); - menu.setTitle("首页"); - menu.setPath("/"); - menu.setComponent("/index"); - menu.setParentId(0); - menu.setMenuType(0); - list.add(menu); - menu.setTitle("文档"); - menu.setPath("/docs?id=143"); - menu.setComponent("/content/docs/index"); - menu.setParentId(0); - menu.setMenuType(0); - list.add(menu); - tenant.setMenu(list); - // 授权信息 + // 配置信息 HashMap config = new HashMap<>(); config.put("LICENSE_CODE", "dk9mcwJyetRWQlxWRiojIzJCLi8mcQ5Wa4ojI0NWZqJWd6ICZpJCL0kjNwl1NnhENahnIvl2cyVmdiwiIiATMuEjI6IibQf0NW=="); config.put("MAP_KEY", "8191620da39a742c6f18f010c084c772"); - tenant.setConfig(config); - return success(tenant); + company.setConfig(config); + return success(company); } @ApiOperation("获取登录用户信息") diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java index 9403b7d..70f83a1 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java @@ -38,7 +38,6 @@ public class MenuController extends BaseController { private VersionService versionService; @PreAuthorize("hasAuthority('sys:menu:list')") - @OperationLog @ApiOperation("分页查询菜单") @GetMapping("/page") public ApiResult> page(MenuParam param) { @@ -48,7 +47,6 @@ public class MenuController extends BaseController { } @PreAuthorize("hasAuthority('sys:menu:list')") - @OperationLog @ApiOperation("查询全部菜单") @GetMapping() public ApiResult> list(MenuParam param) { @@ -58,7 +56,6 @@ public class MenuController extends BaseController { } @PreAuthorize("hasAuthority('sys:menu:list')") - @OperationLog @ApiOperation("根据id查询菜单") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { @@ -135,6 +132,7 @@ public class MenuController extends BaseController { } @PreAuthorize("hasAuthority('sys:menu:update')") + @OperationLog @ApiOperation("菜单克隆") @PostMapping("/clone") public ApiResult onClone(@RequestBody MenuParam param){ @@ -159,6 +157,7 @@ public class MenuController extends BaseController { } @PreAuthorize("hasAuthority('sys:menu:update')") + @OperationLog @ApiOperation("安装插件") @GetMapping("/install/{id}") public ApiResult install(@PathVariable("id") Integer id){ diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java index 5120d2e..c679f37 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java @@ -56,7 +56,6 @@ public class UserController extends BaseController { private DictionaryDataService dictionaryDataService; @PreAuthorize("hasAuthority('sys:auth:user')") - @OperationLog @ApiOperation("分页查询用户") @GetMapping("/page") public ApiResult> page(UserParam param) { diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Company.java b/src/main/java/com/gxwebsoft/common/system/entity/Company.java index 366a86a..32ae271 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Company.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Company.java @@ -201,4 +201,8 @@ public class Company implements Serializable { @TableField(exist = false) private Boolean installed; + @ApiModelProperty(value = "配置信息") + @TableField(exist = false) + private Object config; + }