兼容serverless部署,修改插件配置无需重启

This commit is contained in:
ap 2021-03-10 00:57:33 +08:00
parent 5563a4adbf
commit a59308fc6f
12 changed files with 90 additions and 86 deletions

6
f.yml
View File

@ -5,4 +5,8 @@ provider:
runtime: nodejs12 runtime: nodejs12
memorySize: 512 memorySize: 512
deployType: egg ## 部署的应用类型 deployType: egg ## 部署的应用类型
package:
include:
- public/*

View File

@ -1,81 +1,82 @@
{ {
"name": "cool-admin", "name": "cool-admin",
"version": "3.0.0", "version": "3.0.0",
"description": "", "description": "",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@midwayjs/decorator": "^2.7.5", "@midwayjs/decorator": "^2.7.5",
"@midwayjs/orm": "^1.3.0", "@midwayjs/orm": "^1.3.0",
"@midwayjs/web": "^2.7.7", "@midwayjs/web": "^2.7.7",
"egg": "^2.29.3", "egg": "^2.29.3",
"egg-scripts": "^2.13.0", "egg-scripts": "^2.13.0",
"egg-view-nunjucks": "^2.3.0", "egg-view-nunjucks": "^2.3.0",
"ipip-ipdb": "^0.3.0", "ipip-ipdb": "^0.3.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"md5": "^2.3.0", "md5": "^2.3.0",
"midwayjs-cool-core": "/Users/ap/Documents/srcs/cool-admin/midway-core/core/dist", "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-oss": "/Users/ap/Documents/srcs/cool-admin/midway-core/oss/dist",
"midwayjs-cool-wxpay": "^1.0.10", "midwayjs-cool-redis": "/Users/ap/Documents/srcs/cool-admin/midway-core/redis/dist",
"mysql2": "^2.2.5", "midwayjs-cool-wxpay": "^1.0.10",
"svg-captcha": "^1.4.0", "mysql2": "^2.2.5",
"svg-to-dataurl": "^1.0.0" "svg-captcha": "^1.4.0",
}, "svg-to-dataurl": "^1.0.0"
"devDependencies": { },
"@midwayjs/cli": "^1.2.41", "devDependencies": {
"@midwayjs/cli-plugin-faas": "^1.2.49", "@midwayjs/cli": "^1.2.41",
"@midwayjs/egg-ts-helper": "^1.0.5", "@midwayjs/cli-plugin-faas": "^1.2.49",
"@midwayjs/fcli-plugin-fc": "^1.2.49", "@midwayjs/egg-ts-helper": "^1.0.5",
"@midwayjs/luckyeye": "^1.0.2", "@midwayjs/fcli-plugin-fc": "^1.2.49",
"@midwayjs/mock": "^2.7.7", "@midwayjs/luckyeye": "^1.0.2",
"@types/jest": "^26.0.20", "@midwayjs/mock": "^2.7.7",
"@types/jsonwebtoken": "^8.5.0", "@types/jest": "^26.0.20",
"@types/node": "14", "@types/jsonwebtoken": "^8.5.0",
"cross-env": "^7.0.3", "@types/node": "14",
"jest": "^26.6.3", "cross-env": "^7.0.3",
"mwts": "^1.1.2", "jest": "^26.6.3",
"ts-jest": "^26.5.2", "mwts": "^1.1.2",
"typescript": "^4.2.2" "ts-jest": "^26.5.2",
}, "typescript": "^4.2.2"
"engines": { },
"node": ">=12.0.0" "engines": {
}, "node": ">=12.0.0"
"scripts": { },
"start": "egg-scripts start --daemon --title=cool-admin-midway --framework=@midwayjs/web --port=8001 --sticky", "scripts": {
"stop": "egg-scripts stop --title=cool-admin-midway", "start": "egg-scripts start --daemon --title=cool-admin-midway --framework=@midwayjs/web --port=8001 --sticky",
"start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev", "stop": "egg-scripts stop --title=cool-admin-midway",
"docker": "egg-scripts start --title=cool-admin-midway --framework=@midwayjs/web", "start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev",
"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", "docker": "egg-scripts start --title=cool-admin-midway --framework=@midwayjs/web",
"test": "midway-bin test", "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",
"cov": "midway-bin cov", "test": "midway-bin test",
"lint": "mwts check", "cov": "midway-bin cov",
"lint:fix": "mwts fix", "lint": "mwts check",
"ci": "npm run cov", "lint:fix": "mwts fix",
"build": "midway-bin build -c", "ci": "npm run cov",
"check": "luckyeye", "build": "midway-bin build -c",
"deploy": "midway-bin deploy" "check": "luckyeye",
}, "deploy": "midway-bin deploy"
"midway-bin-clean": [ },
".vscode/.tsbuildinfo", "midway-bin-clean": [
"dist" ".vscode/.tsbuildinfo",
], "dist"
"midway-luckyeye": { ],
"packages": [ "midway-luckyeye": {
"midway_v2" "packages": [
] "midway_v2"
}, ]
"midway-integration": { },
"lifecycle": { "midway-integration": {
"before:package:cleanup": "npm run build" "lifecycle": {
} "before:package:cleanup": "npm run build"
}, }
"egg": { },
"framework": "@midwayjs/web" "egg": {
}, "framework": "@midwayjs/web"
"repository": { },
"type": "git", "repository": {
"url": "" "type": "git",
}, "url": ""
"author": "cool-js.com", },
"license": "MIT" "author": "cool-js.com",
"license": "MIT"
} }

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

1
public/uploads/说明.md Normal file
View File

@ -0,0 +1 @@
文件上传目录

View File

@ -55,9 +55,7 @@ export class BaseAuthorityMiddleware implements IWebMiddleware {
return; return;
} }
// 需要动态获得缓存 // 需要动态获得缓存
this.coolCache = await this.app this.coolCache = await ctx.requestContext.getAsync('cool:cache');
.getApplicationContext()
.getAsync('cool:cache');
// 判断密码版本是否正确 // 判断密码版本是否正确
const passwordV = await this.coolCache.get( const passwordV = await this.coolCache.get(
`admin:passwordVersion:${ctx.admin.userId}` `admin:passwordVersion:${ctx.admin.userId}`

View File

@ -24,7 +24,7 @@ export default (appInfo: EggAppInfo) => {
// 靜態目錄及緩存設置 // 靜態目錄及緩存設置
config.static = { config.static = {
prefix: '/', prefix: '/',
dir: path.join(appInfo.baseDir, 'app/public'), dir: path.join(appInfo.baseDir, '..', 'public'),
dynamic: true, dynamic: true,
preload: false, preload: false,
// maxAge: 31536000, // maxAge: 31536000,

View File

@ -4,7 +4,7 @@ import { Application } from 'egg';
import * as orm from '@midwayjs/orm'; import * as orm from '@midwayjs/orm';
import * as cool from 'midwayjs-cool-core'; import * as cool from 'midwayjs-cool-core';
import * as wxpay from 'midwayjs-cool-wxpay'; 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 redis from 'midwayjs-cool-redis';
// import * as queue from 'midwayjs-cool-queue'; // import * as queue from 'midwayjs-cool-queue';
// import * as alipay from 'midwayjs-cool-alipay'; // 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-admin 官方组件 https://www.cool-js.com
cool, cool,
// oss插件需要到后台配置之后才有用默认是本地上传 // oss插件需要到后台配置之后才有用默认是本地上传
//oss, oss,
// 将缓存替换成redis // 将缓存替换成redis
redis, redis,
// 队列 // 队列