diff --git a/.gitignore b/.gitignore
index a571d04..2487b48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ suspect/
 dist
 learn
 tokens.json
-app/assets
\ No newline at end of file
+assets
\ No newline at end of file
diff --git a/app/api/cms/file.js b/app/api/cms/file.js
index 76b2388..ca09c5f 100644
--- a/app/api/cms/file.js
+++ b/app/api/cms/file.js
@@ -1,18 +1,18 @@
-import { LinRouter, ParametersException } from 'lin-mizar';
+import { LinRouter, ParametersException } from "lin-mizar";
 
-import { loginRequired } from '../../middleware/jwt';
-import { LocalUploader } from '../../extension/file/local-uploader';
+import { loginRequired } from "../../middleware/jwt";
+import { LocalUploader } from "../../extension/file/local-uploader";
 
 const file = new LinRouter({
- prefix: '/cms/file'
+ prefix: "/cms/file",
 });
 
-file.linPost('upload', '/', loginRequired, async ctx => {
+file.linPost("upload", "/", loginRequired, async (ctx) => {
 const files = await ctx.multipart();
 if (files.length < 1) { throw new ParametersException({ code: 10033 }); } - const uploader = new LocalUploader('app/assets'); + const uploader = new LocalUploader("assets"); const arr = await uploader.upload(files); ctx.json(arr); }); diff --git a/app/app.js b/app/app.js index 1b6a37c..cf7b76b 100644 --- a/app/app.js +++ b/app/app.js @@ -1,18 +1,18 @@ -import Koa from 'koa'; -import KoaBodyParser from 'koa-bodyparser'; -import cors from '@koa/cors'; -import mount from 'koa-mount'; -import serve from 'koa-static'; -import { config, json, logging, success, jwt, Loader } from 'lin-mizar'; -import { PermissionModel } from './model/permission'; -import WebSocket from './extension/socket/socket' +import Koa from "koa"; +import KoaBodyParser from "koa-bodyparser"; +import cors from "@koa/cors"; +import mount from "koa-mount"; +import serve from "koa-static"; +import { config, json, logging, success, jwt, Loader } from "lin-mizar"; +import { PermissionModel } from "./model/permission"; +import WebSocket from "./extension/socket/socket"; /** * 首页 */ -function indexPage (app) { - app.context.loader.mainRouter.get('/', async ctx => {
- ctx.type = 'html';
+function indexPage(app) {
+ app.context.loader.mainRouter.get("/", async (ctx) => {
+ ctx.type = "html";
 ctx.body = `<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} a{color:#2E5CD5;cursor:
 pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family:
 "Century Gothic","Microsoft yahei"; color: #333;font-size:18px;} h1{ font-size: 100px; font-weight: normal;
@@ -25,7 +25,7 @@ function indexPage (app) {
 * 跨域支持
 * @param app koa实例
 */
-function applyCors (app) {
+function applyCors(app) {
 app.use(cors());
 }
 
@@ -33,7 +33,7 @@ function applyCors (app) {
 * 解析Body参数
 * @param app koa实例
 */
-function applyBodyParse (app) {
+function applyBodyParse(app) {
 // 参数解析
 app.use(KoaBodyParser());
 }
@@ -43,8 +43,8 @@ function applyBodyParse (app) {
 * @param app koa实例
 * @param prefix 静态资源存放相对路径
 */
-function applyStatic (app, prefix = '/assets') {
- const assetsDir = config.getItem('file.storeDir', 'app/static');
+function applyStatic(app, prefix = "/assets") {
+ const assetsDir = config.getItem("file.storeDir", "app/static");
 app.use(mount(prefix, serve(assetsDir)));
 }
 
@@ -52,7 +52,7 @@ function applyStatic (app, prefix = '/assets') {
 * json logger 扩展
 * @param app koa实例
 */
-function applyDefaultExtends (app) {
+function applyDefaultExtends(app) {
 json(app);
 logging(app);
 success(app);
@@ -62,20 +62,20 @@ function applyDefaultExtends (app) {
 * websocket 扩展
 * @param app koa实例
 */
-function applyWebSocket (app) {
- if (config.getItem('socket.enable')) {
- const server = new WebSocket(app)
- return server.init()
+function applyWebSocket(app) {
+ if (config.getItem("socket.enable")) {
+ const server = new WebSocket(app);
+ return server.init();
 }
- return app
+ return app;
 }
 
 /**
 * loader 加载插件和路由文件
 * @param app koa实例
 */
-function applyLoader (app) {
- const pluginPath = config.getItem('pluginPath');
+function applyLoader(app) {
+ const pluginPath = config.getItem("pluginPath");
 const loader = new Loader(pluginPath, app);
 loader.initLoader();
 }
@@ -84,22 +84,22 @@ function applyLoader (app) {
 * jwt
 * @param app koa实例
 */
-function applyJwt (app) {
- const secret = config.getItem('secret');
+function applyJwt(app) {
+ const secret = config.getItem("secret");
 jwt.initApp(app, secret);
 }
 
 /**
 * 初始化Koa实例
 */
-async function createApp () {
+async function createApp() {
 const app = new Koa();
 applyBodyParse(app);
 applyCors(app);
 applyStatic(app);
- const { log, error, Lin, multipart } = require('lin-mizar');
+ const { log, error, Lin, multipart } = require("lin-mizar");
 app.use(log);
- app.on('error', error);
+ app.on("error", error);
 applyDefaultExtends(app);
 applyLoader(app);
 applyJwt(app);
diff --git a/app/extension/file/config.js b/app/extension/file/config.js
index b1e4b71..7f64d00 100644
--- a/app/extension/file/config.js
+++ b/app/extension/file/config.js
@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
 module.exports = {
 file: {
- storeDir: 'app/assets',
+ storeDir: "assets",
 singleLimit: 1024 * 1024 * 2,
 totalLimit: 1024 * 1024 * 20,
 nums: 10,
- exclude: []
+ exclude: [],
 // include:[]
- }
+ },
 };
diff --git a/app/starter.js b/app/starter.js
index 6bd97f5..8fd999d 100644
--- a/app/starter.js
+++ b/app/starter.js
@@ -1,8 +1,8 @@
-'use strict';
-const fs = require('fs');
-const path = require('path');
+"use strict";
+const fs = require("fs");
+const path = require("path");
 
-const { config } = require('lin-mizar/lin/config');
+const { config } = require("lin-mizar/lin/config");
 
 // router.post('/cms/file', async ctx => {
 // ctx.body = 'Hello World';
@@ -11,16 +11,16 @@ const { config } = require('lin-mizar/lin/config');
 // if (files.length < 1) { // throw new Error('未找到符合条件的文件资源'); // } -// const uploader = new LocalUploader('app/assets'); +// const uploader = new LocalUploader('assets'); // const arr = await uploader.upload(files); // }); /** * 初始化并获取配置 */ -function applyConfig () { +function applyConfig() { // 获取工作目录 - const baseDir = path.resolve(__dirname, '../'); + const baseDir = path.resolve(__dirname, "../"); config.init(baseDir); const files = fs.readdirSync(path.resolve(`${baseDir}/app/config`)); @@ -30,15 +30,15 @@ function applyConfig () { } // 加载其它配置文件 - config.getConfigFromFile('app/extension/file/config.js'); - config.getConfigFromFile('app/extension/socket/config.js'); + config.getConfigFromFile("app/extension/file/config.js"); + config.getConfigFromFile("app/extension/socket/config.js"); } const run = async () => {
 applyConfig();
- const { createApp } = require('./app');
+ const { createApp } = require("./app");
 const app = await createApp();
- const port = config.getItem('port');
+ const port = config.getItem("port");
 app.listen(port, () => {
 console.log(`listening at http://localhost:${port}`);
 });
diff --git a/package.json b/package.json
index b44940c..3d27b82 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
 "koa-bodyparser": "^4.2.1",
 "koa-mount": "^4.0.0",
 "koa-static": "^5.0.0",
- "lin-mizar": "^0.3.8",
+ "lin-mizar": "^0.3.9",
 "mysql2": "^2.1.0",
 "sequelize": "^5.21.13",
 "validator": "^13.1.1",
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/TaleLin/lin-cms-koa/compare/master...shiming.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/TaleLin/lin-cms-koa/compare/master...shiming.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>