From 8917a985b63d1b6c66fcf2a0dd2a2abe6e7ae4f0 Mon Sep 17 00:00:00 2001 From: fanxb Date: Fri, 11 Feb 2022 16:36:51 +0800 Subject: [PATCH] update --- api/ApplicationRuleApi.ts | 29 --------- api/CaptchaApi.ts | 22 +++++++ api/FileApi.ts | 28 --------- api/HostApi.ts | 6 ++ api/RenamerApi.ts | 22 ------- config.ts | 7 ++- dao/ApplicationRuleDao.ts | 38 +----------- entity/dto/.gitkeep | 0 entity/dto/ApplicationRule.ts | 23 ------- entity/vo/.gitkeep | 0 entity/vo/FileObj.ts | 50 --------------- entity/vo/RuleObj.ts | 27 -------- entity/vo/rules/DeleteRule.ts | 92 ---------------------------- entity/vo/rules/InsertRule.ts | 66 -------------------- entity/vo/rules/RuleInterface.ts | 6 -- entity/vo/rules/SerializationRule.ts | 80 ------------------------ index.ts | 5 ++ mysqlSqls/V001_init.sql | 35 ++++++++--- package.json | 4 +- service/ApplicationRuleService.ts | 33 ---------- service/FileService.ts | 58 ------------------ service/RenamerService.ts | 41 ------------- util/RedisHelper.ts | 14 +++++ 23 files changed, 83 insertions(+), 603 deletions(-) delete mode 100644 api/ApplicationRuleApi.ts create mode 100644 api/CaptchaApi.ts delete mode 100644 api/FileApi.ts create mode 100644 api/HostApi.ts delete mode 100644 api/RenamerApi.ts create mode 100644 entity/dto/.gitkeep delete mode 100644 entity/dto/ApplicationRule.ts create mode 100644 entity/vo/.gitkeep delete mode 100644 entity/vo/FileObj.ts delete mode 100644 entity/vo/RuleObj.ts delete mode 100644 entity/vo/rules/DeleteRule.ts delete mode 100644 entity/vo/rules/InsertRule.ts delete mode 100644 entity/vo/rules/RuleInterface.ts delete mode 100644 entity/vo/rules/SerializationRule.ts delete mode 100644 service/ApplicationRuleService.ts delete mode 100644 service/FileService.ts delete mode 100644 service/RenamerService.ts create mode 100644 util/RedisHelper.ts diff --git a/api/ApplicationRuleApi.ts b/api/ApplicationRuleApi.ts deleted file mode 100644 index deabd75..0000000 --- a/api/ApplicationRuleApi.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { Context } from "koa"; -import ApplicationRuleService from "../service/ApplicationRuleService"; -import config from "../config"; - -const router = {}; - -/** - * 获取目录下的文件列表 - */ -router["GET /applicationRule"] = async function (ctx: Context) { - ctx.body = await ApplicationRuleService.getAll(); -}; - -/** - * 更新或者插入 - */ -router['POST /applicationRule'] = async function (ctx: Context) { - ctx.body = await ApplicationRuleService.saveOrAdd(ctx.request.body); -} - -/** - * 删除 - */ -router["DELETE /applicationRule/:id"] = async function (ctx: Context) { - await ApplicationRuleService.deleteById(ctx.params.id); - ctx.body = ""; -}; - -export default router; diff --git a/api/CaptchaApi.ts b/api/CaptchaApi.ts new file mode 100644 index 0000000..8313b54 --- /dev/null +++ b/api/CaptchaApi.ts @@ -0,0 +1,22 @@ +import { Context } from "koa"; +import { create } from "svg-captcha"; +import { v4 as uuid } from 'uuid'; + +import { RedisHelper } from '../util/RedisHelper'; +const router = {}; + +/** + * 获取验证码 + */ +router["GET /captcha"] = async function (ctx: Context) { + let key: string = uuid().replaceAll("-", ""); + let obj = create(); + await RedisHelper.client.set(key, obj.text); + ctx.body = { + key, + data: obj.data + }; + +}; + +export default router; diff --git a/api/FileApi.ts b/api/FileApi.ts deleted file mode 100644 index b4e0e9d..0000000 --- a/api/FileApi.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Context } from "koa"; -import FileService from "../service/FileService"; -import config from "../config"; - -const router = {}; - -/** - * 获取目录下的文件列表 - */ -router["GET /file/query"] = async function (ctx: Context) { - ctx.body = await FileService.readPath(ctx.query.path as string, ctx.query.showHidden === '1'); -}; - -/** - *是否windows - */ -router['GET /file/isWindows'] = async function (ctx:Context) { - ctx.body=config.isWindows; -} - -/** - * 检查路径是否存在 - */ -router["GET /file/path/exist"] = async function (ctx: Context) { - ctx.body = await FileService.checkExist(ctx.query.path as string); -}; - -export default router; diff --git a/api/HostApi.ts b/api/HostApi.ts new file mode 100644 index 0000000..4d22e6f --- /dev/null +++ b/api/HostApi.ts @@ -0,0 +1,6 @@ +import { Context } from "koa"; + +const router = {}; + + +export default router; diff --git a/api/RenamerApi.ts b/api/RenamerApi.ts deleted file mode 100644 index e22e861..0000000 --- a/api/RenamerApi.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Context } from "koa"; -import RenamerService from "../service/RenamerService"; - -const router = {}; - -/** - * 预览文件修改后的状态 - */ -router["POST /renamer/preview"] = async function (ctx: Context) { - ctx.body = await RenamerService.preview(ctx.request.body.fileList, ctx.request.body.ruleList); -}; - -/** - * 提交修改 - */ -router["POST /renamer/submit"] = async function (ctx: Context) { - ctx.body = await RenamerService.rename(ctx.request.body.fileList, ctx.request.body.changedFileList); -}; - - - -export default router; diff --git a/config.ts b/config.ts index 6ed2cdf..1ef83ef 100644 --- a/config.ts +++ b/config.ts @@ -6,9 +6,14 @@ const rootPath = path.resolve(__dirname, '..'); let config = { rootPath, port: process.env.PORT ? parseInt(process.env.PORT) : 8089, - urlPrefix: '/openRenamer/api', + urlPrefix: '/qiezi/api', //是否为windows平台 isWindows: process.platform.toLocaleLowerCase().includes("win"), + //redis相关配置 + redis: { + enable: true, + url: "redis://localhost:6379" + }, //sqlite相关配置 sqlite: { enable: false, //是否启用sqlite diff --git a/dao/ApplicationRuleDao.ts b/dao/ApplicationRuleDao.ts index 41383b6..06e0f19 100644 --- a/dao/ApplicationRuleDao.ts +++ b/dao/ApplicationRuleDao.ts @@ -1,5 +1,4 @@ import ErrorHelper from "../util/ErrorHelper"; -import ApplicationRule from "../entity/dto/ApplicationRule"; import SqliteHelper from "../util/SqliteHelper"; export default class ApplicationRuleDao { @@ -8,45 +7,10 @@ export default class ApplicationRuleDao { * @param obj * @returns */ - static async getAll(): Promise> { + static async getAll(): Promise> { let res = await SqliteHelper.pool.all('select id,createdDate,updatedDate,name,comment,content from application_rule'); return res; } - /** - * 新增 - * @param obj - * @returns - */ - static async addOne(obj: ApplicationRule): Promise { - let res = await SqliteHelper.pool.run('insert into application_rule(createdDate,updatedDate,name,comment,content) values(?,?,?,?,?)' - , obj.createdDate, obj.updatedDate, obj.name, obj.comment, obj.content); - return res.lastID; - } - - /** - * 更新 - * @param obj - */ - static async updateOne(obj: ApplicationRule): Promise { - let res = await SqliteHelper.pool.run('update application_rule set updatedDate=?,name=?,comment=?,content=? where id=?' - , obj.updatedDate, obj.name, obj.comment, obj.content, obj.id); - if (res.changes == 0) { - throw ErrorHelper.Error404("数据不存在"); - } - } - - /** - * 删除 - * @param id - */ - static async delete(id: number): Promise { - let res = await SqliteHelper.pool.run('delete from application_rule where id=?', id); - if (res.changes == 0) { - throw ErrorHelper.Error404("数据不存在"); - } - } - - } \ No newline at end of file diff --git a/entity/dto/.gitkeep b/entity/dto/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/entity/dto/ApplicationRule.ts b/entity/dto/ApplicationRule.ts deleted file mode 100644 index 8692c0b..0000000 --- a/entity/dto/ApplicationRule.ts +++ /dev/null @@ -1,23 +0,0 @@ -export default class ApplicationRule { - /** - 创建时间 - */ - createdDate: number; - /** - 更新时间 - */ - updatedDate: number; - id: number; - /** - 名称 - */ - name: string; - /** - 说明 - */ - comment: string; - /** - 规则内容，json序列化后 - */ - content: string; -} \ No newline at end of file diff --git a/entity/vo/.gitkeep b/entity/vo/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/entity/vo/FileObj.ts b/entity/vo/FileObj.ts deleted file mode 100644 index aa0703b..0000000 --- a/entity/vo/FileObj.ts +++ /dev/null @@ -1,50 +0,0 @@ -import * as pathUtil from "path"; -export default class FileObj { - /** - * 文件名 - */ - name: string; - /** - * 拓展名 - */ - expandName: string; - /** - * 去掉拓展名后的名字 - */ - realName: string; - /** - * 所属路径 - */ - path: string; - /** - * 是否文件夹 - */ - isFolder: boolean; - /** - * 重命名错误原因 - */ - errorMessage: string; - /** - * 创建时间ms - */ - createdTime: number; - /** - * 更新时间ms - */ - updatedTime: number; - - - constructor(name: string, path, isFolder, createdTime, updatedTime) { - this.name = name; - this.expandName = pathUtil.extname(name); - if (this.expandName.length > 0) { - this.realName = name.substring(0, name.lastIndexOf(".")); - } else { - this.realName = name; - } - this.path = path; - this.isFolder = isFolder; - this.createdTime = createdTime; - this.updatedTime = updatedTime; - } -} \ No newline at end of file diff --git a/entity/vo/RuleObj.ts b/entity/vo/RuleObj.ts deleted file mode 100644 index 55122a3..0000000 --- a/entity/vo/RuleObj.ts +++ /dev/null @@ -1,27 +0,0 @@ -import DeleteRule from "./rules/DeleteRule"; -import InsertRule from "./rules/InsertRule"; -import SerializationRule from "./rules/SerializationRule"; - -export default class RuleObj { - type: string; - message: string; - /** - * 具体参数 - */ - data: any; - - constructor(data: any) { - this.type = data.type; - this.message = data.message; - switch (this.type) { - case "delete": - this.data = new DeleteRule(data.data); - break; - case "insert": - this.data = new InsertRule(data.data); - break; - default: - this.data = new SerializationRule(data.data); - } - } -} \ No newline at end of file diff --git a/entity/vo/rules/DeleteRule.ts b/entity/vo/rules/DeleteRule.ts deleted file mode 100644 index aacd042..0000000 --- a/entity/vo/rules/DeleteRule.ts +++ /dev/null @@ -1,92 +0,0 @@ -import RuleInterface from "./RuleInterface"; -import FileObj from "../FileObj"; -import path from 'path'; - -export default class DeleteRule implements RuleInterface { - /** - * 类别：deletePart:部分删除，deleteAll:全部删除 - */ - type: string; - /** - * 部分删除时的开始信息 - */ - start: DeleteRuleItem; - /** - * 部分删除时的结束信息 - - */ - end: DeleteRuleItem; - /** - * 忽略拓展名，true:忽略，false：不忽略 - */ - ignorePostfix: boolean; - - constructor(data: any) { - this.type = data.type; - this.start = new DeleteRuleItem(data.start); - this.end = new DeleteRuleItem(data.end); - this.ignorePostfix = data.ignorePostfix; - } - - - - deal(file: FileObj): void { - if (this.type === 'deleteAll') { - file.realName = ""; - if (!this.ignorePostfix) { - file.expandName = ""; - } - } else { - let str = file.realName + (this.ignorePostfix ? "" : file.expandName); - let startIndex = this.start.calIndex(str); - let endIndex = this.end.calIndex(str); - if (startIndex < 0 || endIndex < 0) { - return; - } - str = str.substring(0, startIndex) + str.substring(endIndex + 1); - if (this.ignorePostfix) { - file.realName = str; - } else { - file.expandName = path.extname(str); - if (file.expandName.length > 0) { - file.realName = str.substring(0, str.lastIndexOf(".")); - } else { - file.realName = str; - } - } - } - - file.name = file.realName + file.expandName; - } - -} - -class DeleteRuleItem { - /** - * location:位置，text:文本，end:直到末尾 - */ - type: string; - /** - * 对应的值 - */ - value: string; - - constructor(data: any) { - this.type = data.type; - this.value = data.value; - } - - /** - * 计算位置 - */ - calIndex(str: string): number { - if (this.type === 'location') { - return parseInt(this.value) - 1; - } else if (this.type === 'text') { - return str.indexOf(this.value); - } else if (this.type === 'end') { - return str.length - 1; - } - return -1; - } -} diff --git a/entity/vo/rules/InsertRule.ts b/entity/vo/rules/InsertRule.ts deleted file mode 100644 index 9f04d58..0000000 --- a/entity/vo/rules/InsertRule.ts +++ /dev/null @@ -1,66 +0,0 @@ -import RuleInterface from "./RuleInterface"; -import FileObj from "../FileObj"; -import path from 'path'; - -export default class InsertRule implements RuleInterface { - - /** - * 插入内容 - */ - insertContent: string; - /** - * 操作类别，front：前缀，backend：后缀，at:位置，replace:替换当前文件名 - */ - type: string; - /** - * 当type为at,时的位置,从1开始 - */ - atInput: number; - /** - * 当type为at,时的方向，true:从右到左，false:从左到右 - */ - atIsRightToleft: boolean; - /** - * 忽略拓展名，true:忽略，false：不忽略 - */ - ignorePostfix: boolean; - - constructor(data: any) { - this.insertContent = data.insertContent; - this.type = data.type; - this.atInput = data.atInput; - this.atIsRightToleft = data.atIsRightToleft; - this.ignorePostfix = data.ignorePostfix; - } - - - deal(file: FileObj): void { - let str = this.ignorePostfix ? file.realName : file.name; - switch (this.type) { - case "front": - str = this.insertContent + str; - break; - case "backend": - str = str + this.insertContent; - break; - case "at": - let index = this.atIsRightToleft ? str.length - this.atInput + 1 : this.atInput - 1; - str = str.substring(0, index) + this.insertContent + str.substring(index); - break; - case "replace": - str = this.insertContent; - break; - } - if (this.ignorePostfix) { - file.realName = str; - } else { - file.expandName = path.extname(str); - if (file.expandName.length > 0) { - file.realName = str.substring(0, str.lastIndexOf(".")); - } else { - file.realName = str; - } - } - file.name = file.realName + file.expandName; - } -} \ No newline at end of file diff --git a/entity/vo/rules/RuleInterface.ts b/entity/vo/rules/RuleInterface.ts deleted file mode 100644 index 84a6b0f..0000000 --- a/entity/vo/rules/RuleInterface.ts +++ /dev/null @@ -1,6 +0,0 @@ -import FileObj from "../FileObj"; - -export default interface RuleInterface { - - deal(file: FileObj): void; -} \ No newline at end of file diff --git a/entity/vo/rules/SerializationRule.ts b/entity/vo/rules/SerializationRule.ts deleted file mode 100644 index 1df7114..0000000 --- a/entity/vo/rules/SerializationRule.ts +++ /dev/null @@ -1,80 +0,0 @@ -import RuleInterface from "./RuleInterface"; -import FileObj from "../FileObj"; -import path from 'path'; - -export default class InsertRule implements RuleInterface { - /** - * 开始位置 - */ - start: number; - /** - * 记录当前的值是多少 - */ - currentIndex: number; - /** - * 增量 - */ - increment: number; - /** - * 是否填充0 - */ - addZero: boolean; - /** - * 填充后长度 - */ - numLength: number; - /** - * 插入位置,front:前缀，backend：后缀，at：位置 - */ - insertType: string; - /** - * 插入的位置 - */ - insertValue: number; - /** - * 忽略拓展名 - */ - ignorePostfix: boolean; - - constructor(data: any) { - this.start = data.start; - this.currentIndex = data.start; - this.increment = data.increment; - this.addZero = data.addZero; - this.numLength = data.numLength; - this.insertType = data.insertType; - this.insertValue = data.insertValue; - this.ignorePostfix = data.ignorePostfix; - } - - deal(file: FileObj): void { - let length = this.currentIndex.toString().length; - let numStr = (this.addZero && this.numLength > length ? "0".repeat(this.numLength - length) : "") + this.currentIndex; - let str = this.ignorePostfix ? file.realName : file.name; - switch (this.insertType) { - case "front": - str = numStr + str; - break; - case "backend": - str = str + numStr; - break; - case "at": - str = str.substring(0, this.insertValue - 1) + numStr + str.substring(this.insertValue - 1); - break; - } - this.currentIndex += this.increment; - - if (this.ignorePostfix) { - file.realName = str; - } else { - file.expandName = path.extname(str); - if (file.expandName.length > 0) { - file.realName = str.substring(0, str.lastIndexOf(".")); - } else { - file.realName = str; - } - } - - file.name = file.realName + file.expandName; - } -} \ No newline at end of file diff --git a/index.ts b/index.ts index 333d249..2dc9cb3 100644 --- a/index.ts +++ b/index.ts @@ -10,6 +10,7 @@ import init from "./middleware/init"; import SqliteUtil from './util/SqliteHelper'; import log from './util/LogUtil'; import { MysqlUtil } from "./util/MysqlHelper"; +import { RedisHelper } from "./util/RedisHelper"; log.info(config); @@ -38,6 +39,10 @@ app.use(RouterMW(router, path.join(config.rootPath, "dist/api"))); if (config.mysql.enable) { await MysqlUtil.createPool(); } + //初始化redis + if (config.redis.enable) { + await RedisHelper.create(); + } app.listen(config.port); log.info(`server listened `, config.port); })(); diff --git a/mysqlSqls/V001_init.sql b/mysqlSqls/V001_init.sql index 0c4a156..b7d9287 100644 --- a/mysqlSqls/V001_init.sql +++ b/mysqlSqls/V001_init.sql @@ -5,25 +5,42 @@ CREATE TABLE qiezi.host ( name varchar(100) NOT NULL COMMENT '网站名', host varchar(100) NOT NULL COMMENT '网站域名（不含http前缀以及路径）', pv INT UNSIGNED DEFAULT 0 NOT NULL, - uv varchar(100) DEFAULT 0 NOT NULL, + uv INT UNSIGNED DEFAULT 0 NOT NULL, CONSTRAINT host_pk PRIMARY KEY (id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='host表，记录某个站点总的pv,uv数据'; +CREATE UNIQUE INDEX host_key_IDX USING BTREE ON qiezi.host (`key`); -CREATE TABLE qiezi.path_date( +CREATE TABLE qiezi.host_day( id INT auto_increment NOT NULL, - `key` CHAR(32) NOT NULL COMMENT 'key，用于标识', - secret char(32) NOT NULL COMMENT '密钥', - name varchar(100) NOT NULL COMMENT '网站名', - host varchar(100) NOT NULL COMMENT '网站域名（不含http前缀以及路径）', + hostId INT NOT NULL COMMENT 'hostId', + dateNum INT NOT NULL COMMENT '日期比如20200202', pv INT UNSIGNED DEFAULT 0 NOT NULL, - uv varchar(100) DEFAULT 0 NOT NULL, - CONSTRAINT host_pk PRIMARY KEY (id) + uv INT UNSIGNED DEFAULT 0 NOT NULL, + CONSTRAINT detail_page_pk PRIMARY KEY (id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci -COMMENT='host表，记录某个站点总的pv,uv数据'; +COMMENT='记录域名日pv/uv'; +CREATE INDEX detail_page_host_id_date_IDX USING BTREE ON qiezi.host_day(`hostId`,`dateNum`); + + + + +CREATE TABLE qiezi.detail_page( + id INT auto_increment NOT NULL, + hostId INT NOT NULL COMMENT 'hostId', + pv INT UNSIGNED DEFAULT 0 NOT NULL, + uv INT UNSIGNED DEFAULT 0 NOT NULL, + CONSTRAINT detail_page_pk PRIMARY KEY (id) +) +ENGINE=InnoDB +DEFAULT CHARSET=utf8mb4 +COLLATE=utf8mb4_0900_ai_ci +COMMENT='detail表，记录细分页面pv/uv'; +CREATE INDEX detail_page_host_id_IDX USING BTREE ON qiezi.detail_page(`hostId`); + diff --git a/package.json b/package.json index 18a334a..82c4d75 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,11 @@ "log4js": "^6.3.0", "moment": "^2.22.2", "mysql2": "^2.3.3", + "redis": "^4.0.3", "sqlite": "^4.0.23", "sqlite3": "^5.0.2", - "uuid": "^3.3.2", + "svg-captcha": "^1.4.0", + "uuid": "^8.3.2", "winston": "^3.1.0" } } diff --git a/service/ApplicationRuleService.ts b/service/ApplicationRuleService.ts deleted file mode 100644 index 3a648bf..0000000 --- a/service/ApplicationRuleService.ts +++ /dev/null @@ -1,33 +0,0 @@ -import config from '../config'; -import * as path from 'path'; -import * as fs from 'fs-extra'; -import ApplicationRule from '../entity/dto/ApplicationRule'; -import ApplicationRuleDao from '../dao/ApplicationRuleDao'; - - - -class ApplicationRuleService { - static async saveOrAdd(ruleObj: ApplicationRule): Promise { - ruleObj.updatedDate = Date.now(); - if (!ruleObj.id) { - //说明是新增 - ruleObj.createdDate = Date.now(); - ruleObj.id = await ApplicationRuleDao.addOne(ruleObj); - } else { - //说明是修改 - await ApplicationRuleDao.updateOne(ruleObj); - } - return ruleObj; - } - - static async getAll(): Promise> { - return await ApplicationRuleDao.getAll(); - } - - static async deleteById(id: number): Promise { - await ApplicationRuleDao.delete(id); - } - -} - -export default ApplicationRuleService; diff --git a/service/FileService.ts b/service/FileService.ts deleted file mode 100644 index 4148d74..0000000 --- a/service/FileService.ts +++ /dev/null @@ -1,58 +0,0 @@ -import config from '../config'; -import * as path from 'path'; -import * as fs from 'fs-extra'; - -import ProcessHelper from '../util/ProcesHelper'; -import FileObj from '../vo/FileObj'; - -class FileService { - static async readPath(pathStr: string, showHidden: boolean): Promise> { - pathStr = decodeURIComponent(pathStr); - let fileList = new Array(); - if (pathStr.trim().length == 0) { - //获取根目录路径 - if (config.isWindows) { - //windows下 - let std: string = (await ProcessHelper.exec('wmic logicaldisk get caption')).replace('Caption', ''); - fileList = std - .split('\r\n') - .filter((item) => item.trim().length > 0) - .map((item) => item.trim()); - } else { - //linux下 - pathStr = '/'; - fileList = await fs.readdir(pathStr); - } - } else { - fileList = await fs.readdir(pathStr); - } - let folderList: Array = new Array(); - let files: Array = new Array(); - for (let index in fileList) { - try { - let stat = await fs.stat(path.join(pathStr, fileList[index])); - if (fileList[index].startsWith('.')) { - if (showHidden) { - (stat.isDirectory() ? folderList : files).push( - new FileObj(fileList[index], pathStr, stat.isDirectory(), stat.birthtime.getTime(), stat.mtime.getTime()), - ); - } - } else { - (stat.isDirectory() ? folderList : files).push( - new FileObj(fileList[index], pathStr, stat.isDirectory(), stat.birthtime.getTime(), stat.mtime.getTime()), - ); - } - } catch (e) { - console.error(e); - } - } - folderList.sort((a, b) => a.name.localeCompare(b.name)).push(...files.sort((a, b) => a.name.localeCompare(b.name))); - return folderList; - } - - static async checkExist(pathStr: string) { - return await fs.pathExists(pathStr); - } -} - -export default FileService; diff --git a/service/RenamerService.ts b/service/RenamerService.ts deleted file mode 100644 index b6457b6..0000000 --- a/service/RenamerService.ts +++ /dev/null @@ -1,41 +0,0 @@ -import config from '../config'; -import * as path from 'path'; -import * as fs from 'fs-extra'; - -import FileObj from '../vo/FileObj'; -import RuleObj from '../vo/RuleObj'; -import DeleteRule from '../vo/rules/DeleteRule'; -import RuleInterface from '../vo/rules/RuleInterface'; - - -class RenamerService { - static async preview(fileList: Array, ruleList: Array): Promise> { - let ruleObjs = ruleList.map(item => new RuleObj(item)); - let newNameSet: Set = new Set(); - for (let i in fileList) { - let obj = fileList[i]; - ruleObjs.forEach(item => (item.data as RuleInterface).deal(obj)); - if (newNameSet.has(obj.name)) { - obj.errorMessage = "重名"; - } - newNameSet.add(obj.name); - } - return fileList; - } - - static async rename(fileList: Array, changedFileList: Array) { - for (let i in fileList) { - let old = fileList[i]; - let oldPath = path.join(fileList[i].path, fileList[i].name); - let newPath = path.join(changedFileList[i].path, changedFileList[i].name); - if ((await fs.pathExists(newPath))) { - throw new Error("此路径已存在:" + newPath); - } - await fs.rename(oldPath, newPath); - } - } - - -} - -export default RenamerService; diff --git a/util/RedisHelper.ts b/util/RedisHelper.ts new file mode 100644 index 0000000..84bd51e --- /dev/null +++ b/util/RedisHelper.ts @@ -0,0 +1,14 @@ +import { createClient, RedisClientType } from "redis"; +import config from "../config"; +class RedisHelper { + public static client: RedisClientType; + + static async create() { + this.client = await createClient({ url: config.redis.url }); + this.client.set("1","1") + } +} + +export { + RedisHelper +} \ No newline at end of file