Merge pull request #2337 from loadchange/develop_1.2.0

fix: repair resource

console/src/main/resources/static/console-fe/src/locales/en-US.js

@@ -570,6 +570,9 @@ const I18N_CONF = {
     operation: 'Operation',
     deletePermission: 'Delete',
     deletePermissionTip: 'Do you want to delete this permission?',
+    readOnly: 'read only',
+    writeOnly: 'write only',
+    readWrite: 'Read and write',
   },
   NewPermissions: {
     addPermission: 'Add Permission',

console/src/main/resources/static/console-fe/src/locales/zh-CN.js

@@ -567,6 +567,9 @@ const I18N_CONF = {
     operation: '操作',
     deletePermission: '删除',
     deletePermissionTip: '是否要删除该权限？',
+    readOnly: '只读',
+    writeOnly: '只写',
+    readWrite: '读写',
   },
   NewPermissions: {
     addPermission: '添加权限',

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

@@ -62,6 +62,15 @@ class PermissionsManagement extends React.Component {
     this.setState({ createPermissionVisible: false });
   }
 
+  getActionText(action) {
+    const { locale } = this.props;
+    return {
+      r: `${locale.readOnly} (r)`,
+      w: `${locale.writeOnly} (w)`,
+      rw: `${locale.readWrite} (rw)`,
+    }[action];
+  }
+
   render() {
     const { permissions, locale } = this.props;
     const { loading, pageSize, pageNo, createPermissionVisible } = this.state;
@@ -76,7 +85,11 @@ class PermissionsManagement extends React.Component {
         <Table dataSource={permissions.pageItems} loading={loading} maxBodyHeight={476} fixedHeader>
           <Table.Column title={locale.role} dataIndex="role" />
           <Table.Column title={locale.resource} dataIndex="resource" />
-          <Table.Column title={locale.action} dataIndex="action" />
+          <Table.Column
+            title={locale.action}
+            dataIndex="action"
+            cell={action => this.getActionText(action)}
+          />
           <Table.Column
             title={locale.operation}
             cell={(value, index, record) => (

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

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