From f4c181608411d60293c836621dc90b9120e3a451 Mon Sep 17 00:00:00 2001
From: JaneYork <janeyork1314@163.com>
Date: 星期五, 22 七月 2022 15:27:00 +0800
Subject: [PATCH] 主动设置文件公共读,适配天翼云OSS 主动设置文件公共读,适配天翼云OSS。 天翼云,即便bucket设置公共读,文件默认也是private,除非手动设置,详见天翼云:https://console.xstore.ctyun.cn/doc/store/sdk/java/objectOperation/putObject.html 已测试: 所有兼容S3协议的OSS,已测试:阿里云、腾讯云、百度、京东、天翼、自建Minio、七牛

---
 ruoyi-ui/src/utils/permission.js |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js
index ceca18f..bd4c066 100644
--- a/ruoyi-ui/src/utils/permission.js
+++ b/ruoyi-ui/src/utils/permission.js
@@ -9,9 +9,10 @@
   if (value && value instanceof Array && value.length > 0) {
     const permissions = store.getters && store.getters.permissions
     const permissionDatas = value
+    const all_permission = "*:*:*";
 
     const hasPermission = permissions.some(permission => {
-      return permissionDatas.includes(permission)
+      return all_permission === permission || permissionDatas.includes(permission)
     })
 
     if (!hasPermission) {
@@ -33,9 +34,10 @@
   if (value && value instanceof Array && value.length > 0) {
     const roles = store.getters && store.getters.roles
     const permissionRoles = value
+    const super_admin = "admin";
 
     const hasRole = roles.some(role => {
-      return permissionRoles.includes(role)
+      return super_admin === role || permissionRoles.includes(role)
     })
 
     if (!hasRole) {
@@ -46,4 +48,4 @@
     console.error(`need roles! Like checkRole="['admin','editor']"`)
     return false
   }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3