添加名称标题 模糊查询

app/controller/resource.js

@@ -1,28 +0,0 @@
-'use strict';
-
-const Controller = require('egg').Controller;
-
-class ResourceController extends Controller {
-  async create() {
-    const { ctx } = this;
-    const res = await ctx.service.resource.create(ctx.request.body);
-    ctx.body = res;
-  }
-  async update() {
-    const { ctx } = this;
-    const res = await ctx.service.resource.update(ctx.request.body);
-    ctx.body = res;
-  }
-  async del() {
-    const { ctx } = this;
-    const res = await ctx.service.resource.del(ctx.params);
-    ctx.body = res;
-  }
-  async query() {
-    const { ctx } = this;
-    const res = await ctx.service.resource.query(ctx.query);
-    ctx.body = res;
-  }
-}
-
-module.exports = ResourceController;

app/model/Resource.js

@@ -1,20 +0,0 @@
-'use strict';
-module.exports = app => {
-  const { mongoose } = app;
-  const { Schema } = mongoose;
-  const ResourceSchema = new Schema({
-    // 文件名
-    name: {
-      type: String,
-    },
-    // 文件路径
-    path: {
-      type: String,
-    },
-    // 数据id
-    id: {
-      type: String,
-    },
-  });
-  return mongoose.model('Resource', ResourceSchema);
-};

app/router.js

