mirror of
https://gitee.com/likeadmin/likeadmin_java.git
synced 2026-09-11 00:57:54 +08:00
Merge branch 'feature/generate' into develop
This commit is contained in:
@@ -36,11 +36,11 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
|
||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
|
||||
// 404拦截
|
||||
response.setContentType("application/json;charset=utf-8");
|
||||
if (response.getStatus() == 404) {
|
||||
AjaxResult result = AjaxResult.failed(HttpEnum.REQUEST_404_ERROR.getCode(), HttpEnum.REQUEST_404_ERROR.getMsg());
|
||||
response.getWriter().print(JSON.toJSONString(result));
|
||||
return false;
|
||||
}
|
||||
// if (response.getStatus() == 404) {
|
||||
// AjaxResult result = AjaxResult.failed(HttpEnum.REQUEST_404_ERROR.getCode(), HttpEnum.REQUEST_404_ERROR.getMsg());
|
||||
// response.getWriter().print(JSON.toJSONString(result));
|
||||
// return false;
|
||||
// }
|
||||
|
||||
// 判断请求接口
|
||||
if (!(handler instanceof HandlerMethod)) {
|
||||
|
||||
@@ -17,7 +17,10 @@ public class AdminConfig {
|
||||
// 免登录验证
|
||||
public static String[] notLoginUri = new String[]{
|
||||
"system:login", // 登录接口
|
||||
"common:index:config" // 配置接口
|
||||
"common:index:config", // 配置接口
|
||||
"common:index:config", // 配置接口
|
||||
"gen:genCode", // 配置接口
|
||||
"gen:downloadCode" // 配置接口
|
||||
};
|
||||
|
||||
// 免权限验证
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
|
||||
import com.hxkj.admin.LikeAdminThreadLocal;
|
||||
import com.hxkj.common.entity.system.SystemLogOperate;
|
||||
import com.hxkj.common.mapper.system.SystemLogOperateMapper;
|
||||
import com.hxkj.common.utils.HttpUtil;
|
||||
import com.hxkj.common.utils.IpUtil;
|
||||
import com.hxkj.common.utils.RequestUtil;
|
||||
import org.aspectj.lang.JoinPoint;
|
||||
|
||||
@@ -7,11 +7,6 @@ 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;
|
||||
|
||||
/**
|
||||
* 服务监控管理
|
||||
*/
|
||||
|
||||
@@ -2,11 +2,8 @@ package com.hxkj.admin.service.system;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.hxkj.admin.validate.system.SystemMenuParam;
|
||||
import com.hxkj.admin.vo.system.SystemAuthVo;
|
||||
import com.hxkj.admin.vo.system.SystemMenuVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 系统菜单服务接口类
|
||||
*/
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.hxkj.common.entity.system.SystemPost;
|
||||
import com.hxkj.common.mapper.system.SystemAdminMapper;
|
||||
import com.hxkj.common.mapper.system.SystemPostMapper;
|
||||
import com.hxkj.common.utils.TimeUtil;
|
||||
import com.hxkj.common.utils.UrlUtil;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@ import lombok.experimental.Accessors;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import javax.validation.constraints.DecimalMin;
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user