Merge pull request #2339 from loadchange/develop_1.2.0

fix: namespace value

console/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/NewPermissions.js

@@ -90,7 +90,7 @@ class NewPermissions extends React.Component {
                 style={{ width: '100%' }}
               >
                 {namespaces.map(({ namespace, namespaceShowName }) => (
-                  <Option value={namespace}>
+                  <Option value={`${namespace}:*:*`}>
                     {namespaceShowName} {namespace ? `(${namespace})` : ''}
                   </Option>
                 ))}

console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.js

@@ -79,7 +79,7 @@ class RolesManagement extends React.Component {
             title={locale.operation}
             dataIndex="role"
             cell={(value, index, record) => {
-              if (value === 'GLOBAL_ADMIN') {
+              if (value === 'ROLE_ADMIN') {
                 return null;
               }
               return (

console/src/main/resources/static/console-fe/src/reducers/authority.js

@@ -107,9 +107,7 @@ const getPermissions = params => dispatch =>
  * @param {*} param0
  */
 const createPermission = ([role, resource, action]) =>
-  request
-    .post('v1/auth/permissions', { role, resource: `${resource}:*:*`, action })
-    .then(res => successMsg(res));
+  request.post('v1/auth/permissions', { role, resource, action }).then(res => successMsg(res));
 
 /**
  * 删除权限