@@ -53,10 +53,10 @@ module.exports = app => {
   router.post('/api/files/upload', jwt, controller.files.upload);
   router.get('/api/files/query', controller.files.query);
   // 资源
-  router.post('/api/resource/create', jwt, controller.resource.create);
-  router.post('/api/resource/update', jwt, controller.resource.update);
-  router.delete('/api/resource/delete/:id', jwt, controller.resource.del);
-  router.get('/api/resource/query', controller.resource.query);
+  // router.post('/api/resource/create', jwt, controller.resource.create);
+  // router.post('/api/resource/update', jwt, controller.resource.update);
+  // router.delete('/api/resource/delete/:id', jwt, controller.resource.del);
+  // router.get('/api/resource/query', controller.resource.query);
   // 友情链接
   router.post('/api/links/create', jwt, controller.links.create);
   router.post('/api/links/update', jwt, controller.links.update);

app/service/adminUser.js

@@ -66,7 +66,7 @@ class adminUserService extends Service {
   async query({ skip, limit, userName, state, acct }) {
     const { AdminUser: model } = this.ctx.model;
     const filter = {};
-    if (userName) filter.userName = userName;
+    if (userName) filter.userName = { $regex: userName };
     if (state) filter.state = state;
     if (acct) filter.acct = acct;
     try {

app/service/banner.js

@@ -57,7 +57,7 @@ class ContentService extends Service {
   async query({ skip, limit, title }) {
     const { Banner: model } = this.ctx.model;
     const filter = {};
-    if (title) filter.title = title;
+    if (title) filter.title = { $regex: title };
     const total = await model.find({ ...filter });
     try {
       let res;

app/service/column.js

@@ -83,7 +83,7 @@ class ColumnService extends Service {
   async query({ skip, limit, name, code }) {
     const { Column: model } = this.ctx.model;
     const filter = {};
-    if (name) filter.name = name;
+    if (name) filter.name = { $regex: name };
     if (code) filter.code = code;
     try {
       let res;

app/service/content.js

@@ -62,15 +62,11 @@ class ContentService extends Service {
   async query({ skip, limit, title, columns }) {
     const { Content: model } = this.ctx.model;
     const filter = {};
-    if (title) filter.title = title;
+    if (title) filter.title = { $regex: title };
     if (columns) filter.columns = columns;
+    console.log(filter);
     let total = 0;
     try {
-      // if (columns) {
-      //   total = await model.find({ columns });
-      //   const list = await model.find({ columns }).skip(Number(skip) * Number(limit)).limit(Number(limit));
-      //   return { errmsg: '', errcode: 0, data: list, total: total.length };
-      // }
       let res;
       total = await model.find({ ...filter });
       if (skip && limit) {

app/service/files.js

@@ -50,7 +50,7 @@ class FilesService extends Service {
     assert(type, '类型不存在');
     const filter = {};
     filter.type = type;
-    if (name) filter.name = name;
+    if (name) filter.name = { $regex: name };
     const { Files: model } = this.ctx.model;
     try {
       const total = await model.find({ ...filter });

app/service/link.js

@@ -42,7 +42,7 @@ class LinkService extends Service {
     const { Links: model } = this.ctx.model;
     try {
       const filter = {};
-      if (name) filter.title = name;
+      if (name) filter.name = { $regex: name };
       let res;
       const total = await model.find({ ...filter });
       if (skip && limit) {

app/service/menu.js

@@ -84,7 +84,7 @@ class MenuService extends Service {
     const { Menu: model } = this.ctx.model;
     try {
       const filter = {};
-      if (name) filter.name = name;
+      if (name) filter.name = { $regex: name };
       if (code) filter.code = code;
       if (type) filter.type = type;
       const total = await model.find({ ...filter });

app/service/page.js

@@ -71,7 +71,7 @@ class PageService extends Service {
   async query({ skip, limit, title }) {
     const { Page: model } = this.ctx.model;
     const filter = {};
-    if (title) filter.title = title;
+    if (title) filter.title = { $regex: title };
     try {
       const total = await model.find({ ...filter });
       let res;

app/service/resource.js

@@ -1,63 +0,0 @@
-
-'use strict';
-
-const Service = require('egg').Service;
-const assert = require('assert');
-const moment = require('moment');
-const fs = require('fs');
-const fsPromises = fs.promises;
-class ResourceService extends Service {
-  async create({ name, path }) {
-    assert(name, '名称不存在');
-    assert(path, '路径不存在');
-    const { Resource: model } = this.ctx.model;
-    const createAt = moment().format('x');
-    try {
-      await model.create({ name, path, createAt });
-      return { errmsg: '', errcode: 0 };
-    } catch (error) {
-      throw new Error({ errcode: -2001, errmsg: '添加失败' });
-    }
-  }
-  async update({ name, path, id }) {
-    assert(id, 'id不存在');
-    const { Resource: model } = this.ctx.model;
-    try {
-      await model.findByIdAndUpdate(id, { name, path });
-      return { errmsg: '', errcode: 0 };
-    } catch (error) {
-      throw new Error({ errcode: -2001, errmsg: '修改失败' });
-    }
-  }
-  async del({ id }) {
-    assert(id, 'id不存在');
-    const { Resource: model } = this.ctx.model;
-    try {
-      // 获取文件路径
-      const files = await model.findById(id);
-      const filepath = `${files.path}`;
-      // 开始删除文件
-      await fsPromises.rmdir(filepath);
-      await model.findOneAndDelete(id);
-      return { errmsg: '', errcode: 0 };
-    } catch (error) {
-      throw new Error({ errcode: -2001, errmsg: '删除失败' });
-    }
-  }
-  async query({ skip, limit, filter }) {
-    const { Resource: model } = this.ctx.model;
-    try {
-      let res;
-      if (skip && limit) {
-        res = await model.find(filter).skip(skip * limit).limit(limit);
-      } else {
-        res = await model.find(filter);
-      }
-      return { errmsg: '', errcode: 0, data: res };
-    } catch (error) {
-      throw new Error({ errcode: -2001, errmsg: '查询失败' });
-    }
-  }
-}
-
-module.exports = ResourceService;

app/service/role.js

@@ -54,7 +54,7 @@ class RoleService extends Service {
   async query({ skip, limit, name, code, state }) {
     const { Role: model } = this.ctx.model;
     const filter = {};
-    if (name) filter.name = name;
+    if (name) filter.name = { $regex: name };
     if (code) filter.state = code;
     if (state) filter.acct = state;
     try {

config/config.default.js

@@ -50,21 +50,21 @@ module.exports = appInfo => {
   config.userSecret = '123456';
   config.filespath = '/home/cms';
   // 数据库配置
-  config.mongoose = {
-    url: 'mongodb://172.17.116.7:27018/cms',
-    options: {
-      user: 'root',
-      pass: 'cms@cc-lotus',
-      authSource: 'admin',
-      useNewUrlParser: true,
-      useCreateIndex: true,
-      useUnifiedTopology: true,
-    },
-  };
   // config.mongoose = {
-  //   url: 'mongodb://127.0.0.1:27017/example',
-  //   options: {},
+  //   url: 'mongodb://172.17.116.7:27018/cms',
+  //   options: {
+  //     user: 'root',
+  //     pass: 'cms@cc-lotus',
+  //     authSource: 'admin',
+  //     useNewUrlParser: true,
+  //     useCreateIndex: true,
+  //     useUnifiedTopology: true,
+  //   },
   // };
+  config.mongoose = {
+    url: 'mongodb://127.0.0.1:27017/example',
+    options: {},
+  };
   // 异常捕获
   config.middleware = [ 'errorHandler' ];
   config.errorHandler = {