diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java index 62de0b1c..269e306a 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java @@ -7,6 +7,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** * 服务监控管理 */ @@ -23,7 +28,9 @@ public class ServerController { @GetMapping("/server") public Object info() { ServerResult server = new ServerResult(); - return AjaxResult.success(server.copyTo()); + List list = new LinkedList<>(); + list.add(server.copyTo()); + return AjaxResult.success(list); } } diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java index 4ce2a3fa..70db627f 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java @@ -3,10 +3,7 @@ package com.hxkj.admin.controller.setting; import com.hxkj.admin.config.aop.Log; import com.hxkj.admin.service.IBasicsService; import com.hxkj.common.core.AjaxResult; -import com.hxkj.common.utils.HttpUtil; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Map; @@ -22,19 +19,27 @@ public class BasicsController { IBasicsService iBasicsService; /** - * 网站信息 + * 获取网站信息 * * @author fzr * @return Object */ @Log(title = "网站信息") - @RequestMapping("/website") - public Object website(@RequestBody Map params) { - if (HttpUtil.isGet()) { - Map map = iBasicsService.getWebsite(); - return AjaxResult.success(map); - } + @GetMapping("/getWebsite") + public Object getWebsite() { + Map map = iBasicsService.getWebsite(); + return AjaxResult.success(map); + } + /** + * 修改网站信息 + * + * @author fzr + * @return Object + */ + @Log(title = "网站信息") + @PostMapping("/setWebsite") + public Object setWebsite(@RequestBody Map params) { try { iBasicsService.setWebsite(params); return AjaxResult.success(); @@ -44,19 +49,27 @@ public class BasicsController { } /** - * 备案信息 + * 获取备案信息 * * @author fzr * @return Object */ @Log(title = "备案信息") - @RequestMapping("/copyright") - public Object copyright(@RequestBody Map params) { - if (HttpUtil.isGet()) { - Map map = iBasicsService.getCopyright(); - return AjaxResult.success(map); - } + @GetMapping("/getCopyright") + public Object getCopyright() { + Map map = iBasicsService.getCopyright(); + return AjaxResult.success(map); + } + /** + * 修改备案信息 + * + * @author fzr + * @return Object + */ + @Log(title = "备案信息") + @PostMapping("/setCopyright") + public Object copyright(@RequestBody Map params) { try { iBasicsService.setCopyright(params); return AjaxResult.success(); diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java index 39608ff9..de201ba3 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java @@ -64,6 +64,8 @@ public class SystemLogServerImpl implements ISystemLogServer { "like:username:str", "=:type:int", "=:status:int", + "=:url:str", + "=:ip:str", "datetime:startTime-endTime@create_time:str" });