Merge branch 'main' of http://git.cc-lotus.info/follow-up/follow_server

src/controller/article.controller.ts

@@ -22,7 +22,7 @@ export class ArticleController extends BaseController {
   @ApiQuery({ name: 'query' })
   @ApiResponse({ type: QVO_article })
   async query(@Query() filter: QDTO_article, @Query('skip') skip: number, @Query('limit') limit: number) {
-    const list = await this.service.query(filter, { skip, limit });
+    const list = await this.service.query(filter, { skip, limit, sort: { create_time: -1 } });
     const data = [];
     for (const i of list) {
       const newData = new QVO_article(i);

src/controller/menus.controller.ts

@@ -18,18 +18,13 @@ export class MenusController extends BaseController {
     const result = new CVO_menus(dbData);
     return result;
   }
+
   @Get('/')
   @ApiQuery({ name: 'query' })
   @ApiResponse({ type: QVO_menus })
-  async query(@Query() filter: QDTO_menus, @Query('skip') skip: number, @Query('limit') limit: number) {
-    const list = await this.service.query(filter, { skip, limit });
-    const data = [];
-    for (const i of list) {
-      const newData = new QVO_menus(i);
-      data.push(newData);
-    }
-    const total = await this.service.count(filter);
-    return { data, total };
+  async query() {
+    const data = await this.service.queryMenu();
+    return data;
   }
 
   @Get('/:id')

src/controller/role.controller.ts

@@ -20,7 +20,7 @@ export class RoleController extends BaseController {
   async userMenu() {
     const user = this.ctx.user;
     if (!user) throw new ServiceError('用户未登录', FrameworkErrorEnum.NOT_LOGIN);
-    const roleInfo = await this.service.findOne({ code: get(user, 'role') });
+    const roleInfo = await this.service.findOne({ code: get(user, 'role'), is_use: '0' });
     const menus = await this.service.getMenuByRoles(get(roleInfo, 'menu', []));
     return menus;
   }

src/entity/article.entity.ts

@@ -7,7 +7,7 @@ import File from 'free-midway-component/dist/entity/fileType';
 export class Article extends BaseModel {
   @prop({ required: false, index: false, zh: '标题' })
   title: string;
-  @prop({ required: false, index: true, zh: '医生' })
+  @prop({ required: false, index: true, zh: '医生', ref: 'Doctor' })
   doctor: string;
   @prop({ required: false, index: false, zh: '来源' })
   origin: string;
@@ -22,10 +22,10 @@ export class Article extends BaseModel {
   brief: string;
   @prop({ required: false, index: false, zh: '内容' })
   content: string;
-  @prop({ required: false, index: false, zh: '附件', remark: 'File类型' })
-  files: File;
   @prop({ required: false, index: false, zh: '备注' })
   remark: string;
+  @prop({ required: false, index: true, zh: '发布时间' })
+  create_time: string;
   @prop({ required: false, index: true, zh: '是否使用', default: '0' })
   is_use: string;
 }

src/interface/article.interface.ts

@@ -26,10 +26,10 @@ export class FVO_article {
   'brief': string = undefined;
   @ApiProperty({ description: '内容' })
   'content': string = undefined;
-  @ApiProperty({ description: '附件' })
-  'files': string = undefined;
   @ApiProperty({ description: '备注' })
   'remark': string = undefined;
+  @ApiProperty({ description: '发布时间' })
+  'create_time': string = undefined;
   @ApiProperty({ description: '是否使用' })
   'is_use': string = undefined;
 }
@@ -37,7 +37,7 @@ export class FVO_article {
 export class QDTO_article extends SearchBase {
   constructor() {
     const like_prop = ['title'];
-    const props = ['doctor', 'is_use'];
+    const props = ['doctor', 'create_time', 'is_use'];
     const mapping = [];
     super({ like_prop, props, mapping });
   }
@@ -45,6 +45,8 @@ export class QDTO_article extends SearchBase {
   'title': string = undefined;
   @ApiProperty({ description: '医生' })
   'doctor': string = undefined;
+  @ApiProperty({ description: '发布时间' })
+  'create_time': string = undefined;
   @ApiProperty({ description: '是否使用' })
   'is_use': string = undefined;
 }
@@ -75,12 +77,12 @@ export class CDTO_article {
   @ApiProperty({ description: '内容' })
   @Rule(RuleType['string']().empty(''))
   'content': string = undefined;
-  @ApiProperty({ description: '附件' })
-  @Rule(RuleType['string']().empty(''))
-  'files': string = undefined;
   @ApiProperty({ description: '备注' })
   @Rule(RuleType['string']().empty(''))
   'remark': string = undefined;
+  @ApiProperty({ description: '发布时间' })
+  @Rule(RuleType['string']().empty(''))
+  'create_time': string = undefined;
   @ApiProperty({ description: '是否使用' })
   @Rule(RuleType['string']().empty(''))
   'is_use': string = undefined;

src/service/login.service.ts

@@ -2,13 +2,9 @@ import { Provide } from '@midwayjs/core';
 import { FrameworkErrorEnum, GetModel, ServiceError } from 'free-midway-component';
 import { isEqual, upperFirst } from 'lodash';
 import { LoginDTO, LoginType, UPwdDTO } from '../interface/login.interface';
-import { makeHttpRequest, Config } from '@midwayjs/core';
-import _ = require('lodash');
 
 @Provide()
 export class LoginService {
-  @Config('wechatSetting')
-  wechatSetting;
   /**
    * 账密登录
    * @param data 用户名和密码

src/service/menus.service.ts

@@ -13,10 +13,7 @@ export class MenusService extends BaseService<modelType> {
   model: modelType;
 
   async queryMenu(): Promise<Array<object>> {
-    const data = await this.model
-      .find({ is_use: '0' }, { meta: 0, __v: 0 })
-      .sort({ order_num: 1 })
-      .lean();
+    const data = await this.model.find({ is_use: '0' }, { meta: 0, __v: 0 }).sort({ order_num: 1 }).lean();
     let treeMenu = data.filter(f => !f.parent_id);
     treeMenu = this.treeMenu(data, treeMenu);
     return treeMenu;
@@ -26,9 +23,7 @@ export class MenusService extends BaseService<modelType> {
     for (const nm of nowMenu) {
       const { _id, parent_id } = nm;
       // 查下下级其是否有目录
-      let children = allMenus.filter(f =>
-        new ObjectId(f.parent_id).equals(_id)
-      );
+      let children = allMenus.filter(f => new ObjectId(f.parent_id).equals(_id));
       children = this.treeMenu(allMenus, children);
       if (children.length > 0) nm.children = children;
       // 换父级组件的名称