feat & fix: 更改文件名命名, getInformation 接口返回完整头像链接

smileShirmy · smileShirmy · commit 73c284b84e76 · 2020-04-15T23:08:47.000+08:00
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Lin-CMS 是林间有风团队经过大量项目实践所提炼出的一套**内
 
 lin-mizar(核心库) ：0.3.2
 
-lin-cms-koa(当前示例工程)：0.3.1
+lin-cms-koa(当前示例工程)：0.3.3
 
 ### 文档地址
 
@@ -61,7 +61,12 @@ QQ 群号：643205479
 
 ## 版本日志
 
-最新版本 `0.3.2`
+最新版本 `0.3.3`
+
+### 0.3.3
+
+1. `F` `GET /cms/user/information` 返回完整的头像链接
+2. `F` 文件名重命名为用 `-` 连接，并且使用单数
 
 ### 0.3.2
 
diff --git a/app/api/cms/admin.js b/app/api/cms/admin.js
@@ -8,11 +8,11 @@ import {
   DispatchPermissionValidator,
   DispatchPermissionsValidator,
   RemovePermissionsValidator
-} from '../../validators/admin';
+} from '../../validator/admin';
 import {
   PositiveIdValidator,
   PaginateValidator
-} from '../../validators/common';
+} from '../../validator/common';
 
 import { adminRequired } from '../../middleware/jwt';
 import { AdminDao } from '../../dao/admin';
diff --git a/app/api/cms/file.js b/app/api/cms/file.js
@@ -1,7 +1,7 @@
 import { LinRouter, ParametersException } from 'lin-mizar';
 
 import { loginRequired } from '../../middleware/jwt';
-import { LocalUploader } from '../../extensions/file/local-uploader';
+import { LocalUploader } from '../../extension/file/local-uploader';
 
 const file = new LinRouter({
   prefix: '/cms/file'
diff --git a/app/api/cms/log.js b/app/api/cms/log.js
@@ -1,6 +1,6 @@
 import { LinRouter, NotFound } from 'lin-mizar';
-import { LogFindValidator } from '../../validators/log';
-import { PaginateValidator } from '../../validators/common';
+import { LogFindValidator } from '../../validator/log';
+import { PaginateValidator } from '../../validator/common';
 
 import { groupRequired } from '../../middleware/jwt';
 import { LogDao } from '../../dao/log';
diff --git a/app/api/cms/user.js b/app/api/cms/user.js
@@ -4,14 +4,14 @@ import {
   LoginValidator,
   UpdateInfoValidator,
   ChangePasswordValidator
-} from '../../validators/user';
+} from '../../validator/user';
 
 import {
   adminRequired,
   loginRequired,
   refreshTokenRequiredWithUnifyException
 } from '../../middleware/jwt';
-import { UserIdentityModel } from '../../models/user';
+import { UserIdentityModel } from '../../model/user';
 import { logger } from '../../middleware/logger';
 import { UserDao } from '../../dao/user';
 
diff --git a/app/api/v1/book.js b/app/api/v1/book.js
@@ -3,11 +3,11 @@ import { groupRequired } from '../../middleware/jwt';
 import {
   BookSearchValidator,
   CreateOrUpdateBookValidator
-} from '../../validators/book';
-import { PositiveIdValidator } from '../../validators/common';
+} from '../../validator/book';
+import { PositiveIdValidator } from '../../validator/common';
 
-import { getSafeParamId } from '../../libs/util';
-import { BookNotFound } from '../../libs/err-code';
+import { getSafeParamId } from '../../lib/util';
+import { BookNotFound } from '../../lib/err-code';
 import { BookDao } from '../../dao/book';
 
 // book 的红图实例
