entry : beansWithAnnotation.entrySet()) {
+ //获取代理对象的目标对象（代理对象无法获取类上注解，所以需要转化成目标对象）
+ Object target = ProxyToTargetObjectHelper.getTarget(entry.getValue());
+ Class targetClass = target.getClass();
+ //获取类注解上的相关描述
+ AuthorizationPrefix authorizationPrefix = targetClass.getAnnotation(AuthorizationPrefix.class);
+ //判断Controller类上是否包含认证注解的包装
+ if (targetClass.isAnnotationPresent(AuthorizationWrapper.class)) {
+ buildPermissionStorageToMap(authorizationPrefix, targetClass.getAnnotation(AuthorizationWrapper.class), false);
+ }
+ //获取类中所有方法
+ Method[] methods = target.getClass().getMethods();
+ for (Method method : methods) {
+ //取出含有注解的方法
+ if (method.isAnnotationPresent(AuthorizationWrapper.class)) {
+ buildPermissionStorageToMap(authorizationPrefix, method.getAnnotation(AuthorizationWrapper.class), true);
+ }
+ }
+ }
+ //保存、更新、删除 权限
+ saveOrUpdateOrDeletePermission(permissionService);
+ }
+ } catch (Exception e) {
+ log.error("【初始化权限】<== 异常：", e);
+ }
+ }
+
+ /**
+ * 构建待存储的权限到map中
+ * @param authorizationPrefix {@link AuthorizationPrefix}
+ * @param authorizationWrapper {@link AuthorizationWrapper}
+ */
+ private void buildPermissionStorageToMap(AuthorizationPrefix authorizationPrefix, AuthorizationWrapper authorizationWrapper, boolean highPriority) {
+ String menuCode = authorizationPrefix.code();
+ String menuName = authorizationPrefix.name();
+ //如果不忽略前缀， 那么进行前缀补充 (如果允许，优先使用 AuthorizationWrapper注解的前缀)
+ String prefix = "";
+ if (!authorizationWrapper.ignorePrefix()) {
+ prefix = V.notEmpty(authorizationWrapper.prefix()) ? authorizationWrapper.prefix() : authorizationPrefix.prefix();
+ }
+ //获取权限
+ RequiresPermissions requiresPermissions = authorizationWrapper.value();
+ //获取所有描述的权限code和name
+ String[] value = requiresPermissions.value();
+ String[] name = authorizationWrapper.name();
+ //设置单个权限code和name
+ String permissionName = "";
+ String permissionCode = "";
+ PermissionStorage permissionStorage;
+ for (int i = 0; i < value.length; i++) {
+ //如果权限名称和值无法一一对应，那么当前权限组的所有数据的名称全部设置为最后一个name值
+ permissionName = value.length != name.length ? name[name.length - 1] : name[i];
+ //拼接权限值
+ permissionCode = V.notEmpty(prefix) ? S.join(prefix, ":", value[i]) : value[i];
+ PermissionStorage existPermission = loadCodePermissionMap.get(permissionCode);
+ //如果不存在权限构建；当前存在的权限不是是高优先级的时候替换
+ if (V.isEmpty(existPermission) || !existPermission.isHighPriority()) {
+ //组装需要存储的权限
+ permissionStorage = PermissionStorage.builder()
+ .menuId(3L).menuCode(menuCode).menuName(menuName)
+ .permissionCode(permissionCode).permissionName(permissionName)
+ .deleted(false).highPriority(highPriority).build();
+ //设置缓存
+ loadCodePermissionMap.put(permissionCode, permissionStorage);
+ }
+ }
+ }
+
+ /**
+ * 保存、更新、删除 权限
+ *
+ * 操作原则 以数据库字段为基准 匹配数据库中的权限和代码中的权限：
+ * * 如果代码中和数据库中相同，更新数据库中数据；
+ * * 如果代码中不存在，删除数据库中数据；
+ *
+ * @param permissionService
+ */
+ private void saveOrUpdateOrDeletePermission(PermissionServiceImpl permissionService) {
+ //记录修改和删除的权限数量
+ int modifyCount = 0, removeCount = 0, totalCount = 0;
+ List saveOrUpdateOrDeletePermissionList = new ArrayList<>();
+ //设置删除 or 修改
+ for (Map.Entry entry : dbPermissionMap.entrySet()) {
+ PermissionStorage permissionStorage = loadCodePermissionMap.get(entry.getKey());
+ Permission permission = entry.getValue();
+ //存在则更新（设置ID）
+ if (V.notEmpty(permissionStorage)) {
+ if (isNeedModify(permission, permissionStorage)) {
+ modifyCount++;
+ permissionStorage.setId(permission.getId());
+ //重置
+ loadCodePermissionMap.put(entry.getKey(), permissionStorage);
+ } else {
+ //数据库中不需要修改的，在加载的数据中删除
+ loadCodePermissionMap.remove(entry.getKey());
+ }
+ } else {
+ //不存在: 表示需要删除
+ removeCount++;
+ permission.setDeleted(true);
+ saveOrUpdateOrDeletePermissionList.add(permission);
+ }
+
+ }
+ //需要操作的数据=》转化为List
+ List saveOrUpdatePermissionList;
+ if (V.notEmpty(loadCodePermissionMap)) {
+ totalCount = loadCodePermissionMap.values().size();
+ List permissionStorageList = loadCodePermissionMap.values().stream().collect(Collectors.toList());
+ saveOrUpdatePermissionList = BeanUtils.convertList(permissionStorageList, Permission.class);
+ saveOrUpdateOrDeletePermissionList.addAll(saveOrUpdatePermissionList);
+ }
+ //保存、更新、删除 权限
+ boolean success = permissionService.saveOrUpdateBatch(saveOrUpdateOrDeletePermissionList);
+ if (success) {
+ log.debug("【初始化权限】<== 成功!共计权限{}个 新增【{}】个, 修改【{}】个,删除【{}】个！",
+ totalCount, (saveOrUpdateOrDeletePermissionList.size() - modifyCount - removeCount), modifyCount, removeCount);
+ } else {
+ log.debug("【初始化权限】<== 失败!");
+ }
+ }
+
+ /**
+ * 比较两个对象的属性是否相同，如果存在一处不同那么就需要修改
+ * @param permission
+ * @param permissionStorage
+ * @return
+ */
+ public boolean isNeedModify(Permission permission, PermissionStorage permissionStorage){
+ if (!V.equals(permission.getMenuId(), permissionStorage.getMenuId())
+ || !V.equals(permission.getMenuCode(), permissionStorage.getMenuCode())
+ || !V.equals(permission.getMenuName(), permissionStorage.getMenuName())
+ || !V.equals(permission.getPermissionCode(), permissionStorage.getPermissionCode())
+ || !V.equals(permission.getPermissionName(), permissionStorage.getPermissionName())
+ ) {
+ return true;
+ }
+ return false;
+ }
+
+}
diff --git a/diboot-shiro/src/main/java/com/diboot/shiro/service/impl/PermissionServiceImpl.java b/diboot-shiro/src/main/java/com/diboot/shiro/service/impl/PermissionServiceImpl.java
index 19cb82d..dfdc4a6 100644
--- a/diboot-shiro/src/main/java/com/diboot/shiro/service/impl/PermissionServiceImpl.java
+++ b/diboot-shiro/src/main/java/com/diboot/shiro/service/impl/PermissionServiceImpl.java
@@ -4,7 +4,6 @@ import com.diboot.core.service.impl.BaseServiceImpl;
import com.diboot.shiro.entity.Permission;
import com.diboot.shiro.mapper.PermissionMapper;
import com.diboot.shiro.service.PermissionService;
-import com.diboot.shiro.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
diff --git a/diboot-shiro/src/main/java/com/diboot/shiro/util/JwtHelper.java b/diboot-shiro/src/main/java/com/diboot/shiro/util/JwtHelper.java
index f7608fc..1499ba9 100644
--- a/diboot-shiro/src/main/java/com/diboot/shiro/util/JwtHelper.java
+++ b/diboot-shiro/src/main/java/com/diboot/shiro/util/JwtHelper.java
@@ -21,7 +21,7 @@ public class JwtHelper {
private static final Logger logger = LoggerFactory.getLogger(JwtHelper.class);
private static final String ISSUER = V.notEmpty(BaseConfig.getProperty("diboot.shiro.jwt.issuer")) ? BaseConfig.getProperty("diboot.shiro.jwt.issuer") : "diboot.com";
- private static final String AUTH_HEADER = V.notEmpty(BaseConfig.getProperty("diboot.shiro.jwt.auth.header.key")) ? BaseConfig.getProperty("diboot.shiro.jwt.auth.header.key") : "authtoken";
+ private static final String AUTH_HEADER = V.notEmpty(BaseConfig.getProperty("diboot.shiro.jwt.authz.header.key")) ? BaseConfig.getProperty("diboot.shiro.jwt.authz.header.key") : "authtoken";
private static final String TOKEN_PREFIX = V.notEmpty(BaseConfig.getProperty("diboot.shiro.jwt.token.prefix")) ? BaseConfig.getProperty("diboot.shiro.jwt.token.prefix") : "Bearer ";
public static final String SIGN_KEY = V.notEmpty(BaseConfig.getProperty("diboot.shiro.jwt.signkey"))? BaseConfig.getProperty("diboot.shiro.jwt.signkey") : "Dibo2016Mazc";
diff --git a/diboot-shiro/src/main/java/com/diboot/shiro/util/ProxyToTargetObjectHelper.java b/diboot-shiro/src/main/java/com/diboot/shiro/util/ProxyToTargetObjectHelper.java
new file mode 100644
index 0000000..3ed3600
--- /dev/null
+++ b/diboot-shiro/src/main/java/com/diboot/shiro/util/ProxyToTargetObjectHelper.java
@@ -0,0 +1,83 @@
+package com.diboot.shiro.util;
+
+import org.springframework.aop.framework.AdvisedSupport;
+import org.springframework.aop.framework.AopProxy;
+import org.springframework.aop.support.AopUtils;
+
+import java.lang.reflect.Field;
+
+/**
+ * 代理对象转成目标对象
+ * @author : wee
+ * @version : v 2.0
+ * @Date 2019-06-19 14:42
+ */
+public class ProxyToTargetObjectHelper {
+
+ /**
+ * 获取代理对象的目标对象
+ * @param proxy
+ * @return
+ * @throws Exception
+ */
+ public static Object getTarget(Object proxy) throws Exception {
+ /*判断是否是代理对象*/
+ if(!AopUtils.isAopProxy(proxy)) {
+ return proxy;
+ }
+ //判断是jdk动态代理还是cglib代理
+ if(AopUtils.isJdkDynamicProxy(proxy)) {
+ return getJdkDynamicProxyTargetObject(proxy);
+ }
+ //cglib
+ else {
+ return getCglibProxyTargetObject(proxy);
+ }
+ }
+
+
+ /**
+ * 获取cglib代理的目标对象
+ * @param proxy
+ * @return
+ * @throws Exception
+ */
+ private static Object getCglibProxyTargetObject(Object proxy) throws Exception {
+ Field h = proxy.getClass().getDeclaredField("CGLIB$CALLBACK_0");
+ return getJdkOrCglibTargetObject(h, proxy);
+ }
+
+
+ /**
+ * 获取jdk动态代理的目标对象
+ * @param proxy
+ * @return
+ * @throws Exception
+ */
+ private static Object getJdkDynamicProxyTargetObject(Object proxy) throws Exception {
+ Field h = proxy.getClass().getSuperclass().getDeclaredField("h");
+ return getJdkOrCglibTargetObject(h, proxy);
+ }
+
+ /**
+ * 根据不用的代理获取目标对象
+ * @param field
+ * @param proxy
+ * @return
+ * @throws Exception
+ */
+ private static Object getJdkOrCglibTargetObject(Field field, Object proxy) throws Exception{
+ field.setAccessible(true);
+ Object dynamic = field.get(proxy);
+ Field advised;
+ //如果是jdk代理
+ if (dynamic instanceof AopProxy) {
+ advised = ((AopProxy)dynamic).getClass().getDeclaredField("advised");
+ }
+ //如果是cglib代理
+ advised = dynamic.getClass().getDeclaredField("advised");
+ advised.setAccessible(true);
+ //获取目标类
+ return ((AdvisedSupport)advised.get(dynamic)).getTargetSource().getTarget();
+ }
+}