From 537cd2f7086e6b8f0cbc098d9ae5cc2e4c1b031d Mon Sep 17 00:00:00 2001 From: icssoa <2570063477@qq.com> Date: Mon, 16 May 2022 02:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/default-avatar.png | Bin 3991 -> 0 bytes src/cool/module/index.ts | 5 ++-- src/cool/service/eps.ts | 46 +++++++++++++++---------------- src/cool/service/index.ts | 14 +++++----- src/cool/service/request.ts | 44 ++++++++++++----------------- src/cool/utils/module.ts | 20 +++++++++++++- src/env.d.ts | 3 ++ src/modules/demo/service/test.ts | 6 ++++ src/shims-vue.d.ts | 4 --- 9 files changed, 76 insertions(+), 66 deletions(-) delete mode 100644 src/assets/default-avatar.png diff --git a/src/assets/default-avatar.png b/src/assets/default-avatar.png deleted file mode 100644 index 1ede40f529b013d4e4bbcc06241249d082512971..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3991 zcmY*cc{mha7rrxwVT2hihAe|DBb0q9jD6oG6xj+{vSiny8Cxk!WRSAg&{*adDIulE zP9#aPO*EDy+sHC})1TiTcX^)sJm;SGyyu+z-aB?SraTBC1OR}?+{_5iT8aM#CkJb8 z)xFRI0H3?Lk-kHW`;r@X>M>)%z5T+`g4w8h1r>$%&^Ma)t%h7EB+?-xHy-);`<>H? ze~?m$X$5o}CVy4)Pm+YuAqcxfr(wenD9!xy8P&V_Fr>{%(Vp>$$mQnf=*FJiEJ5YK zsQOAV$8jAE!l#BL%Jw4RhTF!-Vo0KH(9n^VAeWsts{`;Bb>4VgunoSpD?Cf9oLq+d z-*!%iJEpK+1^oK8vj;T_Wb%Lz2yyy195w$|-=cvFsDCmfNJ=o9gn*MI&2l{&39DS( z*sg58R9!d+5lU;PCdXv>IGb8x^-2cKc_nlY!QOo;DJePJ+S-}~H@X0sx;ioaW|?pR z@EWvjUXIwVsv?u_ozHpkev?Ul;S%I?MEO|Ib31@E5atByIbvzaO)`$Uv)ji}E19Kn zB}i~Zm~I6$c~G0yqyCLwQRtg(=$#rW$0ypO%b-q#aLLK-2Et@d2YheS+BZhLu6x!g z1+KNM3>Cbn<4L?-7o!9ja)q=+jwg^w0&FcPu88g+N2AvwAm?QJUZ#L}ID}YJQ={Q1 zmz_c;(PuxLY@Er!2Xhb?6?!BvF^%8sXCG++7R)X(eqI?n+vJ$^J2Pw_O8k(&cB=NX zj0!Nr(i^Bd*5EHbhoe(}Y?7AmaX(u)53sJ}Gskvq?f8;o`oG0~-DIw@;ctIP{V zB0pX}MQEw3y&BAi@?W05(f*YwJ*$cU;%$8Zm!ci}@Bw9_&FFM_y_{pOA%j1-%8W?1RC|h%@ zbAC9Y_>7DKi^~DwqA%-dpITaQJuB;99!Z4l&CDDN9B+J~=I!?+E22uMjF*Kq30z4t zG3@PpDExLjYAi39vBBWvgh8)GWU>;

o)CXr@RGBqAe>7B&14Pv0NEOpop{gZ%i} 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 diff --git a/src/cool/module/index.ts b/src/cool/module/index.ts index 5570f9c..13c6fe2 100644 --- a/src/cool/module/index.ts +++ b/src/cool/module/index.ts @@ -1,9 +1,8 @@ +import { App } from "vue"; import modules from "/@/modules"; import { router, addViews } from "../router"; -import { filename } from "../utils"; +import { filename, module } from "../utils"; import { isFunction, isObject } from "lodash"; -import { App } from "vue"; -import module from "../utils/module"; // 扫描文件 const files = import.meta.globEager("/src/modules/**/*"); diff --git a/src/cool/service/eps.ts b/src/cool/service/eps.ts index 4deff12..0db0f0a 100644 --- a/src/cool/service/eps.ts +++ b/src/cool/service/eps.ts @@ -66,7 +66,7 @@ export function useEps(service: Service) { // 获取 eps function getEps() { - if (isDev) { + if (isDev && test.eps) { service .request({ url: "/admin/base/open/eps" @@ -183,30 +183,28 @@ export function useEps(service: Service) { } } - // 获取 - if (isDev) { - // 缓存数据 - set(storage.get("eps")); + // 解析 + try { + const eps = + storage.get("eps") || + JSON.parse(__EPS__ || "[]").map(([prefix, api]: any[]) => { + return { + prefix, + api: api.map(([method, path, name]: string[]) => { + return { + method, + path, + name + }; + }) + }; + }); - // 接口数据 - if (test.eps) { - getEps(); - } - } else { - const eps = JSON.parse(__EPS__).map(([prefix, api]: any[]) => { - return { - prefix, - api: api.map(([method, path, name]: string[]) => { - return { - method, - path, - name - }; - }) - }; - }); - - // 文件数据 set({ eps }); + } catch (err) { + console.error("[Eps] 解析失败！", err); } + + // 获取 + getEps(); } diff --git a/src/cool/service/index.ts b/src/cool/service/index.ts index ec25f75..438ef81 100644 --- a/src/cool/service/index.ts +++ b/src/cool/service/index.ts @@ -1,20 +1,20 @@ -import { deepFiles, deepMerge } from "../utils"; +import { deepFiles, deepMerge, module } from "../utils"; import { BaseService } from "./base"; import { useEps } from "./eps"; -// 服务 +// 基础服务 export const service: Service = { request: new BaseService().request }; export function useService() { + // 接口内容 useEps(service); - if (window.__modules__) { - window.__modules__.forEach((e: any) => { - deepMerge(service, deepFiles(e.service || [])); - }); - } + // 模块内容 + module.list.forEach((e) => { + deepMerge(service, deepFiles(e.service || [])); + }); return service; } diff --git a/src/cool/service/request.ts b/src/cool/service/request.ts index 542a1d8..9c52786 100644 --- a/src/cool/service/request.ts +++ b/src/cool/service/request.ts @@ -115,40 +115,30 @@ axios.interceptors.response.use( if (error.response) { const { status, config } = error.response; + const message = `${config.url} ${status}`; - switch (status) { - case 401: - href("/401"); - break; + console.error(message); - case 403: - if (isDev) { - ElMessage.error(`${config.url} 无权限访问！！`); - } else { + if (isDev) { + ElMessage.error(message); + } else { + switch (status) { + case 401: + href("/401"); + break; + + case 403: href("/403"); - } - break; + break; - case 404: - break; - - case 500: - if (!isDev) { + case 500: href("/500"); - } - break; + break; - case 502: - if (isDev) { - ElMessage.error(`${config.url} 服务异常！！`); - } else { + case 502: href("/502"); - } - break; - - default: - console.error(status, config.url); - break; + break; + } } } diff --git a/src/cool/utils/module.ts b/src/cool/utils/module.ts index 5e836b4..4a290e0 100644 --- a/src/cool/utils/module.ts +++ b/src/cool/utils/module.ts @@ -1,7 +1,25 @@ // @ts-nocheck +interface Item { + name: string; + options: { + [key: string]: any; + }; + value: any; + service?: any[]; + pages?: any[]; + views?: any[]; + components?: { + [key: string]: any; + }; +} + const module = { - set(list: any[]) { + get list(): Item[] { + return window.__modules__ || []; + }, + + set(list: Item[]) { window.__modules__ = list; }, diff --git a/src/env.d.ts b/src/env.d.ts index 7ec8820..f8da03d 100644 --- a/src/env.d.ts +++ b/src/env.d.ts @@ -1,2 +1,5 @@ /// /// + +declare const __PROXY_LIST__: any[]; +declare const __EPS__: string; diff --git a/src/modules/demo/service/test.ts b/src/modules/demo/service/test.ts index e69de29..5b6aa7b 100644 --- a/src/modules/demo/service/test.ts +++ b/src/modules/demo/service/test.ts @@ -0,0 +1,6 @@ +import { BaseService, Service } from "/@/cool"; + +@Service("test") +class Test extends BaseService {} + +export default Test; diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts index 1d84172..39981b8 100644 --- a/src/shims-vue.d.ts +++ b/src/shims-vue.d.ts @@ -7,7 +7,3 @@ declare module "*.vue" { export default component; } - -declare const __PROXY_LIST__: any[]; -declare const __EPS__: string; -declare const __modules__: any[];