fdb2 1.0.13 → 1.0.14

package/server/service/session.service.ts

@@ -1,158 +0,0 @@
-import { Provide, Scope, ScopeEnum, Config, Inject } from '@midwayjs/core';
-import { ISessionService, TencentService } from '@cicctencent/midwayjs-base';
-import { Session, GetLoginSessionReq, GetLoginSessionRes, LogoutReq, LogoutRes, LoginByWxReq, LoginByWxRsp, LoginByAccountReq, LoginByAccountRsp } from '@fefeding/common/dist/models/account/session';
-
-@Provide('session:service')
-@Scope(ScopeEnum.Request, { allowDowngrade: true })
-export class SessionService extends ISessionService { 
-    @Config('loginOption')
-    loginOption: any;
-
-    @Inject()
-    tencentService: TencentService;
-
-    /**
-     * 根据ID获取session
-     * 并判断session是否在有效期
-     * @param id token唯一
-     */
-    async getLoginSession(id: string): Promise<Session> {
-        const req = new GetLoginSessionReq();
-        req.id = id;
-        const res = await this.requestBaseApi<GetLoginSessionRes>(req);
-        return res?.data || null;
-    }
-    /**
-     * 下线
-     * @param id 需要下线的id或者session
-     */
-    async logout(id: string): Promise<any> {
-        const req = new LogoutReq();
-        req.id = id;
-        const res = await this.requestBaseApi<LogoutRes>(req);
-        this.ctx.currentSession = null;
-        return res;
-    }
-
-    /**
-     * 登录接口
-     * @param loginParams 登录参数
-     * @returns 
-     */
-    async loginByWx(loginParams: LoginByWxReq) {
-        const req = new LoginByWxReq();
-        req.fromJSON(loginParams);
-        const res = await this.requestBaseApi<LoginByWxRsp>(req);
-        return res;
-    }
-
-    /**
-     * 帐号登陆
-     * @param loginParams 
-     * @returns 
-     */
-    async loginByAccount(loginParams: LoginByAccountReq) {
-        loginParams.appId = '0';//this.baseServiceOption.appId?.toString() || '0';
-        
-        const req = new LoginByAccountReq();
-        req.fromJSON(loginParams);
-        const res = await this.requestBaseApi<LoginByAccountRsp>(req);
-        return res;
-    }
-
-    /**
-     * 用临时码登陆
-     * @param code 登陆临时码
-     * @returns 
-     */
-    async loginByCode(code: string) {
-        const res = await this.requestBaseApi('/api/session/loginByAuthCode', {
-            data: {
-                code
-            }
-        });
-        return res?.data || null;
-    }
-
-    /**
-     * 生成临时登陆码
-     * @param id 登陆token 
-     * @returns 
-     */
-    async createAuthCode(id: string) {
-        const res = await this.requestBaseApi('/api/session/createAuthCode', {
-            data: {
-                id
-            }
-        });
-        return res;
-    }
-
-    // 生成登陆用公众号二维码
-    // 先生成一个验证码，当用户扫码后，事件回调获取验证码后再生成session
-    async createWxLoginQrcode() {
-
-        const res = await this.requestBaseApi('/api/session/createWxLoginQrcode', {
-            data: {
-                appId: this.loginOption.wxAppId
-            }
-        });
-        //console.log(res);
-        return res;
-    }
-
-    // 验证码登陆
-    async loginByVerifyCode(code: string, appId?: number,prefix?: string) {
-        if(!code) throw Error('code不可为空');
-        appId = appId || this.loginOption.wxAppId;
-
-        const res = await this.requestBaseApi('/api/session/loginByVerifyCode', {
-            data: {
-                appId,
-                code,
-                prefix
-            }
-        });
-        return res;
-    }
-
-    // 更新用户信息
-    async updateUser(user: any) {
-        const userId = this.ctx.currentSession?.userId || 0;
-        if(!userId) return;
-        //console.log(loginParams, req);
-        const res = await this.requestBaseApi('/api/account/updateUser', {
-            data: {
-                user: {
-                    ...user,
-                    id: userId,
-                }
-            },
-            params: {
-                token: this.ctx.currentSession?.id
-            }
-        });
-        console.log('updateUser', res);
-        return res;
-    }
-
-    // 上传头像图片
-    async uploadAvatar(file: any) {
-
-        const userId = this.ctx.currentSession?.userId || 0;
-        if(!userId) return;
-
-        let filename = file['filename'] as string || '1.png';
-
-        const key = `avator/${userId}/${filename}`;
-         
-        const res = await this.tencentService.uploadCosFile(key, file.data);
-        console.log(res);
-        const user = {
-            id: userId,
-            avatar: res.url || key,
-        }
-
-        return await this.updateUser(user);
-    }
-}

