diff --git a/f.yml b/f.yml index dcbca2b..853dede 100644 --- a/f.yml +++ b/f.yml @@ -5,4 +5,8 @@ provider: runtime: nodejs12 memorySize: 512 -deployType: egg ## 部署的应用类型 \ No newline at end of file +deployType: egg ## 部署的应用类型 + +package: + include: + - public/* \ No newline at end of file diff --git a/package.json b/package.json index 8707b67..6ef672e 100755 --- a/package.json +++ b/package.json @@ -1,81 +1,82 @@ { - "name": "cool-admin", - "version": "3.0.0", - "description": "", - "private": true, - "dependencies": { - "@midwayjs/decorator": "^2.7.5", - "@midwayjs/orm": "^1.3.0", - "@midwayjs/web": "^2.7.7", - "egg": "^2.29.3", - "egg-scripts": "^2.13.0", - "egg-view-nunjucks": "^2.3.0", - "ipip-ipdb": "^0.3.0", - "jsonwebtoken": "^8.5.1", - "lodash": "^4.17.21", - "md5": "^2.3.0", - "midwayjs-cool-core": "/Users/ap/Documents/srcs/cool-admin/midway-core/core/dist", - "midwayjs-cool-redis": "/Users/ap/Documents/srcs/cool-admin/midway-core/redis/dist", - "midwayjs-cool-wxpay": "^1.0.10", - "mysql2": "^2.2.5", - "svg-captcha": "^1.4.0", - "svg-to-dataurl": "^1.0.0" - }, - "devDependencies": { - "@midwayjs/cli": "^1.2.41", - "@midwayjs/cli-plugin-faas": "^1.2.49", - "@midwayjs/egg-ts-helper": "^1.0.5", - "@midwayjs/fcli-plugin-fc": "^1.2.49", - "@midwayjs/luckyeye": "^1.0.2", - "@midwayjs/mock": "^2.7.7", - "@types/jest": "^26.0.20", - "@types/jsonwebtoken": "^8.5.0", - "@types/node": "14", - "cross-env": "^7.0.3", - "jest": "^26.6.3", - "mwts": "^1.1.2", - "ts-jest": "^26.5.2", - "typescript": "^4.2.2" - }, - "engines": { - "node": ">=12.0.0" - }, - "scripts": { - "start": "egg-scripts start --daemon --title=cool-admin-midway --framework=@midwayjs/web --port=8001 --sticky", - "stop": "egg-scripts stop --title=cool-admin-midway", - "start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev", - "docker": "egg-scripts start --title=cool-admin-midway --framework=@midwayjs/web", - "dev": "cross-env ets && cross-env NODE_ENV=local TS_NODE_TYPE_CHECK=false TS_NODE_TRANSPILE_ONLY=true midway-bin dev --ts --port=8001 --sticky", - "test": "midway-bin test", - "cov": "midway-bin cov", - "lint": "mwts check", - "lint:fix": "mwts fix", - "ci": "npm run cov", - "build": "midway-bin build -c", - "check": "luckyeye", - "deploy": "midway-bin deploy" - }, - "midway-bin-clean": [ - ".vscode/.tsbuildinfo", - "dist" - ], - "midway-luckyeye": { - "packages": [ - "midway_v2" - ] - }, - "midway-integration": { - "lifecycle": { - "before:package:cleanup": "npm run build" - } - }, - "egg": { - "framework": "@midwayjs/web" - }, - "repository": { - "type": "git", - "url": "" - }, - "author": "cool-js.com", - "license": "MIT" + "name": "cool-admin", + "version": "3.0.0", + "description": "", + "private": true, + "dependencies": { + "@midwayjs/decorator": "^2.7.5", + "@midwayjs/orm": "^1.3.0", + "@midwayjs/web": "^2.7.7", + "egg": "^2.29.3", + "egg-scripts": "^2.13.0", + "egg-view-nunjucks": "^2.3.0", + "ipip-ipdb": "^0.3.0", + "jsonwebtoken": "^8.5.1", + "lodash": "^4.17.21", + "md5": "^2.3.0", + "midwayjs-cool-core": "/Users/ap/Documents/srcs/cool-admin/midway-core/core/dist", + "midwayjs-cool-oss": "/Users/ap/Documents/srcs/cool-admin/midway-core/oss/dist", + "midwayjs-cool-redis": "/Users/ap/Documents/srcs/cool-admin/midway-core/redis/dist", + "midwayjs-cool-wxpay": "^1.0.10", + "mysql2": "^2.2.5", + "svg-captcha": "^1.4.0", + "svg-to-dataurl": "^1.0.0" + }, + "devDependencies": { + "@midwayjs/cli": "^1.2.41", + "@midwayjs/cli-plugin-faas": "^1.2.49", + "@midwayjs/egg-ts-helper": "^1.0.5", + "@midwayjs/fcli-plugin-fc": "^1.2.49", + "@midwayjs/luckyeye": "^1.0.2", + "@midwayjs/mock": "^2.7.7", + "@types/jest": "^26.0.20", + "@types/jsonwebtoken": "^8.5.0", + "@types/node": "14", + "cross-env": "^7.0.3", + "jest": "^26.6.3", + "mwts": "^1.1.2", + "ts-jest": "^26.5.2", + "typescript": "^4.2.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "scripts": { + "start": "egg-scripts start --daemon --title=cool-admin-midway --framework=@midwayjs/web --port=8001 --sticky", + "stop": "egg-scripts stop --title=cool-admin-midway", + "start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev", + "docker": "egg-scripts start --title=cool-admin-midway --framework=@midwayjs/web", + "dev": "cross-env ets && cross-env NODE_ENV=local TS_NODE_TYPE_CHECK=false TS_NODE_TRANSPILE_ONLY=true midway-bin dev --ts --port=8001 --sticky", + "test": "midway-bin test", + "cov": "midway-bin cov", + "lint": "mwts check", + "lint:fix": "mwts fix", + "ci": "npm run cov", + "build": "midway-bin build -c", + "check": "luckyeye", + "deploy": "midway-bin deploy" + }, + "midway-bin-clean": [ + ".vscode/.tsbuildinfo", + "dist" + ], + "midway-luckyeye": { + "packages": [ + "midway_v2" + ] + }, + "midway-integration": { + "lifecycle": { + "before:package:cleanup": "npm run build" + } + }, + "egg": { + "framework": "@midwayjs/web" + }, + "repository": { + "type": "git", + "url": "" + }, + "author": "cool-js.com", + "license": "MIT" } diff --git a/src/app/public/css/welcome.css b/public/css/welcome.css similarity index 100% rename from src/app/public/css/welcome.css rename to public/css/welcome.css diff --git a/src/app/public/favicon.ico b/public/favicon.ico similarity index 100% rename from src/app/public/favicon.ico rename to public/favicon.ico diff --git a/src/app/public/js/welcome.js b/public/js/welcome.js similarity index 100% rename from src/app/public/js/welcome.js rename to public/js/welcome.js diff --git a/public/uploads/20210310/58564110-80f6-11eb-b397-8744a989342b.jpg b/public/uploads/20210310/58564110-80f6-11eb-b397-8744a989342b.jpg new file mode 100644 index 0000000..2bee603 Binary files /dev/null and b/public/uploads/20210310/58564110-80f6-11eb-b397-8744a989342b.jpg differ diff --git a/public/uploads/20210310/7f62bea0-80f6-11eb-b397-8744a989342b.jpg b/public/uploads/20210310/7f62bea0-80f6-11eb-b397-8744a989342b.jpg new file mode 100644 index 0000000..559d886 Binary files /dev/null and b/public/uploads/20210310/7f62bea0-80f6-11eb-b397-8744a989342b.jpg differ diff --git a/public/uploads/20210310/b22e6ff0-80f6-11eb-b397-8744a989342b.png b/public/uploads/20210310/b22e6ff0-80f6-11eb-b397-8744a989342b.png new file mode 100644 index 0000000..f8ff77d Binary files /dev/null and b/public/uploads/20210310/b22e6ff0-80f6-11eb-b397-8744a989342b.png differ diff --git a/public/uploads/说明.md b/public/uploads/说明.md new file mode 100644 index 0000000..22a298f --- /dev/null +++ b/public/uploads/说明.md @@ -0,0 +1 @@ +文件上传目录 \ No newline at end of file diff --git a/src/app/modules/base/middleware/authority.ts b/src/app/modules/base/middleware/authority.ts index 8049c6a..0db2e72 100644 --- a/src/app/modules/base/middleware/authority.ts +++ b/src/app/modules/base/middleware/authority.ts @@ -55,9 +55,7 @@ export class BaseAuthorityMiddleware implements IWebMiddleware { return; } // 需要动态获得缓存 - this.coolCache = await this.app - .getApplicationContext() - .getAsync('cool:cache'); + this.coolCache = await ctx.requestContext.getAsync('cool:cache'); // 判断密码版本是否正确 const passwordV = await this.coolCache.get( `admin:passwordVersion:${ctx.admin.userId}` diff --git a/src/config/config.default.ts b/src/config/config.default.ts index 43e6b52..969699c 100644 --- a/src/config/config.default.ts +++ b/src/config/config.default.ts @@ -24,7 +24,7 @@ export default (appInfo: EggAppInfo) => { // 靜態目錄及緩存設置 config.static = { prefix: '/', - dir: path.join(appInfo.baseDir, 'app/public'), + dir: path.join(appInfo.baseDir, '..', 'public'), dynamic: true, preload: false, // maxAge: 31536000, diff --git a/src/configuration.ts b/src/configuration.ts index 80adddf..9c0f3b4 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -4,7 +4,7 @@ import { Application } from 'egg'; import * as orm from '@midwayjs/orm'; import * as cool from 'midwayjs-cool-core'; import * as wxpay from 'midwayjs-cool-wxpay'; -// import * as oss from 'midwayjs-cool-oss'; +import * as oss from 'midwayjs-cool-oss'; import * as redis from 'midwayjs-cool-redis'; // import * as queue from 'midwayjs-cool-queue'; // import * as alipay from 'midwayjs-cool-alipay'; @@ -18,7 +18,7 @@ import * as redis from 'midwayjs-cool-redis'; // 必须，不可移除， cool-admin 官方组件 https://www.cool-js.com cool, // oss插件，需要到后台配置之后才有用，默认是本地上传 - //oss, + oss, // 将缓存替换成redis redis, // 队列