chore: headerMenu 优化

packages/ui/certd-client/src/api/service.ts

@@ -54,7 +54,7 @@ function createService() {
             return dataAxios.data;
           default:
             // 不是正确的 code
-            const errorMessage = dataAxios.msg;
+            const errorMessage = dataAxios.msg || dataAxios.message || "未知错误";
             // @ts-ignore
             if (response?.config?.onError) {
               // @ts-ignore

packages/ui/certd-client/src/router/guard.ts

@@ -82,7 +82,23 @@ function setupAccessGuard(router: Router) {
         await userStore.getUserInfoAction();
       }
 
-      const allMenus = await generateMenus(frameworkRoutes[0].children, router);
+      const settingsStore = useSettingStore();
+      let headerMenus: any[] = settingsStore.getHeaderMenus;
+      headerMenus = headerMenus.map((menu: any) => {
+        return {
+          ...menu,
+          name: menu.title,
+          meta: {
+            title: menu.title,
+            icon: menu.icon,
+            link: menu.link,
+            order: 99999
+          }
+        };
+      });
+      debugger;
+      let allMenus = await generateMenus(frameworkRoutes[0].children, router);
+      allMenus = allMenus.concat(headerMenus);
       const accessibleMenus = buildAccessedMenus(allMenus);
       accessStore.setAccessRoutes(frameworkRoutes);
       accessStore.setAccessMenus(accessibleMenus);

packages/ui/certd-client/src/router/source/modules/sys.ts

@@ -176,6 +176,7 @@ export const sysResources = [
         title: "套餐管理",
         name: "SuiteManager",
         path: "/sys/suite",
+        redirect: "/sys/suite/setting",
         meta: {
           icon: "ion:cart-outline",
           permission: "sys:settings:edit",

packages/ui/certd-server/src/controller/sys/plugin/plugin-controller.ts

@@ -67,7 +67,7 @@ export class PluginController extends CrudController<PluginService> {
     await this.service.setDisabled(body);
     return this.ok();
   }
-  @Post('/getCommPluginConfigs', { summary: 'sys:settings:edit' })
+  @Post('/getCommPluginConfigs', { summary: 'sys:settings:view' })
   async getCommPluginConfigs() {
     const res = await this.pluginConfigService.getCommPluginConfig();
     return this.ok(res);

packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts

@@ -72,7 +72,7 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
   }
 
   // savePublicSettings
-  @Post('/getEmailSettings', { summary: 'sys:settings:edit' })
+  @Post('/getEmailSettings', { summary: 'sys:settings:view' })
   async getEmailSettings(@Body(ALL) body) {
     const conf = await getEmailSettings(this.service, this.userSettingsService);
     return this.ok(conf);
@@ -86,7 +86,7 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
     return this.ok(conf);
   }
 
-  @Post('/getSysSettings', { summary: 'sys:settings:edit' })
+  @Post('/getSysSettings', { summary: 'sys:settings:view' })
   async getSysSettings() {
     const publicSettings = await this.service.getPublicSettings();
     let privateSettings = await this.service.getPrivateSettings();

packages/ui/certd-server/src/middleware/authority.ts

@@ -92,7 +92,7 @@ export class AuthorityMiddleware implements IWebMiddleware {
       const pass = await this.authService.checkPermission(ctx, permission);
       if (!pass) {
         logger.info('not permission: ', ctx.req.url);
-        ctx.status = 401;
+        ctx.status = 200;
         ctx.body = Constants.res.permission;
         return;
       }