liwei/crops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除多余的代码

Browse Source
This commit is contained in:
RuoYi
2021-03-07 11:06:47 +08:00
parent 78deee063d
commit 61432480c8
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
View File

@@ -785,19 +785,28 @@ public class Convert
* @param charset 字符集 * @param charset 字符集
* @return 字符串 * @return 字符串
*/ */
public static String str(Object obj, Charset charset) { public static String str(Object obj, Charset charset)
if (null == obj) { {
if (null == obj)
{
return null; return null;
} }
if (obj instanceof String) { if (obj instanceof String)
{
return (String) obj; return (String) obj;
} else if (obj instanceof byte[]) { }
else if (obj instanceof byte[])
{
return str((byte[]) obj, charset); return str((byte[]) obj, charset);
} else if (obj instanceof Byte[]) { }
else if (obj instanceof Byte[])
{
byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj); byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
return str(bytes, charset); return str(bytes, charset);
} else if (obj instanceof ByteBuffer) { }
else if (obj instanceof ByteBuffer)
{
return str((ByteBuffer) obj, charset); return str((ByteBuffer) obj, charset);
} }
return obj.toString(); return obj.toString();

6
ruoyi-ui/src/permission.js
View File

@@ -19,10 +19,8 @@ router.beforeEach((to, from, next) => {
} else { } else {
if (store.getters.roles.length === 0) { if (store.getters.roles.length === 0) {
// 判断当前用户是否已拉取完user_info信息 // 判断当前用户是否已拉取完user_info信息
store.dispatch('GetInfo').then(res => { store.dispatch('GetInfo').then(() => {
// 拉取user_info store.dispatch('GenerateRoutes').then(accessRoutes => {
const roles = res.roles
store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
// 根据roles权限生成可访问的路由表 // 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表 router.addRoutes(accessRoutes) // 动态添加可访问路由表
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成

2
ruoyi-ui/src/store/modules/user.js
View File

@@ -49,7 +49,7 @@ const user = {
// 获取用户信息 // 获取用户信息
GetInfo({ commit, state }) { GetInfo({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo(state.token).then(res => { getInfo().then(res => {
const user = res.user const user = res.user
const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组