feat: pont 生成的接口 request 方法增加 return type

pont-template.ts

@@ -88,8 +88,8 @@ export default class BasicGenerator extends CodeGenerator {
         const method = inter.method.toUpperCase()
         const paramsCode = inter.getParamsCode('Params', this.surrounding)
         const requestParams = this.getParams(inter, paramsCode)
-        const undef = inter.response.getInitialValue() === 'undefined'
         const isBody = this.checkJsonParam(inter, paramsCode)
+        const responseType = `Promise<${inter.responseType.replace(/defs.Result\<(.*)\>/, '$1') || 'any'}>`
 
         // TODO
         // 扩展 hooks mode
@@ -99,15 +99,11 @@ export default class BasicGenerator extends CodeGenerator {
             /**
              * @desc ${inter.description}
              */
-
-            ${undef ? '' : `import * as defs from '../../baseClass';`}
             import { defHttp } from '/@/utils/http/axios'
 
             ${isBody ? '' : `export ${paramsCode}`}
 
-            ${undef ? '' : `export const init = ${inter.response.getInitialValue(true)};`}
-
-            export function request(${requestParams}) {
+            export function request(${requestParams}): ${responseType} {
                 return defHttp.request({
                     url: "${inter.path.replace(API_URL_PREFIX, '')}",
                     method: '${method}',
@@ -120,7 +116,7 @@ export default class BasicGenerator extends CodeGenerator {
                         requestParams.includes('form')
                             ? `headers: { 'Content-Type': 'multipart/form-data;charset=UTF-8' },`
                             : isBody
-                            ? `headers: { 'Content-Type': 'application/json' },`
+                            ? `headers: { 'Content-Type': 'application/json;charset=UTF-8' },`
                             : ''
                     }
 

src/api/services/api-lock.json

@@ -241,7 +241,49 @@
             ]
           },
           {
-            "description": "检查登录状态",
+            "description": "安全校验",
+            "name": "safe",
+            "method": "get",
+            "path": "/api/auth/safe",
+            "response": {
+              "typeArgs": [
+                {
+                  "typeArgs": [],
+                  "typeName": "string",
+                  "isDefsType": false,
+                  "templateIndex": -1,
+                  "compileTemplateKeyword": "#/definitions/",
+                  "enum": [],
+                  "typeProperties": []
+                }
+              ],
+              "typeName": "Result",
+              "isDefsType": true,
+              "templateIndex": -1,
+              "compileTemplateKeyword": "#/definitions/",
+              "enum": [],
+              "typeProperties": []
+            },
+            "parameters": [
+              {
+                "in": "query",
+                "description": "密码",
+                "name": "password",
+                "required": true,
+                "dataType": {
+                  "typeArgs": [],
+                  "typeName": "string",
+                  "isDefsType": false,
+                  "templateIndex": -1,
+                  "compileTemplateKeyword": "#/definitions/",
+                  "enum": [],
+                  "typeProperties": []
+                }
+              }
+            ]
+          },
+          {
+            "description": "检查登录",
             "name": "valid",
             "method": "get",
             "path": "/api/auth/valid",

src/api/services/api.d.ts

@@ -292,7 +292,28 @@ namespace API {
         }
 
         /**
-         * 检查登录状态
+         * 安全校验
+         * /api/auth/safe
+         */
+        export namespace safe {
+            export class Params {
+                /** 密码 */
+                password: string
+            }
+
+            export type Response = string
+
+            export const init: Response
+
+            export function request(
+                params: Params,
+                config?: http.RequestConfig<Params>,
+                options?: http.RequestOptions,
+            ): Promise<Response>
+        }
+
+        /**
+         * 检查登录
          * /api/auth/valid
          */
         export namespace valid {

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

@@ -4,6 +4,7 @@
 import * as login from './login'
 import * as logout from './logout'
 import * as register from './register'
+import * as safe from './safe'
 import * as valid from './valid'
 
-export { login, logout, register, valid }
+export { login, logout, register, safe, valid }

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

 /**
  * @desc 登录
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -12,9 +10,11 @@ export class Params {
     password: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.LoginVo> {
     return defHttp.request(
         {
             url: '/auth/login',

src/api/services/mods/auth/logout.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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/auth/logout',

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

 /**
  * @desc 注册
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -24,9 +22,11 @@ export class Params {
     username: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/auth/register',

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

+/**
+ * @desc 安全校验
+ */
+import { defHttp } from '/@/utils/http/axios'
+
+export class Params {
+    /** 密码 */
+    password: string
+}
+
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
+    return defHttp.request(
+        {
+            url: '/auth/safe',
+            method: 'GET',
+            params,
+
+            ...config,
+        },
+        options,
+    )
+}

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

 /**
- * @desc 检查登录状态
+ * @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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<boolean> {
     return defHttp.request(
         {
             url: '/auth/valid',

src/api/services/mods/example/download.ts

 /**
  * @desc 文件下载
  */
-
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {}
 
-export function request(params?: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<any> {
     return defHttp.request(
         {
             url: '/example/download',

src/api/services/mods/example/fail.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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/example/fail',

src/api/services/mods/example/findUserExtensionInfo.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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.UserExtensionVo> {
     return defHttp.request(
         {
             url: '/example/findUserExtensionInfo',

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

 /**
  * @desc Hello World
  */
-
-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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/example/',

src/api/services/mods/example/json.ts

 /**
  * @desc JSON 传参
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
-export const init = new defs.Result()
-
 export function request(
     body: defs.PageParam,
     config?: http.RequestConfig<defs.PageParam>,
     options?: http.RequestOptions,
-) {
+): Promise<defs.PageVo<string>> {
     return defHttp.request(
         {
             url: '/example/json',

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

 /**
  * @desc 分页条件查询
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -16,9 +14,11 @@ export class Params {
     sortOrder?: 'ASC' | 'DESC'
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.PageVo<string>> {
     return defHttp.request(
         {
             url: '/example/page',

src/api/services/mods/file/download.ts

 /**
  * @desc 文件下载
  */
-
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -11,7 +10,11 @@ export class Params {
     object: string
 }
 
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<any> {
     return defHttp.request(
         {
             url: '/common/file/download',

src/api/services/mods/file/upload.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,
     form: FormData,
     config?: http.RequestConfig<Params | FormData>,
     options?: http.RequestOptions,
-) {
+): Promise<string> {
     return defHttp.request(
         {
             url: '/common/file/upload',

src/api/services/mods/file/uploadBase64Image.ts

 /**
  * @desc Base64 图片上传
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -10,9 +8,11 @@ export class Params {
     base64Image: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/common/file/uploadBase64Image',

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

 /**
  * @desc 新增
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -32,9 +30,11 @@ export class Params {
     uid: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/sys/permission/add',

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

 /**
  * @desc 删除
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -10,9 +8,11 @@ export class Params {
     id: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/sys/permission/deleted',

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

 /**
  * @desc 查询
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -10,9 +8,11 @@ export class Params {
     id: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.PermissionVo> {
     return defHttp.request(
         {
             url: '/sys/permission/find',

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

 /**
  * @desc 修改
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -34,9 +32,11 @@ export class Params {
     uid: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/sys/permission/modify',

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

 /**
  * @desc 分页查询
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -16,9 +14,11 @@ export class Params {
     sortOrder?: 'ASC' | 'DESC'
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.PageVo<defs.PermissionVo>> {
     return defHttp.request(
         {
             url: '/sys/permission/page',

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

 /**
  * @desc 树结构查询
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -10,9 +8,11 @@ export class Params {
     pid?: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<Array<defs.PermissionVo>> {
     return defHttp.request(
         {
             url: '/sys/permission/tree',

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

 /**
  * @desc 新增
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -12,9 +10,11 @@ export class Params {
     uid: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/sys/role/add',

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

 /**
  * @desc 分配权限
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -12,9 +10,11 @@ export class Params {
     ids: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/sys/role/assign',

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

 /**
  * @desc 删除
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -10,9 +8,11 @@ export class Params {
     ids: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/sys/role/deleted',

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

 /**
  * @desc 查询
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -10,9 +8,11 @@ export class Params {
     id: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.RoleVo> {
     return defHttp.request(
         {
             url: '/sys/role/find',

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

 /**
  * @desc 修改
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -14,9 +12,11 @@ export class Params {
     uid: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/sys/role/modify',

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

 /**
  * @desc 分页查询
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -16,9 +14,11 @@ export class Params {
     sortOrder?: 'ASC' | 'DESC'
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.PageVo<defs.RoleVo>> {
     return defHttp.request(
         {
             url: '/sys/role/page',

src/api/services/mods/role/selector.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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<Array<defs.RoleVo>> {
     return defHttp.request(
         {
             url: '/sys/role/selector',

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

 /**
  * @desc 分配角色
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -12,9 +10,11 @@ export class Params {
     ids: string
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<string> {
     return defHttp.request(
         {
             url: '/sys/user/assign',

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

 /**
  * @desc 分页查询
  */
-
-import * as defs from '../../baseClass'
 import { defHttp } from '/@/utils/http/axios'
 
 export class Params {
@@ -16,9 +14,11 @@ export class Params {
     sortOrder?: 'ASC' | 'DESC'
 }
 
-export const init = new defs.Result()
-
-export function request(params: Params, config?: http.RequestConfig<Params>, options?: http.RequestOptions) {
+export function request(
+    params: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.PageVo<defs.UserVo>> {
     return defHttp.request(
         {
             url: '/sys/user/page',

src/api/services/mods/userView/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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<Array<defs.MenuVo>> {
     return defHttp.request(
         {
             url: '/user/getMenuList',

src/api/services/mods/userView/getPermCode.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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<Array<string>> {
     return defHttp.request(
         {
             url: '/user/getPermCode',

src/api/services/mods/userView/getUserInfo.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) {
+export function request(
+    params?: Params,
+    config?: http.RequestConfig<Params>,
+    options?: http.RequestOptions,
+): Promise<defs.UserInfo> {
     return defHttp.request(
         {
             url: '/user/getUserInfo',