diff --git a/app/app.js b/app/app.js
@@ -4,7 +4,7 @@ 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 './models/permission';
+import { PermissionModel } from './model/permission';
 
 /**
  * 首页
diff --git a/app/config/setting.js b/app/config/setting.js
@@ -18,7 +18,7 @@ module.exports = {
     //   // determine a plugin work or not
     //   enable: true,
     //   // path of the plugin
-    //   path: "app/plugins/poem",
+    //   path: "app/plugin/poem",
     //   // other config
     //   limit: 2
     // },
diff --git a/app/dao/admin.js b/app/dao/admin.js
@@ -1,12 +1,12 @@
 import { NotFound, Forbidden } from 'lin-mizar';
-import { PermissionModel } from '../models/permission';
-import { UserModel, UserIdentityModel } from '../models/user';
-import { GroupModel } from '../models/group';
+import { PermissionModel } from '../model/permission';
+import { UserModel, UserIdentityModel } from '../model/user';
+import { GroupModel } from '../model/group';
 
-import { GroupPermissionModel } from '../models/group-permission';
-import { UserGroupModel } from '../models/user-group';
+import { GroupPermissionModel } from '../model/group-permission';
+import { UserGroupModel } from '../model/user-group';
 
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 import { Op } from 'sequelize';
 import { has, set, get } from 'lodash';
 
diff --git a/app/dao/book.js b/app/dao/book.js
@@ -1,5 +1,5 @@
 import { NotFound, Forbidden } from 'lin-mizar';
-import { Book } from '../models/book';
+import { Book } from '../model/book';
 import Sequelize from 'sequelize';
 
 class BookDao {
diff --git a/app/dao/log.js b/app/dao/log.js
@@ -1,7 +1,7 @@
 import Sequelize from 'sequelize';
-import { LogModel } from '../models/log';
+import { LogModel } from '../model/log';
 import { set } from 'lodash';
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 
 class LogDao {
   async getLogs (v) {
diff --git a/app/dao/user.js b/app/dao/user.js
@@ -1,11 +1,11 @@
-import { RepeatException, generate, NotFound, Forbidden } from 'lin-mizar';
-import { UserModel, UserIdentityModel, identityType } from '../models/user';
-import { UserGroupModel } from '../models/user-group';
-import { GroupPermissionModel } from '../models/group-permission';
-import { PermissionModel } from '../models/permission';
-import { GroupModel } from '../models/group';
-
-import sequelize from '../libs/db';
+import { RepeatException, generate, NotFound, Forbidden, config } from 'lin-mizar';
+import { UserModel, UserIdentityModel, identityType } from '../model/user';
+import { UserGroupModel } from '../model/user-group';
+import { GroupPermissionModel } from '../model/group-permission';
+import { PermissionModel } from '../model/permission';
+import { GroupModel } from '../model/group';
+
+import sequelize from '../lib/db';
 import { Op } from 'sequelize';
 import { set, has, uniq } from 'lodash';
 
@@ -108,6 +108,7 @@ class UserDao {
         }
       }
     });
+    
     set(user, 'groups', groups);
     return user;
   }
diff --git a/app/extension/file/config.js b/app/extension/file/config.js
diff --git a/app/extension/file/local-uploader.js b/app/extension/file/local-uploader.js
@@ -1,5 +1,5 @@
 import { Uploader, config } from 'lin-mizar';
-import { FileModel } from '../../models/file';
+import { FileModel } from '../../model/file';
 import fs from 'fs';
 import path from 'path';
 
@@ -53,7 +53,7 @@ class LocalUploader extends Uploader {
         arr.push({
           id: saved.id,
           key: file.fieldname,
-          path: exist.path,
+          path: saved.path,
           url: `${siteDomain}/assets/${saved.path}`,
           type: saved.type,
           name: file.name,
diff --git a/app/lib/db.js b/app/lib/db.js
diff --git a/app/lib/err-code.js b/app/lib/err-code.js
diff --git a/app/lib/util.js b/app/lib/util.js
diff --git a/app/middleware/jwt.js b/app/middleware/jwt.js
@@ -6,11 +6,11 @@ import {
   TokenType,
   routeMetaInfo
 } from 'lin-mizar';
-import { UserGroupModel } from '../models/user-group';
-import { GroupModel } from '../models/group';
-import { GroupPermissionModel } from '../models/group-permission';
-import { PermissionModel } from '../models/permission';
-import { UserModel } from '../models/user';
+import { UserGroupModel } from '../model/user-group';
+import { GroupModel } from '../model/group';
+import { GroupPermissionModel } from '../model/group-permission';
+import { PermissionModel } from '../model/permission';
+import { UserModel } from '../model/user';
 import { Op } from 'sequelize';
 import { uniq } from 'lodash';
 
diff --git a/app/middleware/logger.js b/app/middleware/logger.js
@@ -1,6 +1,6 @@
 import { get } from 'lodash';
 import { routeMetaInfo, assert } from 'lin-mizar';
-import { LogModel } from '../models/log';
+import { LogModel } from '../model/log';
 
 const REG_XP = /(?<=\{)[^}]*(?=\})/g;
 
diff --git a/app/model/book.js b/app/model/book.js
@@ -1,7 +1,7 @@
 import { InfoCrudMixin } from 'lin-mizar';
 import { merge } from 'lodash';
 import { Sequelize, Model } from 'sequelize';
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 
 class Book extends Model {
   toJSON () {
diff --git a/app/model/file.js b/app/model/file.js
@@ -1,5 +1,5 @@
 import { Model, Sequelize } from 'sequelize';
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 
 class File extends Model {
   static async createRecord (args, commit) {
diff --git a/app/model/group-permission.js b/app/model/group-permission.js
@@ -1,5 +1,5 @@
 import { Model, Sequelize } from 'sequelize';
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 
 class GroupPermission extends Model {}
 
diff --git a/app/model/group.js b/app/model/group.js
@@ -1,4 +1,4 @@
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 import { Model, Sequelize } from 'sequelize';
 import { has, get } from 'lodash';
 
diff --git a/app/model/log.js b/app/model/log.js
@@ -1,4 +1,4 @@
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 import { Model, Sequelize } from 'sequelize';
 
 class Log extends Model {
diff --git a/app/model/permission.js b/app/model/permission.js
@@ -1,4 +1,4 @@
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 import { Model, Sequelize, Op } from 'sequelize';
 import { routeMetaInfo } from 'lin-mizar';
 import { GroupPermissionModel } from './group-permission';
diff --git a/app/model/user-group.js b/app/model/user-group.js
@@ -1,5 +1,5 @@
 import { Model, Sequelize } from 'sequelize';
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 
 class UserGroup extends Model {}
 
diff --git a/app/model/user.js b/app/model/user.js
@@ -1,6 +1,6 @@
-import { NotFound, verify, AuthFailed, generate, Failed } from 'lin-mizar';
+import { NotFound, verify, AuthFailed, generate, Failed, config } from 'lin-mizar';
 
-import sequelize from '../libs/db';
+import sequelize from '../lib/db';
 import { Model, Sequelize } from 'sequelize';
 import { get, has, unset } from 'lodash';
 
@@ -118,7 +118,7 @@ class User extends Model {
       username: this.username,
       nickname: this.nickname,
       email: this.email,
-      avatar: this.avatar
+      avatar: `${config.getItem('siteDomain', 'http://localhost')}/assets/${this.avatar}`
     };
     if (has(this, 'groups')) {
       return { ...origin, groups: get(this, 'groups', []) };
diff --git a/app/plugin/poem/app/controller.js b/app/plugin/poem/app/controller.js
@@ -1,5 +1,5 @@
 import Router from 'koa-router';
-import { PoemListValidator, PoemSearchValidator } from './validators';
+import { PoemListValidator, PoemSearchValidator } from './validator';
 import { Poem } from './model';
 
 const api = new Router({ prefix: '/poem' });
diff --git a/app/plugin/poem/app/index.js b/app/plugin/poem/app/index.js
diff --git a/app/plugin/poem/app/model.js b/app/plugin/poem/app/model.js
@@ -1,7 +1,7 @@
 import { InfoCrudMixin } from 'lin-mizar';
 import { merge } from 'lodash';
 import { Sequelize, Model } from 'sequelize';
-import sequelize from '../../../libs/db';
+import sequelize from '../../../lib/db';
 
 const { config } = require('lin-mizar/lin/config');
 
diff --git a/app/plugin/poem/app/validator.js b/app/plugin/poem/app/validator.js
diff --git a/app/plugin/poem/config.js b/app/plugin/poem/config.js
diff --git a/app/starter.js b/app/starter.js
@@ -25,7 +25,7 @@ function applyConfig () {
     config.getConfigFromFile(`app/config/${file}`);
   }
   // 加载其它配置文件
-  config.getConfigFromFile('app/extensions/file/config.js');
+  config.getConfigFromFile('app/extension/file/config.js');
 }
 
 const run = async () => {
diff --git a/app/validator/admin.js b/app/validator/admin.js
@@ -1,5 +1,5 @@
 import { Rule, LinValidator } from 'lin-mizar';
-import { isOptional } from '../libs/util';
+import { isOptional } from '../lib/util';
 import { PaginateValidator, PositiveIdValidator } from './common';
 import validator from 'validator';
 
diff --git a/app/validator/book.js b/app/validator/book.js
diff --git a/app/validator/common.js b/app/validator/common.js
diff --git a/app/validator/log.js b/app/validator/log.js
@@ -1,6 +1,6 @@
 import { Rule, checkDateFormat } from 'lin-mizar';
 import { PaginateValidator } from './common';
-import { isOptional } from '../libs/util';
+import { isOptional } from '../lib/util';
 
 class LogFindValidator extends PaginateValidator {
   constructor () {
diff --git a/app/validator/user.js b/app/validator/user.js
@@ -1,5 +1,5 @@
 import { LinValidator, Rule } from 'lin-mizar';
-import { isOptional } from '../libs/util';
+import { isOptional } from '../lib/util';
 import validator from 'validator';
 
 class RegisterValidator extends LinValidator {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lin-cms-koa",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "description": "simple and practical CMS implememted by koa",
   "main": "app/starter.js",
   "scripts": {
diff --git a/test/api/cms/test1.test.js b/test/api/cms/test1.test.js
@@ -1,7 +1,7 @@
 import '../../helper/initial';
 import request from 'supertest';
 import { createApp } from '../../../app/app';
-import sequelize from '../../../app/libs/db';
+import sequelize from '../../../app/lib/db';
 
 describe('test1.test.js', () => {
   // 必须，app示例
diff --git a/test/api/cms/user1.test.js b/test/api/cms/user1.test.js
@@ -1,7 +1,7 @@
 import '../../helper/initial';
 import request from 'supertest';
 import { createApp } from '../../../app/app';
-import sequelize from '../../../app/libs/db';
+import sequelize from '../../../app/lib/db';
 import { saveTokens } from '../../helper/token';
 
 describe('user1.test.js', () => {
diff --git a/test/api/cms/user2.test.js b/test/api/cms/user2.test.js
@@ -1,7 +1,7 @@
 import '../../helper/initial';
 import request from 'supertest';
 import { createApp } from '../../../app/app';
-import sequelize from '../../../app/libs/db';
+import sequelize from '../../../app/lib/db';
 import { getToken } from '../../helper/token';
 
 describe('user2.test.js', () => {
diff --git a/test/helper/fake-book/fake-book.js b/test/helper/fake-book/fake-book.js
@@ -1,6 +1,6 @@
 import '../initial';
-import sequelize from '../../../app/libs/db';
-import { Book } from '../../../app/models/book';
+import sequelize from '../../../app/lib/db';
+import { Book } from '../../../app/model/book';
 
 const run = async () => {
   await Book.bulkCreate([
diff --git a/test/helper/fake-book/index.js b/test/helper/fake-book/index.js
@@ -1,3 +1,3 @@
 require('@babel/register');
 
-require('./fake_book');
+require('./fake-book');
diff --git a/test/helper/fake/fake.js b/test/helper/fake/fake.js
diff --git a/test/helper/fake/index.js b/test/helper/fake/index.js
diff --git a/test/helper/initial.js b/test/helper/initial.js
diff --git a/test/helper/poem/index.js b/test/helper/poem/index.js
diff --git a/test/helper/poem/poem.js b/test/helper/poem/poem.js
diff --git a/test/helper/token.js b/test/helper/token.js
