zs 6 days ago
parent
commit
833c4f84a2
2 changed files with 18 additions and 19 deletions
  1. 14 13
      src/controller/frame/Token.controller.ts
  2. 4 6
      src/frame/Options.ts

+ 14 - 13
src/controller/frame/Token.controller.ts

@@ -1,10 +1,9 @@
-import { Config, Context, Controller, Get, Inject } from "@midwayjs/core";
-import { JwtService } from "@midwayjs/jwt";
-import assert = require("assert");
-import { get } from "lodash";
-import { RoleService } from "../../service/system/role.service";
-import { RF } from "../../response/CustomerResponse";
-
+import { Config, Context, Controller, Get, Inject } from '@midwayjs/core';
+import { JwtService } from '@midwayjs/jwt';
+import assert = require('assert');
+import { get } from 'lodash';
+import { RoleService } from '../../service/system/role.service';
+import { RF } from '../../response/CustomerResponse';
 
 
 @Controller('/token')
 @Controller('/token')
 export class TokenController {
 export class TokenController {
@@ -21,11 +20,13 @@ export class TokenController {
     const token = get(this.ctx, `request.header.${this.tokenKey}`);
     const token = get(this.ctx, `request.header.${this.tokenKey}`);
     assert(token, '缺少token信息');
     assert(token, '缺少token信息');
     const result: any = this.jwtService.decode(token);
     const result: any = this.jwtService.decode(token);
-    const userMenusResult = await this.roleService.getUserMenus();
-    const menus = get(userMenusResult, 'menus');
-    const role_code = get(userMenusResult, 'role_code');
-    result.menus = menus;
-    result.role_code = role_code;
+    if (result.role !== 'User') {
+      const userMenusResult = await this.roleService.getUserMenus();
+      const menus = get(userMenusResult, 'menus');
+      const role_code = get(userMenusResult, 'role_code');
+      result.menus = menus;
+      result.role_code = role_code;
+    }
     return RF.success(result);
     return RF.success(result);
   }
   }
-}
+}

+ 4 - 6
src/frame/Options.ts

@@ -1,5 +1,5 @@
-import { Rule, RuleType } from "@midwayjs/validate";
-import { get } from "lodash";
+import { Rule, RuleType } from '@midwayjs/validate';
+import { get } from 'lodash';
 
 
 /**分页处理参数 */
 /**分页处理参数 */
 export interface PageOptions {
 export interface PageOptions {
@@ -23,14 +23,12 @@ export enum LoginType {
 export class LoginVO {
 export class LoginVO {
   constructor(data: object) {
   constructor(data: object) {
     this.id = get(data, 'id');
     this.id = get(data, 'id');
-    this.nick_name = get(data, 'nick_name');
-    this.openid = get(data, 'openid');
+    this.nick_name = get(data, 'nick_name', get(data, 'username'));
     this.role = get(data, 'role');
     this.role = get(data, 'role');
     this.is_super = get(data, 'is_super');
     this.is_super = get(data, 'is_super');
   }
   }
   id: number;
   id: number;
   nick_name: string;
   nick_name: string;
-  openid: string;
   role: string;
   role: string;
   is_super: string;
   is_super: string;
 }
 }
@@ -42,4 +40,4 @@ export class UPwdDTO {
   // @ApiProperty({ description: '密码' })
   // @ApiProperty({ description: '密码' })
   @Rule(RuleType['string']().required())
   @Rule(RuleType['string']().required())
   password: string = undefined;
   password: string = undefined;
-}
+}