|
|
@@ -63,17 +63,78 @@ public class AuthorizeUtils {
|
|
|
return r.getData();
|
|
|
}
|
|
|
|
|
|
- private static Tuple.Tuple2<String, Long> getHttpServletRequest() {
|
|
|
+ /**
|
|
|
+ * 获取token
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public static String getToken() {
|
|
|
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
|
|
String token = request.getHeader(CommConsts.TOKEN_NAME);
|
|
|
if (StringUtils.isEmpty(token)) {
|
|
|
throw new CommRuntimeException(SaTokenEnum.NO_LOGIN.getKey(), SaTokenEnum.NO_LOGIN.getName());
|
|
|
}
|
|
|
- String sysId = request.getHeader(CommConsts.SYS_ID);
|
|
|
- if (StringUtils.isEmpty(sysId)) {
|
|
|
- throw new CommRuntimeException(SaTokenEnum.NO_AUTHORITY.getKey(), SaTokenEnum.NO_AUTHORITY.getName());
|
|
|
+ return token;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取登录id
|
|
|
+ *
|
|
|
+ * @param token token
|
|
|
+ * @param tClass id泛型
|
|
|
+ * @param <T>
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public static <T> T getLoginId(String token, Class<T> tClass) {
|
|
|
+ Object id;
|
|
|
+ //远程调用
|
|
|
+ AuthorizeConfig authorizeConfig = getAuthorizeConfig();
|
|
|
+ if (!authorizeConfig.getIsNative()) {
|
|
|
+ Object obj = send("/authorize/getLoginId", token, null);
|
|
|
+ if (obj == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ id = obj;
|
|
|
+ } else {
|
|
|
+ id = StpUtil.getLoginIdByToken(token);
|
|
|
+ }
|
|
|
+ String idStr = id.toString();
|
|
|
+ return tClass.equals(Long.class) ? (T) Long.valueOf(idStr)
|
|
|
+ : tClass.equals(Integer.class) ? (T) Integer.valueOf(idStr)
|
|
|
+ : tClass.equals(String.class) ? (T) idStr
|
|
|
+ : (T) id;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取登录id
|
|
|
+ *
|
|
|
+ * @param tClass
|
|
|
+ * @param <T>
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public static <T> T getLoginId(Class<T> tClass) {
|
|
|
+ return getLoginId(getToken(), tClass);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * token续签
|
|
|
+ */
|
|
|
+ public static void renewTimeout(String token) {
|
|
|
+ AuthorizeConfig authorizeConfig = getAuthorizeConfig();
|
|
|
+ if (!authorizeConfig.getIsNative()) {
|
|
|
+ Object obj = send("/authorize/renewTimeout", token, null);
|
|
|
+ if (obj == null) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
- return new Tuple.Tuple2<>(token, Long.valueOf(sysId));
|
|
|
+ StpUtil.renewTimeout(token, CommConsts.TOKEN_TIMEOUT);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * token续签
|
|
|
+ */
|
|
|
+ public static void renewTimeout() {
|
|
|
+ renewTimeout(getToken());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -118,9 +179,8 @@ public class AuthorizeUtils {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public static List<SysMenuJoinSysRoleMenu> getMenu() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return getMenu(tuple2.getV1(), tuple2.getV2());
|
|
|
+ public static List<SysMenuJoinSysRoleMenu> getMenu(Long systemId) {
|
|
|
+ return getMenu(getToken(), systemId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -147,9 +207,8 @@ public class AuthorizeUtils {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public static List<SysMenuJoinSysRoleMenu> getMenuTree() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return getMenuTree(tuple2.getV1(), tuple2.getV2());
|
|
|
+ public static List<SysMenuJoinSysRoleMenu> getMenuTree(Long systemId) {
|
|
|
+ return getMenuTree(getToken(), systemId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -185,8 +244,7 @@ public class AuthorizeUtils {
|
|
|
* @return
|
|
|
*/
|
|
|
public static List<Long> getSystemIds() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return getSystemIds(tuple2.getV1());
|
|
|
+ return getSystemIds(getToken());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -223,9 +281,8 @@ public class AuthorizeUtils {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public static List<Long> getRoleIds() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return getRoleIds(tuple2.getV1(), tuple2.getV2());
|
|
|
+ public static List<Long> getRoleIds(Long systemId) {
|
|
|
+ return getRoleIds(getToken(), systemId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -262,9 +319,8 @@ public class AuthorizeUtils {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public static List<String> getRoleCodes() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return getRoleCodes(tuple2.getV1(), tuple2.getV2());
|
|
|
+ public static List<String> getRoleCodes(Long systemId) {
|
|
|
+ return getRoleCodes(getToken(), systemId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -299,9 +355,8 @@ public class AuthorizeUtils {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public static Boolean isAdmin() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return isAdmin(tuple2.getV1(), tuple2.getV2());
|
|
|
+ public static Boolean isAdmin(Long systemId) {
|
|
|
+ return isAdmin(getToken(), systemId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -349,9 +404,8 @@ public class AuthorizeUtils {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public static List<String> getMenuInterfaceUri() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return getMenuInterfaceUri(tuple2.getV1(), tuple2.getV2());
|
|
|
+ public static List<String> getMenuInterfaceUri(Long systemId) {
|
|
|
+ return getMenuInterfaceUri(getToken(), systemId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -388,8 +442,7 @@ public class AuthorizeUtils {
|
|
|
* @return
|
|
|
*/
|
|
|
public static boolean authByLogin() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return authByLogin(tuple2.getV1());
|
|
|
+ return authByLogin(getToken());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -426,9 +479,8 @@ public class AuthorizeUtils {
|
|
|
* @param uri
|
|
|
* @return
|
|
|
*/
|
|
|
- public static boolean authByInterface(String uri) {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return authByInterface(tuple2.getV1(), tuple2.getV2(), uri);
|
|
|
+ public static boolean authByInterface(Long systemId, String uri) {
|
|
|
+ return authByInterface(getToken(), systemId, uri);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -477,71 +529,8 @@ public class AuthorizeUtils {
|
|
|
* @param uri
|
|
|
* @return
|
|
|
*/
|
|
|
- public static boolean authByData(String uri) {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return authByData(tuple2.getV1(), tuple2.getV2(), uri);
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 获取登录id
|
|
|
- *
|
|
|
- * @param token token
|
|
|
- * @param tClass id泛型
|
|
|
- * @param <T>
|
|
|
- * @return
|
|
|
- */
|
|
|
- public static <T> T getLoginId(String token, Class<T> tClass) {
|
|
|
- Object id;
|
|
|
- //远程调用
|
|
|
- AuthorizeConfig authorizeConfig = getAuthorizeConfig();
|
|
|
- if (!authorizeConfig.getIsNative()) {
|
|
|
- Object obj = send("/authorize/getLoginId", token, null);
|
|
|
- if (obj == null) {
|
|
|
- return null;
|
|
|
- }
|
|
|
- id = obj;
|
|
|
- } else {
|
|
|
- id = StpUtil.getLoginIdByToken(token);
|
|
|
- }
|
|
|
- String idStr = id.toString();
|
|
|
- return tClass.equals(Long.class) ? (T) Long.valueOf(idStr)
|
|
|
- : tClass.equals(Integer.class) ? (T) Integer.valueOf(idStr)
|
|
|
- : tClass.equals(String.class) ? (T) idStr
|
|
|
- : (T) id;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 获取登录id
|
|
|
- *
|
|
|
- * @param tClass
|
|
|
- * @param <T>
|
|
|
- * @return
|
|
|
- */
|
|
|
- public static <T> T getLoginId(Class<T> tClass) {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- return getLoginId(tuple2.getV1(), tClass);
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * token续签
|
|
|
- */
|
|
|
- public static void renewTimeout(String token) {
|
|
|
- AuthorizeConfig authorizeConfig = getAuthorizeConfig();
|
|
|
- if (!authorizeConfig.getIsNative()) {
|
|
|
- Object obj = send("/authorize/renewTimeout", token, null);
|
|
|
- if (obj == null) {
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
- StpUtil.renewTimeout(token, CommConsts.TOKEN_TIMEOUT);
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * token续签
|
|
|
- */
|
|
|
- public static void renewTimeout() {
|
|
|
- Tuple.Tuple2<String, Long> tuple2 = getHttpServletRequest();
|
|
|
- renewTimeout(tuple2.getV1());
|
|
|
+ public static boolean authByData(Long systemId, String uri) {
|
|
|
+ return authByData(getToken(), systemId, uri);
|
|
|
}
|
|
|
|
|
|
@Data
|