package/server/tsconfig.json

@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "CommonJS",
-    "moduleResolution": "Node",
-    "outDir": "./dist/server",
-    "rootDir": "./",
-    "strict": false,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "declaration": true,
-    "declarationMap": true,
-    "sourceMap": true,
-    "noEmit": false,
-    "resolveJsonModule": true
-  },
-  "include": ["**/*"],
-  "exclude": ["**/__tests__/*", "**/*.spec.ts", "node_modules", "dist"]
-}

package/src/adapter/ajax.ts

@@ -1,135 +0,0 @@
-import type { AxiosRequestConfig, AxiosResponse } from 'axios';
-import axios from 'axios';
-import baseConf from '@/base/config';
-export const pendingMap = new Map();
-export const service = axios.create({
-    baseURL: `${baseConf.baseURL}`, // 设置统一的请求前缀// http://localhost:8888
-    timeout: 30000, // 设置统一的超时时长
-});
-service.interceptors.request.use(
-    config => {
-        const pendingKey = getPendingKey(config);
-        if (pendingMap.has(pendingKey)) {
-            const controller = pendingMap.get(pendingKey);
-            controller.abort();
-        } else {
-            addPending(config);
-        }
-
-        return config;
-    },
-    error => {
-        return Promise.reject(error);
-    }
-);
-service.interceptors.response.use(
-    response => {
-        removePending(response.config);
-        return response;
-    },
-    error => {
-        error.config && removePending(error.config);
-        error.message = getHttpErrorMsg(error);
-        return Promise.reject(error);
-    }
-);
-type Config = AxiosRequestConfig & { debounceRequest?: boolean };
-export function request(axiosConfig: Config): Promise<AxiosResponse<any, any>> {
-    // 自定义配置
-    const options = Object.assign(
-        {
-            debounceRequest: true, // 是否开启取消重复请求, 默认为 true
-        },
-        axiosConfig
-    );
-
-    return service(options);
-}
-
-/**
- * 生成每个请求唯一的键
- * @param {*} config
- * @returns string
- */
-function getPendingKey(config: AxiosRequestConfig) {
-    const { url, method, params } = config;
-    let { data } = config;
-    if (typeof data === 'string') {
-        data = JSON.parse(data);
-    }
-    // 以url和...组成字符串作为储存的key值
-    return [url, method, JSON.stringify(params), JSON.stringify(data)].join(
-        '&'
-    );
-}
-/**
- * 储存每个请求唯一值, 也就是cancel()方法, 用于取消请求
- *
- * @param {*} config
- */
-function addPending(config: AxiosRequestConfig) {
-    const pendingKey = getPendingKey(config);
-    const controller = new AbortController();
-    config.signal = controller.signal;
-    pendingMap.set(pendingKey, controller);
-}
-/**
- * 删除重复的请求key
- * @param {*} config
- */
-function removePending(config: AxiosRequestConfig) {
-    const pendingKey = getPendingKey(config);
-    if (pendingMap.has(pendingKey)) {
-        pendingMap.delete(pendingKey);
-    }
-}
-/**
- * 取消所有请求
- * @param {*} config
- */
-export function abortAllPending() {
-    for (const [key, value] of pendingMap.entries()) {
-        value.abort();
-        pendingMap.delete(key);
-    }
-}
-/**
- * 处理异常
- * @param {*} error
- */
-function getHttpErrorMsg(error: any) {
-    let message = '';
-    // 处理被取消的请求
-    if (axios.isCancel(error)) {
-        console.error(
-            `重复请求：${(error as any).config.url} ${error.message}`
-        );
-    }
-
-    if (error && error.response) {
-        switch (error.response.status) {
-            case 302:
-                message = '接口重定向了！';
-                break;
-            case 400:
-                message = '参数不正确！';
-                break;
-            case 401:
-                message = '您未登录，或者登录已经超时，请先登录！';
-                break;
-            case 403:
-                message = '您没有权限操作！';
-                break;
-            case 504:
-                message = '服务暂时无法访问，请稍后再试！';
-                break;
-            default:
-                message = '异常问题，请联系管理员！';
-                break;
-        }
-    }
-    if (error.message.includes('timeout')) message = '网络请求超时！';
-    if (error.message.includes('Network'))
-        message = window.navigator.onLine ? '服务端异常！' : '您断网了！';
-    return message;
-}

package/src/assets/base.css

@@ -1 +0,0 @@
-/* color palette from <https://github.com/vuejs/theme> */