feat: 重新规范 pont 模板、Mock 接口、登录参数、环境配置同步、示例接口重新生成等

.env.development

@@ -14,10 +14,11 @@ VITE_DROP_CONSOLE = false
 
 # Basic interface address SPA
 VITE_GLOB_API_URL=/basic-api
-# VITE_GLOB_API_URL=http://localhost:8181/basic-api
-
-# File upload address， optional
-VITE_GLOB_UPLOAD_URL=/upload
+# VITE_GLOB_API_URL=http://localhost:8181
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=
+# VITE_GLOB_API_URL_PREFIX=/api
+
+# File upload address， optional
+VITE_GLOB_UPLOAD_URL=/upload

.env.production

@@ -18,13 +18,13 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 # Basic interface address SPA
 VITE_GLOB_API_URL=/basic-api
 
+# Interface prefix
+VITE_GLOB_API_URL_PREFIX=
+
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
 VITE_GLOB_UPLOAD_URL=/upload
 
-# Interface prefix
-VITE_GLOB_API_URL_PREFIX=
-
 # Whether to enable image compression
 VITE_USE_IMAGEMIN= true
 

mock/sys/menu.ts

@@ -225,7 +225,7 @@ const linkRoute = {
 
 export default [
     {
-        url: '/basic-api/getMenuList',
+        url: '/basic-api/user/getMenuList',
         timeout: 1000,
         method: 'get',
         response: (request: Request) => {

mock/sys/user.ts

+import { IncomingMessage } from 'http'
+import Mock from 'mockjs'
+import qs from 'qs'
 import { MockMethod } from 'vite-plugin-mock'
 import { Response, Request } from '../_util'
 
+const parseFormParams = (req: IncomingMessage): Promise<Recordable> => {
+    return new Promise((resolve) => {
+        let body = ''
+        req.on('data', function (chunk) {
+            body += chunk
+        })
+        req.on('end', function () {
+            resolve(qs.parse(body) as any)
+            return
+        })
+    })
+}
+
 export function createFakeUserList() {
     return [
         {
             userId: '1',
-            username: 'basic',
+            account: 'admin',
             realName: 'Basic Admin',
             avatar: 'https://q1.qlogo.cn/g?b=qq&nk=190848757&s=640',
             desc: 'manager',
@@ -14,14 +30,15 @@ export function createFakeUserList() {
             homePath: '/dashboard/workbench',
             roles: [
                 {
-                    roleName: 'Super Admin',
-                    value: 'super',
+                    name: 'Super Admin',
+                    uid: 'super',
+                    id: '1',
                 },
             ],
         },
         {
             userId: '2',
-            username: 'test',
+            account: 'test',
             password: '123456',
             realName: 'test user',
             avatar: 'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
@@ -30,8 +47,9 @@ export function createFakeUserList() {
             homePath: '/dashboard/workbench',
             roles: [
                 {
-                    roleName: 'Tester',
-                    value: 'test',
+                    name: 'Tester',
+                    uid: 'test',
+                    id: '2',
                 },
             ],
         },
@@ -46,30 +64,53 @@ const fakeCodeList: any = {
 export default [
     // mock user login
     {
-        url: '/basic-api/login',
+        url: '/basic-api/auth/login',
         timeout: 200,
         method: 'post',
-        response: ({ body }) => {
-            const { username, password } = body
+        // response: ({ query }) => {
+        //     const { account, password } = query
+        //     console.log(JSON.stringify(query))
+        //     const checkUser = createFakeUserList().find(
+        //         (item) => item.account === account && password === item.password,
+        //     )
+        //     if (!checkUser) {
+        //         return Response.no('Incorrect account or password！')
+        //     }
+        //     const { userId, account: _account, token, realName, desc, roles } = checkUser
+        //     return Response.ok({
+        //         roles,
+        //         userId,
+        //         account: _account,
+        //         token,
+        //         realName,
+        //         desc,
+        //     })
+        // },
+        rawResponse: async (req, res) => {
+            const { account, password } = await parseFormParams(req)
             const checkUser = createFakeUserList().find(
-                (item) => item.username === username && password === item.password,
+                (item) => item.account === account && password === item.password,
             )
             if (!checkUser) {
                 return Response.no('Incorrect account or password！')
             }
-            const { userId, username: _username, token, realName, desc, roles } = checkUser
-            return Response.ok({
+            const { userId, account: _account, token, realName, desc, roles } = checkUser
+            const response = Response.ok({
                 roles,
                 userId,
-                username: _username,
+                account: _account,
                 token,
                 realName,
                 desc,
             })
+
+            res.setHeader('Content-Type', 'application/json')
+            res.statusCode = 200
+            res.end(JSON.stringify(Mock.mock(response)))
         },
     },
     {
-        url: '/basic-api/getUserInfo',
+        url: '/basic-api/user/getUserInfo',
         method: 'get',
         response: (request: Request) => {
             const token = Request.getRequestToken(request)
@@ -82,7 +123,7 @@ export default [
         },
     },
     {
-        url: '/basic-api/getPermCode',
+        url: '/basic-api/auth/getPermCode',
         timeout: 200,
         method: 'get',
         response: (request: Request) => {
@@ -98,7 +139,7 @@ export default [
         },
     },
     {
-        url: '/basic-api/logout',
+        url: '/basic-api/auth/logout',
         timeout: 200,
         method: 'get',
         response: (request: Request) => {
@@ -112,7 +153,7 @@ export default [
         },
     },
     {
-        url: '/basic-api/testRetry',
+        url: '/basic-api/auth/testRetry',
         statusCode: 405,
         method: 'get',
         response: () => {

pont-config.json

 {
-    "originUrl": "http://localhost:8181/basic-api/v2/api-docs",
+    "originUrl": "http://localhost:8181/api/v2/api-docs",
     "templatePath": "./pont.template",
     "outDir": "./src/api/services",
     "surrounding": "typeScript",

pont.template.ts

 import { Interface, BaseClass, Property, CodeGenerator } from 'pont-engine'
 
+// 接口 API 前缀
+// 通常与项目的 env 配置中的 VITE_GLOB_API_URL_PREFIX 相同
+const API_URL_PREFIX = '/api'
+
 export default class BasicGenerator extends CodeGenerator {
     getParams(inter: Interface) {
         const requestParams = inter.getRequestParams(this.surrounding)
@@ -52,15 +56,15 @@ export default class BasicGenerator extends CodeGenerator {
              */
 
             import * as defs from '../../baseClass';
-            import { Http } from '/@/utils/http/axios'
+            import { defHttp } from '/@/utils/http/axios'
 
             export ${paramsCode}
 
             export const init = ${inter.response.getInitialValue()};
 
             export function request(${requestParams}) {
-                return Http.request({
-                    url: "${inter.path}",
+                return defHttp.request({
+                    url: "${inter.path.replace(API_URL_PREFIX, '')}",
                     method: '${method}',
                     ${
                         method === 'GET'

src/api/services/api.d.ts

@@ -6,6 +6,29 @@ declare namespace defs {
     export class LoginVo {
         /** token */
         token?: string
+
+        /** 主键 */
+        userId?: number
+    }
+
+    export class MenuVo {
+        /** 子权限 */
+        children?: Array<defs.MenuVo>
+
+        /** 组件 */
+        component?: string
+
+        /** 元数据 */
+        meta?: ObjectMap<any, object>
+
+        /** 标识 */
+        name?: string
+
+        /** 路径 */
+        path?: string
+
+        /** 权限类型 */
+        type?: 'DIR' | 'MENU' | 'BUTTON'
     }
 
     export class PageVo<T0 = any> {
@@ -38,6 +61,9 @@ declare namespace defs {
         /** 主键 */
         id?: number
 
+        /** 元数据 */
+        meta?: ObjectMap<any, object>
+
         /** 名称 */
         name?: string
 
@@ -51,7 +77,7 @@ declare namespace defs {
         serial?: number
 
         /** 权限类型 */
-        type?: 'MENU' | 'BUTTON'
+        type?: 'DIR' | 'MENU' | 'BUTTON'
 
         /** 标识 */
         uid?: string
@@ -101,27 +127,18 @@ declare namespace defs {
         /** 头像 */
         avatar?: string
 
-        /** 邮箱 */
-        email?: string
+        /** 介绍 */
+        desc?: string
 
-        /** 主页地址 */
+        /** 用户主页 */
         homePath?: string
 
-        /** 手机号 */
-        mobile?: string
-
-        /** 权限 */
-        permissions?: Array<defs.PermissionVo>
-
         /** 真实姓名 */
         realName?: string
 
         /** 角色 */
         roles?: Array<defs.RoleVo>
 
-        /** 职称 */
-        title?: string
-
         /** 主键 */
         userId?: number
 
@@ -175,7 +192,7 @@ declare namespace API {
     export namespace auth {
         /**
          * 登录
-         * /basic-api/auth/login
+         * /api/auth/login
          */
         export namespace login {
             export class Params {
@@ -198,7 +215,7 @@ declare namespace API {
 
         /**
          * 登出
-         * /basic-api/auth/logout
+         * /api/auth/logout
          */
         export namespace logout {
             export class Params {}
@@ -216,7 +233,7 @@ declare namespace API {
 
         /**
          * 注册
-         * /basic-api/auth/register
+         * /api/auth/register
          */
         export namespace register {
             export class Params {
@@ -226,14 +243,14 @@ declare namespace API {
                 email?: string
                 /** 是否启用 */
                 enable?: boolean
+                /** 简介 */
+                introduction?: string
                 /** 手机号 */
                 mobile: string
                 /** 密码 */
                 password: string
                 /** 真实姓名 */
                 realName: string
-                /** 职称 */
-                title?: string
                 /** 用户名 */
                 username: string
             }
@@ -256,7 +273,7 @@ declare namespace API {
     export namespace hello {
         /**
          * hello
-         * /basic-api/hello/
+         * /api/hello/
          */
         export namespace hello {
             export class Params {}
@@ -274,7 +291,7 @@ declare namespace API {
 
         /**
          * fail
-         * /basic-api/hello/fail
+         * /api/hello/fail
          */
         export namespace fail {
             export class Params {}
@@ -292,7 +309,7 @@ declare namespace API {
 
         /**
          * page
-         * /basic-api/hello/page
+         * /api/hello/page
          */
         export namespace page {
             export class Params {
@@ -324,7 +341,7 @@ declare namespace API {
     export namespace minio {
         /**
          * 文件上传
-         * /basic-api/common/minio/upload
+         * /api/common/minio/upload
          */
         export namespace upload {
             export class Params {}
@@ -348,7 +365,7 @@ declare namespace API {
     export namespace permission {
         /**
          * 新增
-         * /basic-api/manage/permission/add
+         * /api/manage/permission/add
          */
         export namespace add {
             export class Params {
@@ -360,6 +377,8 @@ declare namespace API {
                 hidden?: boolean
                 /** 图标 */
                 icon?: string
+                /** 元数据 */
+                meta?: string
                 /** 名称 */
                 name: string
                 /** 路径 */
@@ -369,7 +388,7 @@ declare namespace API {
                 /** 序号 */
                 serial?: number
                 /** 权限类型 */
-                type: 'MENU' | 'BUTTON'
+                type: 'DIR' | 'MENU' | 'BUTTON'
                 /** 标识 */
                 uid: string
             }
@@ -387,7 +406,7 @@ declare namespace API {
 
         /**
          * 删除
-         * /basic-api/manage/permission/deleted
+         * /api/manage/permission/deleted
          */
         export namespace deleted {
             export class Params {
@@ -408,7 +427,7 @@ declare namespace API {
 
         /**
          * 查询
-         * /basic-api/manage/permission/find
+         * /api/manage/permission/find
          */
         export namespace find {
             export class Params {
@@ -429,7 +448,7 @@ declare namespace API {
 
         /**
          * 修改
-         * /basic-api/manage/permission/modify
+         * /api/manage/permission/modify
          */
         export namespace modify {
             export class Params {
@@ -443,6 +462,8 @@ declare namespace API {
                 icon?: string
                 /** id */
                 id: number
+                /** 元数据 */
+                meta?: string
                 /** 名称 */
                 name: string
                 /** 路径 */
@@ -452,7 +473,7 @@ declare namespace API {
                 /** 序号 */
                 serial?: number
                 /** 权限类型 */
-                type: 'MENU' | 'BUTTON'
+                type: 'DIR' | 'MENU' | 'BUTTON'
                 /** 标识 */
                 uid: string
             }
@@ -470,7 +491,7 @@ declare namespace API {
 
         /**
          * 分页查询
-         * /basic-api/manage/permission/page
+         * /api/manage/permission/page
          */
         export namespace page {
             export class Params {
@@ -497,7 +518,7 @@ declare namespace API {
 
         /**
          * 树结构查询
-         * /basic-api/manage/permission/tree
+         * /api/manage/permission/tree
          */
         export namespace tree {
             export class Params {
@@ -523,7 +544,7 @@ declare namespace API {
     export namespace role {
         /**
          * 新增
-         * /basic-api/manage/role/add
+         * /api/manage/role/add
          */
         export namespace add {
             export class Params {
@@ -546,7 +567,7 @@ declare namespace API {
 
         /**
          * 分配权限
-         * /basic-api/manage/role/assign
+         * /api/manage/role/assign
          */
         export namespace assign {
             export class Params {
@@ -569,7 +590,7 @@ declare namespace API {
 
         /**
          * 删除
-         * /basic-api/manage/role/deleted
+         * /api/manage/role/deleted
          */
         export namespace deleted {
             export class Params {
@@ -590,7 +611,7 @@ declare namespace API {
 
         /**
          * 查询
-         * /basic-api/manage/role/find
+         * /api/manage/role/find
          */
         export namespace find {
             export class Params {
@@ -611,7 +632,7 @@ declare namespace API {
 
         /**
          * 修改
-         * /basic-api/manage/role/modify
+         * /api/manage/role/modify
          */
         export namespace modify {
             export class Params {
@@ -636,7 +657,7 @@ declare namespace API {
 
         /**
          * 分页查询
-         * /basic-api/manage/role/page
+         * /api/manage/role/page
          */
         export namespace page {
             export class Params {
@@ -663,7 +684,7 @@ declare namespace API {
 
         /**
          * 选项查询
-         * /basic-api/manage/role/selector
+         * /api/manage/role/selector
          */
         export namespace selector {
             export class Params {}
@@ -685,10 +706,28 @@ declare namespace API {
      */
     export namespace user {
         /**
+         * 获取用户权限
+         * /api/user/getMenuList
+         */
+        export namespace getMenuList {
+            export class Params {}
+
+            export type Response = Array<defs.MenuVo>
+
+            export const init: Response
+
+            export function request(
+                params: Params,
+                config?: http.RequestConfig<Params>,
+                options?: http.RequestOptions,
+            ): Promise<Response>
+        }
+
+        /**
          * 获取登录用户信息
-         * /basic-api/user/info
+         * /api/user/getUserInfo
          */
-        export namespace info {
+        export namespace getUserInfo {
             export class Params {}
 
             export type Response = defs.UserInfo
@@ -704,7 +743,7 @@ declare namespace API {
 
         /**
          * 分配角色
-         * /basic-api/user/manage/assign
+         * /api/user/manage/assign
          */
         export namespace assign {
             export class Params {
@@ -727,7 +766,7 @@ declare namespace API {
 
         /**
          * 分页查询
-         * /basic-api/user/manage/page
+         * /api/user/manage/page
          */
         export namespace page {
             export class Params {

src/api/services/baseClass.ts

 export class LoginVo {
     /** token */
     token = ''
+
+    /** 主键 */
+    userId = undefined
+}
+
+export class MenuVo {
+    /** 子权限 */
+    children = []
+
+    /** 组件 */
+    component = ''
+
+    /** 元数据 */
+    meta = undefined
+
+    /** 标识 */
+    name = ''
+
+    /** 路径 */
+    path = ''
+
+    /** 权限类型 */
+    type = 'DIR'
 }
 
 export class PageVo {
@@ -33,6 +56,9 @@ export class PermissionVo {
     /** 主键 */
     id = undefined
 
+    /** 元数据 */
+    meta = undefined
+
     /** 名称 */
     name = ''
 
@@ -46,7 +72,7 @@ export class PermissionVo {
     serial = undefined
 
     /** 权限类型 */
-    type = 'MENU'
+    type = 'DIR'
 
     /** 标识 */
     uid = ''
@@ -96,27 +122,18 @@ export class UserInfo {
     /** 头像 */
     avatar = ''
 
-    /** 邮箱 */
-    email = ''
+    /** 介绍 */
+    desc = ''
 
-    /** 主页地址 */
+    /** 用户主页 */
     homePath = ''
 
-    /** 手机号 */
-    mobile = ''
-
-    /** 权限 */
-    permissions = []
-
     /** 真实姓名 */
     realName = ''
 
     /** 角色 */
     roles = []
 
-    /** 职称 */
-    title = ''
-
     /** 主键 */
     userId = undefined
 

src/api/services/mods/auth/login.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 账号(支持用户名/手机号/邮箱) */
@@ -15,9 +15,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/auth/login',
+            url: '/auth/login',
             method: 'POST',
             data: params,
 

src/api/services/mods/auth/logout.ts

@@ -3,16 +3,16 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {}
 
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/auth/logout',
+            url: '/auth/logout',
             method: 'GET',
             params,
 

src/api/services/mods/auth/register.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 头像 */
@@ -12,14 +12,14 @@ export class Params {
     email?: string
     /** 是否启用 */
     enable?: boolean
+    /** 简介 */
+    introduction?: string
     /** 手机号 */
     mobile: string
     /** 密码 */
     password: string
     /** 真实姓名 */
     realName: string
-    /** 职称 */
-    title?: string
     /** 用户名 */
     username: string
 }
@@ -27,9 +27,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/auth/register',
+            url: '/auth/register',
             method: 'POST',
             data: params,
 

src/api/services/mods/hello/fail.ts

@@ -3,16 +3,16 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {}
 
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/hello/fail',
+            url: '/hello/fail',
             method: 'GET',
             params,
 

src/api/services/mods/hello/hello.ts

@@ -3,16 +3,16 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {}
 
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/hello/',
+            url: '/hello/',
             method: 'GET',
             params,
 

src/api/services/mods/hello/page.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 当前页数 */
@@ -19,9 +19,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/hello/page',
+            url: '/hello/page',
             method: 'GET',
             params,
 

src/api/services/mods/minio/upload.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {}
 
@@ -15,9 +15,9 @@ export function request(
     config?: http.RequestConfig<Params | FormData>,
     options?: http.RequestOptions,
 ) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/common/minio/upload',
+            url: '/common/minio/upload',
             method: 'POST',
             data: form || params,
 

src/api/services/mods/permission/add.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 组件 */
@@ -14,6 +14,8 @@ export class Params {
     hidden?: boolean
     /** 图标 */
     icon?: string
+    /** 元数据 */
+    meta?: string
     /** 名称 */
     name: string
     /** 路径 */
@@ -23,7 +25,7 @@ export class Params {
     /** 序号 */
     serial?: number
     /** 权限类型 */
-    type: 'MENU' | 'BUTTON'
+    type: 'DIR' | 'MENU' | 'BUTTON'
     /** 标识 */
     uid: string
 }
@@ -31,9 +33,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/permission/add',
+            url: '/manage/permission/add',
             method: 'POST',
             data: params,
 

src/api/services/mods/permission/deleted.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** id */
@@ -13,9 +13,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/permission/deleted',
+            url: '/manage/permission/deleted',
             method: 'POST',
             data: params,
 

src/api/services/mods/permission/find.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** id */
@@ -13,9 +13,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/permission/find',
+            url: '/manage/permission/find',
             method: 'GET',
             params,
 

src/api/services/mods/permission/modify.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 组件 */
@@ -16,6 +16,8 @@ export class Params {
     icon?: string
     /** id */
     id: number
+    /** 元数据 */
+    meta?: string
     /** 名称 */
     name: string
     /** 路径 */
@@ -25,7 +27,7 @@ export class Params {
     /** 序号 */
     serial?: number
     /** 权限类型 */
-    type: 'MENU' | 'BUTTON'
+    type: 'DIR' | 'MENU' | 'BUTTON'
     /** 标识 */
     uid: string
 }
@@ -33,9 +35,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/permission/modify',
+            url: '/manage/permission/modify',
             method: 'POST',
             data: params,
 

src/api/services/mods/permission/page.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 当前页数 */
@@ -19,9 +19,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/permission/page',
+            url: '/manage/permission/page',
             method: 'GET',
             params,
 

src/api/services/mods/permission/tree.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 父级 id */
@@ -13,9 +13,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/permission/tree',
+            url: '/manage/permission/tree',
             method: 'GET',
             params,
 

src/api/services/mods/role/add.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 名称 */
@@ -15,9 +15,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/role/add',
+            url: '/manage/role/add',
             method: 'POST',
             data: params,
 

src/api/services/mods/role/assign.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** id */
@@ -15,9 +15,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/role/assign',
+            url: '/manage/role/assign',
             method: 'POST',
             data: params,
 

src/api/services/mods/role/deleted.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** id */
@@ -13,9 +13,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/role/deleted',
+            url: '/manage/role/deleted',
             method: 'POST',
             data: params,
 

src/api/services/mods/role/find.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** id */
@@ -13,9 +13,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/role/find',
+            url: '/manage/role/find',
             method: 'GET',
             params,
 

src/api/services/mods/role/modify.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** id */
@@ -17,9 +17,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/role/modify',
+            url: '/manage/role/modify',
             method: 'POST',
             data: params,
 

src/api/services/mods/role/page.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 当前页数 */
@@ -19,9 +19,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/role/page',
+            url: '/manage/role/page',
             method: 'GET',
             params,
 

src/api/services/mods/role/selector.ts

@@ -3,16 +3,16 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {}
 
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/manage/role/selector',
+            url: '/manage/role/selector',
             method: 'GET',
             params,
 

src/api/services/mods/user/assign.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** id */
@@ -15,9 +15,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/user/manage/assign',
+            url: '/user/manage/assign',
             method: 'POST',
             data: params,
 

src/api/services/mods/user/getMenuList.ts

+/**
+ * @desc 获取用户权限
+ */
+
+import * as defs from '../../baseClass'
+import { defHttp } from '/@/utils/http/axios'
+
+export class Params {}
+
+export const init = new defs.Result()
+
+export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+    return defHttp.request(
+        {
+            url: '/user/getMenuList',
+            method: 'GET',
+            params,
+
+            ...config,
+        },
+        options,
+    )
+}

src/api/services/mods/user/info.ts → src/api/services/mods/user/getUserInfo.ts

@@ -3,16 +3,16 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {}
 
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/user/info',
+            url: '/user/getUserInfo',
             method: 'GET',
             params,
 

src/api/services/mods/user/index.ts

 /**
  * @description
  */
-import * as info from './info'
+import * as getMenuList from './getMenuList'
+import * as getUserInfo from './getUserInfo'
 import * as assign from './assign'
 import * as page from './page'
 
-export { info, assign, page }
+export { getMenuList, getUserInfo, assign, page }

src/api/services/mods/user/page.ts

@@ -3,7 +3,7 @@
  */
 
 import * as defs from '../../baseClass'
-import { Http } from '/@/utils/http/axios'
+import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
     /** 当前页数 */
@@ -19,9 +19,9 @@ export class Params {
 export const init = new defs.Result()
 
 export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
-    return Http.request(
+    return defHttp.request(
         {
-            url: '/basic-api/user/manage/page',
+            url: '/user/manage/page',
             method: 'GET',
             params,
 

src/api/sys/menu.ts

@@ -2,7 +2,7 @@ import { defHttp } from '/@/utils/http/axios'
 import { getMenuListResultModel } from './model/menuModel'
 
 enum Api {
-    GetMenuList = '/getMenuList',
+    GetMenuList = '/user/getMenuList',
 }
 
 /**

src/api/sys/model/userModel.ts

@@ -2,13 +2,14 @@
  * @description: Login interface parameters
  */
 export interface LoginParams {
-    username: string
+    account: string
     password: string
 }
 
 export interface RoleInfo {
-    roleName: string
-    value: string
+    id: string | number
+    uid: string
+    name: string
 }
 
 /**
@@ -17,7 +18,7 @@ export interface RoleInfo {
 export interface LoginResultModel {
     userId: string | number
     token: string
-    role: RoleInfo
+    role?: RoleInfo
 }
 
 /**

src/api/sys/user.ts

@@ -4,11 +4,11 @@ import { LoginParams, LoginResultModel, GetUserInfoModel } from './model/userMod
 import { ErrorMessageMode } from '/#/axios'
 
 enum Api {
-    Login = '/login',
-    Logout = '/logout',
-    GetUserInfo = '/getUserInfo',
-    GetPermCode = '/getPermCode',
-    TestRetry = '/testRetry',
+    Login = '/auth/login',
+    Logout = '/auth/logout',
+    GetUserInfo = '/user/getUserInfo',
+    GetPermCode = '/auth/getPermCode',
+    TestRetry = '/auth/testRetry',
 }
 
 /**

src/locales/lang/en/sys.ts

@@ -85,7 +85,7 @@ export default {
         loginSuccessDesc: 'Welcome back',
 
         // placeholder
-        accountPlaceholder: 'Please input username',
+        accountPlaceholder: 'Please input account',
         passwordPlaceholder: 'Please input password',
         smsPlaceholder: 'Please input sms code',
         mobilePlaceholder: 'Please input mobile',

src/settings/projectSetting.ts

@@ -70,7 +70,7 @@ const setting: ProjectConfig = {
         // Whether to show the document button
         showDoc: true,
         // Whether to show the notification button
-        showNotice: true,
+        showNotice: false,
         // Whether to display the menu search
         showSearch: true,
     },

src/store/modules/lock.ts

@@ -40,7 +40,7 @@ export const useLockStore = defineStore({
                 try {
                     const username = userStore.getUserInfo?.username
                     const res = await userStore.login({
-                        username,
+                        account: username,
                         password: password!,
                         goHome: false,
                         mode: 'none',

src/utils/http/axios/index.ts

@@ -214,9 +214,9 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
                 // 基础接口地址
                 // baseURL: globSetting.apiUrl,
 
-                headers: { 'Content-Type': ContentTypeEnum.JSON },
+                // headers: { 'Content-Type': ContentTypeEnum.JSON },
                 // 如果是form-data格式
-                // headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED },
+                headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED },
                 // 数据处理方式
                 transform: clone(transform),
                 // 配置项，下面的选项都可以在独立的接口请求中覆盖
@@ -260,13 +260,13 @@ export const defHttp = createAxios()
 // 自定义配置
 // TODO: 实际项目所需的请求配置
 // const { apiUrl } = globSetting
-const apiUrl = 'http://localhost:8181'
-export const Http = createAxios({
-    headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED },
-    requestOptions: {
-        apiUrl,
-    },
-})
+// const apiUrl = 'http://localhost:8181'
+// export const Http = createAxios({
+//     headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED },
+//     requestOptions: {
+//         apiUrl,
+//     },
+// })
 
 // other api url
 // export const otherHttp = createAxios({

src/views/sys/login/LoginForm.vue

@@ -119,7 +119,7 @@
     const rememberMe = ref(false)
 
     const formData = reactive({
-        account: 'basic',
+        account: 'admin',
         password: '123456',
     })
 
@@ -136,7 +136,7 @@
             loading.value = true
             const userInfo = await userStore.login({
                 password: data.password,
-                username: data.account,
+                account: data.account,
                 mode: 'none', //不要默认的错误提示
             })
             if (userInfo) {

tests/server/service/UserService.ts

@@ -2,7 +2,7 @@ import { Result } from '../utils'
 
 const fakeUserInfo = {
     userId: '1',
-    username: 'vben',
+    account: 'vben',
     realName: 'Vben Admin',
     desc: 'manager',
     password: '123456',