diff --git a/src/mys/BaseModel.ts b/src/mys/BaseModel.ts index 5e88bb5..6a3d2fe 100644 --- a/src/mys/BaseModel.ts +++ b/src/mys/BaseModel.ts @@ -3,11 +3,20 @@ */ import MysUtil from './MysUtil.js' -let cacheMap = {} -let reFn = {} +const cacheMap = {} +const reFn = {} export default class BaseModel { + _uuid = null + + /** + * + * @returns + */ constructor() { + /** + * ???? + */ return this } diff --git a/src/mys/DailyCache.ts b/src/mys/DailyCache.ts index 19d8739..b1ca160 100644 --- a/src/mys/DailyCache.ts +++ b/src/mys/DailyCache.ts @@ -14,13 +14,15 @@ const redisKeyRoot = 'Yz:cache:' * */ export default class DailyCache extends BaseModel { + keyPre = null + /** * * @param uid * @param game * @returns */ - constructor(uid, game = 'config') { + constructor(uid: string | number, game = 'config') { super() const storeKey = DailyCache.getStoreKey(uid, game) // 检查实例缓存 diff --git a/src/mys/NoteUser.ts b/src/mys/NoteUser.ts index 952a628..63325d1 100644 --- a/src/mys/NoteUser.ts +++ b/src/mys/NoteUser.ts @@ -5,11 +5,13 @@ import MysUtil from './MysUtil.js' import { UserDB } from '../db/index.js' import { Data } from '../local.js' /** + * ******************* * Bot实际User用户类 * 主键QQ * * User可以注册UID,通过 getRegUid / setRegUid * 一个User可以绑定多个MysUser CK,绑定MysUser + * ******************* */ export default class NoteUser extends BaseModel { /** @@ -32,12 +34,17 @@ export default class NoteUser extends BaseModel { * OLD Func {{ */ + /** + * + */ get uid() { console.warn('NoteUser.uid 默认返回原神UID,可更改为 user.getUid(game)') return this.getUid() } - // 获取绑定CK的UID列表,如未绑定CK则返回空数组 + /** + * 获取绑定CK的UID列表,如未绑定CK则返回空数组 + */ get ckUids() { console.warn( 'NoteUser.ckUids 默认返回原神UID,可更改为 user.getCkUidList(game)' diff --git a/src/mys/apiTool.ts b/src/mys/apiTool.ts index b1e787d..92c34c2 100644 --- a/src/mys/apiTool.ts +++ b/src/mys/apiTool.ts @@ -5,21 +5,27 @@ import { randomRange } from './mysApi.js' * 临时处理,后续大概率重写 主要原因(懒) */ export default class apiTool { + uid = null + isSr = false + server = null + game = 'genshin' + /** * * @param {用户uid} uid * @param {区服} server * @param {是否为星穹铁道或其他游戏? type(bool or string)} isSr */ - constructor(uid, server, isSr = false) { - this.uid = uid - this.isSr = isSr - this.server = server + constructor(uid: string | null, server, isSr: boolean = false) { + uid && (this.uid = uid) + typeof isSr != 'undefined' && (this.uid = uid) + server && (this.server = server) + + // init this.game = 'genshin' + if (isSr) this.game = 'honkaisr' - if (typeof isSr !== 'boolean') { - this.game = isSr - } + if (typeof isSr !== 'boolean') this.game = isSr } /** @@ -27,7 +33,7 @@ export default class apiTool { * @param data * @returns */ - getUrlMap = (data = {}) => { + getUrlMap = (data: any = {}) => { let host, hostRecord, hostPublicData if ( ['cn_gf01', 'cn_qd01', 'prod_gf_cn', 'prod_qd_cn'].includes(this.server)