⚡ 优化代码

eiam-console/src/main/console-fe/src/pages/app/AppConfig/locales/zh-CN.ts

@@ -24,6 +24,7 @@ export default {
   'pages.app.config.basic.icon.desc.2': '建议使用 256 * 256 像素方形图标',
   'pages.app.config.basic.enabled': '应用状态',
   'pages.app.config.basic.type': '应用类型',
+  'pages.app.config.basic.group': '应用分组',
   'pages.app.config.basic.type.value_enum.custom_made': '定制应用',
   'pages.app.config.basic.type.value_enum.standard': '标准应用',
   'pages.app.config.basic.type.value_enum.self_developed': '自研应用',
@@ -591,6 +592,10 @@ export default {
     '授权组织',
   'pages.app.config.items.login_access.access_policy.create_policy.modal_form.subject_type.auth_organization.rule.0.message':
     '请选择组织节点',
+  'pages.app.config.items.app_permission': '权限管理',
+  'pages.app.config.items.app_permission.permission_resource': '资源管理',
+  'pages.app.config.items.app_permission.permission_role': '角色管理',
+  'pages.app.config.items.app_permission.permission_audit': '权限审计',
   'pages.app.config.items.account_sync': '账户同步',
   'pages.app.config.error': '未指定应用',
 };

eiam-console/src/main/console-fe/src/pages/app/AppList/locales/zh-CN.ts

@@ -21,6 +21,7 @@ export default {
   'pages.app.list.title': '应用列表',
   'pages.app.list.tool_bar_render.add_app': '添加应用',
   'pages.app.list.metas.title': '应用名称',
+  'pages.app.list.metas.group': '应用分组',
   'pages.app.list.actions.popconfirm.disable_app': '确定禁用该应用吗？',
   'pages.app.list.actions.popconfirm.enable_app': '确定启用该应用吗？',
   'pages.app.list.actions.popconfirm.delete_app': '您确定要删除此应用？',

eiam-console/src/main/console-fe/src/pages/security/Setting/service.ts

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { request } from '@umijs/max';
+import { BasicSettingConfig, SecurityDefensePolicyConfig } from './data.d';
 
 /**
  * 获取基础配置
  */
-export async function getBasicSettingConfig(): Promise<
-  API.ApiResult<SettingAPI.AdvancedSettingConfig>
-> {
+export async function getBasicSettingConfig(): Promise<API.ApiResult<BasicSettingConfig>> {
   return request('/api/v1/setting/security/basic/config');
 }
 
@@ -30,7 +29,7 @@ export async function getBasicSettingConfig(): Promise<
  * 保存基础配置
  */
 export async function saveBasicSettingConfig(
-  params: Record<string, any>,
+  params: BasicSettingConfig,
 ): Promise<API.ApiResult<boolean>> {
   return request('/api/v1/setting/security/basic/save', {
     method: 'POST',
@@ -43,7 +42,7 @@ export async function saveBasicSettingConfig(
  * 获取内容安全策略配置
  */
 export async function getSecurityDefensePolicyConfig(): Promise<
-  API.ApiResult<SettingAPI.SecurityDefensePolicyConfig>
+  API.ApiResult<SecurityDefensePolicyConfig>
 > {
   return request('/api/v1/setting/security/defense_policy/config');
 }
@@ -52,7 +51,7 @@ export async function getSecurityDefensePolicyConfig(): Promise<
  * 保存内容安全策略配置
  */
 export async function saveSecurityDefensePolicyConfig(
-  params: Record<string, any>,
+  params: SecurityDefensePolicyConfig,
 ): Promise<API.ApiResult<boolean>> {
   return request('/api/v1/setting/security/defense_policy/save', {
     method: 'POST',

eiam-console/src/main/console-fe/src/pages/setting/Message/service.ts

@@ -24,7 +24,7 @@ import { EmailTemplateList, GetEmailTemplate, SmsTemplateList } from './data.d';
  * @param params
  */
 export async function getMailTemplateList(
-  params?: Record<string, any>,
+  params: Record<string, any>,
 ): Promise<API.ApiResult<EmailTemplateList>> {
   return request('/api/v1/setting/mail_template/list', { params });
 }

eiam-console/src/main/console-fe/src/pages/setting/Storage/components/AliCloud/index.tsx

@@ -26,16 +26,16 @@ export default () => {
       <ProFormText
         name={['config', 'domain']}
         label={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.tencent_cos.domain',
+          id: 'pages.setting.storage_provider.provider.aliyun_oss.domain',
         })}
         placeholder={intl.formatMessage({
-          id: 'pages.setting.storage_provider.provider.tencent_cos.domain.placeholder',
+          id: 'pages.setting.storage_provider.provider.aliyun_oss.domain.placeholder',
         })}
         rules={[
           {
             required: true,
             message: intl.formatMessage({
-              id: 'pages.setting.storage_provider.provider.tencent_cos.domain.rule.0.message',
+              id: 'pages.setting.storage_provider.provider.aliyun_oss.domain.rule.0.message',
             }),
           },
         ]}

eiam-console/src/main/console-fe/src/services/typings.d.ts

@@ -422,4 +422,13 @@ declare namespace AppAPI {
     template: string;
     remark: string;
   };
+
+  export type AppGroupList = {
+    id: string;
+    name: string;
+    code: string;
+    type: string;
+    appCount: string;
+    remark: string;
+  };
 }

eiam-portal/src/main/portal-fe/src/pages/Application/service.ts

@@ -19,15 +19,15 @@ import { filterParamConverter, sortParamConverter } from '@/utils/utils';
 import type { RequestData } from '@ant-design/pro-components';
 import type { SortOrder } from 'antd/es/table/interface';
 import { request } from '@umijs/max';
-import type { AppList } from './data.d';
+import { AppGroupList, AppList } from './data.d';
 
 /**
  * 获取应用列表
  */
 export async function queryAppList(
-  params?: Record<string, any>,
-  sort?: Record<string, SortOrder>,
-  filter?: Record<string, (string | number)[] | null>,
+  params: Record<string, any>,
+  sort: Record<string, SortOrder>,
+  filter: Record<string, (string | number)[] | null>,
 ): Promise<RequestData<AppList>> {
   const { result, success } = await request<API.ApiResult<AppList>>('/api/v1/app/list', {
     params: { ...params, ...sortParamConverter(sort), ...filterParamConverter(filter) },
@@ -38,3 +38,10 @@ export async function queryAppList(
     total: result?.pagination ? result?.pagination.total : 0,
   };
 }
+
+/**
+ * 获取应用分组
+ */
+export async function getAppGroupList(): Promise<API.ApiResult<AppGroupList>> {
+  return request<API.ApiResult<any>>('/api/v1/app/group_list', {});
+}