Commit 64319b12 authored by shiyu's avatar shiyu

后台新增用户

parent b4418eed
...@@ -7,6 +7,7 @@ import com.wwdz.ch.admin.util.*; ...@@ -7,6 +7,7 @@ import com.wwdz.ch.admin.util.*;
import com.wwdz.ch.core.captcha.CaptchaCodeManager; import com.wwdz.ch.core.captcha.CaptchaCodeManager;
import com.wwdz.ch.core.util.Base64; import com.wwdz.ch.core.util.Base64;
import com.wwdz.ch.core.util.ResponseUtil; import com.wwdz.ch.core.util.ResponseUtil;
import com.wwdz.ch.core.util.StringUtil;
import com.wwdz.ch.core.util.UUID; import com.wwdz.ch.core.util.UUID;
import com.wwdz.ch.db.dao.dts.DtsPermissionDao; import com.wwdz.ch.db.dao.dts.DtsPermissionDao;
import com.wwdz.ch.db.dao.dts.DtsRoleDao; import com.wwdz.ch.db.dao.dts.DtsRoleDao;
...@@ -53,7 +54,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { ...@@ -53,7 +54,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
data.put("name", admin.getUsername()); data.put("name", admin.getUsername());
data.put("avatar", admin.getAvatar()); data.put("avatar", admin.getAvatar());
Integer[] roleIds = admin.getRoleIds(); Integer[] roleIds = StringUtil.StringArrayToNumberArray(admin.getRoleIds().split(","));
Set<String> roles = dtsRoleDao.queryByIds(roleIds); Set<String> roles = dtsRoleDao.queryByIds(roleIds);
Set<String> permissions = dtsPermissionDao.queryByRoleIds(roleIds); Set<String> permissions = dtsPermissionDao.queryByRoleIds(roleIds);
data.put("roles", roles); data.put("roles", roles);
......
...@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.impl; ...@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.impl;
import java.util.Set; import java.util.Set;
import com.wwdz.ch.admin.service.AdminDataAuthService; import com.wwdz.ch.admin.service.AdminDataAuthService;
import com.wwdz.ch.core.util.StringUtil;
import com.wwdz.ch.db.dao.dts.DtsRoleDao; import com.wwdz.ch.db.dao.dts.DtsRoleDao;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -25,7 +26,7 @@ public class AdminDataAuthServiceImpl implements AdminDataAuthService { ...@@ -25,7 +26,7 @@ public class AdminDataAuthServiceImpl implements AdminDataAuthService {
Integer[] roleIds = null; Integer[] roleIds = null;
Admin currentUser = AuthSupport.currentUser(); Admin currentUser = AuthSupport.currentUser();
if (currentUser != null) { if (currentUser != null) {
roleIds = currentUser.getRoleIds(); roleIds = StringUtil.StringArrayToNumberArray(currentUser.getRoleIds().split(","));
Set<String> roles = dtsRoleDao.queryByIds(roleIds); Set<String> roles = dtsRoleDao.queryByIds(roleIds);
//仅仅只是品牌管理员且不属于超级管理员 //仅仅只是品牌管理员且不属于超级管理员
if (roles.contains(AuthSupport.BRAND_ROLE_NAME) && !roles.contains(AuthSupport.SUPER_ROLE_NAME)) { if (roles.contains(AuthSupport.BRAND_ROLE_NAME) && !roles.contains(AuthSupport.SUPER_ROLE_NAME)) {
......
...@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.shiro; ...@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.shiro;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.wwdz.ch.core.util.StringUtil;
import com.wwdz.ch.db.dao.dts.DtsAdminDao; import com.wwdz.ch.db.dao.dts.DtsAdminDao;
import com.wwdz.ch.db.dao.dts.DtsPermissionDao; import com.wwdz.ch.db.dao.dts.DtsPermissionDao;
import com.wwdz.ch.db.dao.dts.DtsRoleDao; import com.wwdz.ch.db.dao.dts.DtsRoleDao;
...@@ -53,7 +54,7 @@ public class AdminAuthorizingRealm extends AuthorizingRealm { ...@@ -53,7 +54,7 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
} }
Admin admin = (Admin) getAvailablePrincipal(principals); Admin admin = (Admin) getAvailablePrincipal(principals);
Integer[] roleIds = admin.getRoleIds(); Integer[] roleIds = StringUtil.StringArrayToNumberArray(admin.getRoleIds().split(","));
Set<String> roles = dtsRoleDao.queryByIds(roleIds); Set<String> roles = dtsRoleDao.queryByIds(roleIds);
Set<String> permissions = dtsPermissionDao.queryByRoleIds(roleIds); Set<String> permissions = dtsPermissionDao.queryByRoleIds(roleIds);
SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(); SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
......
...@@ -30,4 +30,18 @@ public class StringUtil { ...@@ -30,4 +30,18 @@ public class StringUtil {
return topImage + REGEXSPLIT + images; return topImage + REGEXSPLIT + images;
} }
public static Integer[] StringArrayToNumberArray(String[] numbers) {
Integer[] numberArray = new Integer[numbers.length];
for (int i = 0; i < numbers.length; i++) {
try {
numberArray[i] = Integer.parseInt(numbers[i]);
} catch (NumberFormatException e) {
e.printStackTrace();
}
}
return numberArray;
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment