=St&&(Ot+=B.slice(St,Lt)+It,St=Lt+ft.length)}return Ot+B.slice(St)}];function H(P,w,z,M,B,nt){var it=z+P.length,Ct=M.length,vt=O;return B!==void 0&&(B=s(B),vt=y),I.call(nt,vt,function(pt,Et){var Ot;switch(Et.charAt(0)){case"$":return"$";case"&":return P;case"`":return w.slice(0,z);case"'":return w.slice(it);case"<":Ot=B[Et.slice(1,-1)];break;default:var St=+Et;if(St===0)return pt;if(St>Ct){var lt=m(St/10);return lt===0?pt:lt<=Ct?M[lt-1]===void 0?Et.charAt(1):M[lt-1]+Et.charAt(1):pt}Ot=M[St-1]}return Ot===void 0?"":Ot})}})},"5692":function(n,u,t){var a=t("c430"),i=t("c6cd");(n.exports=function(s,f){return i[s]||(i[s]=f!==void 0?f:{})})("versions",[]).push({version:"3.6.5",mode:a?"pure":"global",copyright:"\xA9 2020 Denis Pushkarev (zloirock.ru)"})},"56ef":function(n,u,t){var a=t("d066"),i=t("241c"),s=t("7418"),f=t("825a");n.exports=a("Reflect","ownKeys")||function(d){var v=i.f(f(d)),p=s.f;return p?v.concat(p(d)):v}},"5a34":function(n,u,t){var a=t("44e7");n.exports=function(i){if(a(i))throw TypeError("The method doesn't accept regular expressions");return i}},"5c6c":function(n,u){n.exports=function(t,a){return{enumerable:!(t&1),configurable:!(t&2),writable:!(t&4),value:a}}},"5db7":function(n,u,t){var a=t("23e7"),i=t("a2bf"),s=t("7b0b"),f=t("50c4"),c=t("1c0b"),d=t("65f0");a({target:"Array",proto:!0},{flatMap:function(p){var h=s(this),g=f(h.length),m;return c(p),m=d(h,0),m.length=i(m,h,h,g,0,1,p,arguments.length>1?arguments[1]:void 0),m}})},"6547":function(n,u,t){var a=t("a691"),i=t("1d80"),s=function(f){return function(c,d){var v=String(i(c)),p=a(d),h=v.length,g,m;return p<0||p>=h?f?"":void 0:(g=v.charCodeAt(p),g<55296||g>56319||p+1===h||(m=v.charCodeAt(p+1))<56320||m>57343?f?v.charAt(p):g:f?v.slice(p,p+2):(g-55296<<10)+(m-56320)+65536)}};n.exports={codeAt:s(!1),charAt:s(!0)}},"65f0":function(n,u,t){var a=t("861d"),i=t("e8b5"),s=t("b622"),f=s("species");n.exports=function(c,d){var v;return i(c)&&(v=c.constructor,typeof v=="function"&&(v===Array||i(v.prototype))?v=void 0:a(v)&&(v=v[f],v===null&&(v=void 0))),new(v===void 0?Array:v)(d===0?0:d)}},"69f3":function(n,u,t){var a=t("7f9a"),i=t("da84"),s=t("861d"),f=t("9112"),c=t("5135"),d=t("f772"),v=t("d012"),p=i.WeakMap,h,g,m,y=function(T){return m(T)?g(T):h(T,{})},O=function(T){return function(F){var j;if(!s(F)||(j=g(F)).type!==T)throw TypeError("Incompatible receiver, "+T+" required");return j}};if(a){var E=new p,C=E.get,I=E.has,D=E.set;h=function(T,F){return D.call(E,T,F),F},g=function(T){return C.call(E,T)||{}},m=function(T){return I.call(E,T)}}else{var N=d("state");v[N]=!0,h=function(T,F){return f(T,N,F),F},g=function(T){return c(T,N)?T[N]:{}},m=function(T){return c(T,N)}}n.exports={set:h,get:g,has:m,enforce:y,getterFor:O}},"6eeb":function(n,u,t){var a=t("da84"),i=t("9112"),s=t("5135"),f=t("ce4e"),c=t("8925"),d=t("69f3"),v=d.get,p=d.enforce,h=String(String).split("String");(n.exports=function(g,m,y,O){var E=O?!!O.unsafe:!1,C=O?!!O.enumerable:!1,I=O?!!O.noTargetGet:!1;if(typeof y=="function"&&(typeof m=="string"&&!s(y,"name")&&i(y,"name",m),p(y).source=h.join(typeof m=="string"?m:"")),g===a){C?g[m]=y:f(m,y);return}else E?!I&&g[m]&&(C=!0):delete g[m];C?g[m]=y:i(g,m,y)})(Function.prototype,"toString",function(){return typeof this=="function"&&v(this).source||c(this)})},"6f53":function(n,u,t){var a=t("83ab"),i=t("df75"),s=t("fc6a"),f=t("d1e7").f,c=function(d){return function(v){for(var p=s(v),h=i(p),g=h.length,m=0,y=[],O;g>m;)O=h[m++],(!a||f.call(p,O))&&y.push(d?[O,p[O]]:p[O]);return y}};n.exports={entries:c(!0),values:c(!1)}},"73d9":function(n,u,t){var a=t("44d2");a("flatMap")},"7418":function(n,u){u.f=Object.getOwnPropertySymbols},"746f":function(n,u,t){var a=t("428f"),i=t("5135"),s=t("e538"),f=t("9bf2").f;n.exports=function(c){var d=a.Symbol||(a.Symbol={});i(d,c)||f(d,c,{value:s.f(c)})}},"7839":function(n,u){n.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},"7b0b":function(n,u,t){var a=t("1d80");n.exports=function(i){return Object(a(i))}},"7c73":function(n,u,t){var a=t("825a"),i=t("37e8"),s=t("7839"),f=t("d012"),c=t("1be4"),d=t("cc12"),v=t("f772"),p=">",h="<",g="prototype",m="script",y=v("IE_PROTO"),O=function(){},E=function(T){return h+m+p+T+h+"/"+m+p},C=function(T){T.write(E("")),T.close();var F=T.parentWindow.Object;return T=null,F},I=function(){var T=d("iframe"),F="java"+m+":",j;return T.style.display="none",c.appendChild(T),T.src=String(F),j=T.contentWindow.document,j.open(),j.write(E("document.F=Object")),j.close(),j.F},D,N=function(){try{D=document.domain&&new ActiveXObject("htmlfile")}catch{}N=D?C(D):I();for(var T=s.length;T--;)delete N[g][s[T]];return N()};f[y]=!0,n.exports=Object.create||function(F,j){var H;return F!==null?(O[g]=a(F),H=new O,O[g]=null,H[y]=F):H=N(),j===void 0?H:i(H,j)}},"7dd0":function(n,u,t){var a=t("23e7"),i=t("9ed3"),s=t("e163"),f=t("d2bb"),c=t("d44e"),d=t("9112"),v=t("6eeb"),p=t("b622"),h=t("c430"),g=t("3f8c"),m=t("ae93"),y=m.IteratorPrototype,O=m.BUGGY_SAFARI_ITERATORS,E=p("iterator"),C="keys",I="values",D="entries",N=function(){return this};n.exports=function(T,F,j,H,P,w,z){i(j,F,H);var M=function(lt){if(lt===P&&vt)return vt;if(!O&< in it)return it[lt];switch(lt){case C:return function(){return new j(this,lt)};case I:return function(){return new j(this,lt)};case D:return function(){return new j(this,lt)}}return function(){return new j(this)}},B=F+" Iterator",nt=!1,it=T.prototype,Ct=it[E]||it["@@iterator"]||P&&it[P],vt=!O&&Ct||M(P),pt=F=="Array"&&it.entries||Ct,Et,Ot,St;if(pt&&(Et=s(pt.call(new T)),y!==Object.prototype&&Et.next&&(!h&&s(Et)!==y&&(f?f(Et,y):typeof Et[E]!="function"&&d(Et,E,N)),c(Et,B,!0,!0),h&&(g[B]=N))),P==I&&Ct&&Ct.name!==I&&(nt=!0,vt=function(){return Ct.call(this)}),(!h||z)&&it[E]!==vt&&d(it,E,vt),g[F]=vt,P)if(Ot={values:M(I),keys:w?vt:M(C),entries:M(D)},z)for(St in Ot)(O||nt||!(St in it))&&v(it,St,Ot[St]);else a({target:F,proto:!0,forced:O||nt},Ot);return Ot}},"7f9a":function(n,u,t){var a=t("da84"),i=t("8925"),s=a.WeakMap;n.exports=typeof s=="function"&&/native code/.test(i(s))},"825a":function(n,u,t){var a=t("861d");n.exports=function(i){if(!a(i))throw TypeError(String(i)+" is not an object");return i}},"83ab":function(n,u,t){var a=t("d039");n.exports=!a(function(){return Object.defineProperty({},1,{get:function(){return 7}})[1]!=7})},"8418":function(n,u,t){var a=t("c04e"),i=t("9bf2"),s=t("5c6c");n.exports=function(f,c,d){var v=a(c);v in f?i.f(f,v,s(0,d)):f[v]=d}},"861d":function(n,u){n.exports=function(t){return typeof t=="object"?t!==null:typeof t=="function"}},"8875":function(n,u,t){var a,i,s;(function(f,c){i=[],a=c,s=typeof a=="function"?a.apply(u,i):a,s!==void 0&&(n.exports=s)})(typeof self!="undefined"?self:this,function(){function f(){var c=Object.getOwnPropertyDescriptor(document,"currentScript");if(!c&&"currentScript"in document&&document.currentScript||c&&c.get!==f&&document.currentScript)return document.currentScript;try{throw new Error}catch(D){var d=/.*at [^(]*\((.*):(.+):(.+)\)$/ig,v=/@([^@]*):(\d+):(\d+)\s*$/ig,p=d.exec(D.stack)||v.exec(D.stack),h=p&&p[1]||!1,g=p&&p[2]||!1,m=document.location.href.replace(document.location.hash,""),y,O,E,C=document.getElementsByTagName("script");h===m&&(y=document.documentElement.outerHTML,O=new RegExp("(?:[^\\n]+?\\n){0,"+(g-2)+"}[^<]*
+
-
+
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java
index 04aeb325..645ed52c 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java
@@ -49,7 +49,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
}
// 路由转权限
- String prefix = YmlUtil.get("server.servlet.context-path") + "/";
+ String prefix = "/api/";
String route = request.getRequestURI().replaceFirst(prefix, "");
String auths = route.replace("/", ":");
@@ -110,8 +110,8 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
LikeAdminThreadLocal.put("nickname", map.get("nickname").toString());
// 免权限验证接口
- List notAuthUri = Arrays.asList(AdminConfig.notLoginUri);
- if (notAuthUri.contains(request.getRequestURI()) || Integer.parseInt(uid) == 1) {
+ List notAuthUri = Arrays.asList(AdminConfig.notAuthUri);
+ if (notAuthUri.contains(auths) || Integer.parseInt(uid) == 1) {
return HandlerInterceptor.super.preHandle(request, response, handler);
}
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java
index e7cdeaa0..a3d19d33 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java
@@ -22,7 +22,10 @@ public class AdminConfig {
// 免权限验证
public static String[] notAuthUri = new String[]{
- "system:admin:upInfo" // 管理员更新接口
+ "system:admin:upInfo", // 管理员更新
+ "system:admin:self", // 管理员信息
+ "system:logout", // 退出登录
+ "system:menu:menus", // 系统菜单
};
}
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java
index 614bdbd7..34a9d49c 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java
@@ -20,7 +20,7 @@ import java.util.Map;
* 相册管理
*/
@RestController
-@RequestMapping("/album")
+@RequestMapping("/api/album")
public class AlbumController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java
index 155f6c39..9f9f5686 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java
@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
@RestController
-@RequestMapping("/article")
+@RequestMapping("/api/article")
public class ArticleController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java
index 84c9e9a1..564565a8 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java
@@ -15,7 +15,7 @@ import java.util.Map;
*/
@Slf4j
@RestController
-@RequestMapping("/index")
+@RequestMapping("/api/index")
public class IndexController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java
index c5de274a..30dabf33 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java
@@ -22,7 +22,7 @@ import java.util.Map;
* 上传管理
*/
@RestController
-@RequestMapping("/upload")
+@RequestMapping("/api/upload")
public class UploadController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java
index 0eb082df..8f24a37a 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java
@@ -18,7 +18,7 @@ import java.util.*;
* 缓存监控管理
*/
@RestController
-@RequestMapping("/monitor")
+@RequestMapping("/api/monitor")
public class CacheController {
@Resource
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 835f9472..4e45464e 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
@@ -16,7 +16,7 @@ import java.util.Map;
* 服务监控管理
*/
@RestController
-@RequestMapping("/monitor")
+@RequestMapping("/api/monitor")
public class ServerController {
/**
* 服务器信息
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 d59a0d7b..17acac8b 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
@@ -12,7 +12,7 @@ import java.util.Map;
* 基础设置管理
*/
@RestController
-@RequestMapping("/setting")
+@RequestMapping("/api/setting")
public class BasicsController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java
index b905fbaa..05cc776c 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java
@@ -20,7 +20,7 @@ import java.util.Map;
* 系统管理员管理
*/
@RestController
-@RequestMapping("/system/admin")
+@RequestMapping("/api/system/admin")
public class SystemAdminController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java
index b21e4d2d..8c76a474 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java
@@ -19,7 +19,7 @@ import java.util.Map;
* 系统日志管理
*/
@RestController
-@RequestMapping("/system/log")
+@RequestMapping("/api/system/log")
public class SystemLogController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java
index 428c3b36..0d71ef39 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java
@@ -19,7 +19,7 @@ import java.util.Map;
* 系统登录管理
*/
@RestController
-@RequestMapping("/system")
+@RequestMapping("/api/system")
public class SystemLoginController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java
index be2da1d7..622bfada 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java
@@ -19,7 +19,7 @@ import java.util.List;
* 系统菜单管理
*/
@RestController
-@RequestMapping("/system/menu")
+@RequestMapping("/api/system/menu")
public class SystemMenuController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java
index 43e0374c..365f5a82 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java
@@ -17,7 +17,7 @@ import javax.annotation.Resource;
* 系统角色管理
*/
@RestController
-@RequestMapping("/system/role")
+@RequestMapping("/api/system/role")
public class SystemRoleController {
@Resource
diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
index d5e2dd98..9c100db9 100644
--- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
+++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
@@ -141,19 +141,26 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
List auths = new LinkedList<>();
if (adminId > 1) {
List menuIds = iSystemRoleMenuService.selectMenuIdsByRoleId(sysAdmin.getRole());
- List systemMenus = systemMenuMapper.selectList(new QueryWrapper()
- .eq("is_disable", 0)
- .in("id", menuIds)
- .in("menu_type", Arrays.asList("C", "A"))
- .orderByAsc(Arrays.asList("menu_sort", "id")));
+ if (menuIds.size() > 0) {
+ List systemMenus = systemMenuMapper.selectList(new QueryWrapper()
+ .eq("is_disable", 0)
+ .in("id", menuIds)
+ .in("menu_type", Arrays.asList("C", "A"))
+ .orderByAsc(Arrays.asList("menu_sort", "id")));
- // 处理权限
- for (SystemMenu item : systemMenus) {
- if (StringUtil.isNotNull(item.getPerms()) && StringUtil.isNotEmpty(item.getPerms())) {
- auths.add(item.getPerms().trim());
+ // 处理权限
+ for (SystemMenu item : systemMenus) {
+ if (StringUtil.isNotNull(item.getPerms()) && StringUtil.isNotEmpty(item.getPerms())) {
+ auths.add(item.getPerms().trim());
+ }
}
}
+ // 没有权限
+ if (auths.size() <= 0) {
+ auths.add("");
+ }
} else {
+ // 所有权限
auths.add("*");
}
diff --git a/like-framework/like-admin/src/main/resources/application.yml b/like-framework/like-admin/src/main/resources/application.yml
index c7c963be..956422b3 100644
--- a/like-framework/like-admin/src/main/resources/application.yml
+++ b/like-framework/like-admin/src/main/resources/application.yml
@@ -4,7 +4,7 @@ server:
port: 8082
# 路由前缀
servlet:
- context-path: /api
+ context-path: /
# 框架配置
spring: