fix: 审核时间处理

Author: zhongchubing

geekape-nav-admin/src/pages/nav/Audit/index.tsx

@@ -1,5 +1,5 @@
 import GeekProTable from "@/components/GeekProTable/GeekProTable";
-import {API_NAV, API_NAV_LIST} from "@/services/api";
+import {API_NAV_AUDIT, API_NAV_LIST} from "@/services/api";
 import {ProColumns} from "@ant-design/pro-table";
 import {Popconfirm} from "antd";
 import request from "@/utils/request";
@@ -36,16 +36,16 @@ export default function NavAuditListPage() {
       search: false,
     },
     {
-      title: '提交时间',
-      dataIndex: 'submitTime',
+      title: '创建时间',
+      dataIndex: 'createTime',
       search: false,
       valueType: 'dateTime'
     },
   ]
 
   async function onActionClick(id: string, action: any, status = 0) {
     await request({
-      url: API_NAV,
+      url: API_NAV_AUDIT,
       method: 'PUT',
       data: {
         id,

geekape-nav-admin/src/services/api.ts

@@ -3,6 +3,7 @@ import request from "@/utils/request";
 export const API_LOGIN = '/api/login'
 export const API_NAV_LIST = '/api/nav/list'
 export const API_NAV = '/api/nav'
+export const API_NAV_AUDIT = '/api/nav/audit'
 export const API_CATEGORY_LIST = '/api/category/list'
 export const API_CATEGORY = '/api/category'
 

geekape-nav-main/components/AddNavPopup.vue

@@ -10,7 +10,7 @@
       <el-form ref="ruleForm" label-width="100px" :model="form" :rules="rules">
 
         <el-form-item label="网站链接" prop="url">
-          <el-input placeholder="http://www.baidu.com/" v-model="form.url"  :disabled="type === 'update'" @blur="getNavInfo" />
+          <el-input placeholder="http://www.baidu.com/" v-model="form.href"  :disabled="type === 'update'" @blur="getNavInfo" />
           <span style="color: red">输入链接自动爬取信息</span>
         </el-form-item>
 
@@ -35,7 +35,7 @@
         </el-form-item>
         <el-form-item label="网站logo" prop="name">
           <el-input placeholder="输入网站logo" v-model="form.logo" />
-          <img :src="form.logo" />
+          <img style="max-width: 30px;" :src="form.logo" />
         </el-form-item>
         <el-form-item label="网站描述" prop="desc">
           <el-input type="textarea" placeholder="输入网站描述" v-model="form.desc" />
@@ -50,7 +50,6 @@
           <el-button type="primary" :loading="loading" @click="addNav('ruleForm')">
             提交
           </el-button>
-          <p v-if="type !== 'update'"><el-link @click="isMoreForm=!isMoreForm" type="primary">{{!isMoreForm ? '手动添加' : '爬虫自动添加'}}网站名称和描述</el-link></p>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -80,7 +79,7 @@ export default {
       loading: false,
       categorys: [],
       form: {
-        url: '',
+        href: '',
         categoryId: '',
         name: '',
         logo: '',
@@ -89,7 +88,7 @@ export default {
         authorUrl: ''
       },
       rules: {
-        url: [
+        href: [
           { required: true, message: '请输入url', trigger: 'blur' },
           {
             pattern: /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/,
@@ -138,15 +137,13 @@ export default {
             })
           } else {
             const res = await this.$api.addNav(this.form)
-            if (res.msg) {
-              this.$message.error(`${res.msg}，请手动输入！`)
-              this.isMoreForm = true
+            if (res.code === 0) {
+              this.$message.error(`${res.msg}`)
             } else {
               this.$message(`感谢您的提交，请等待后台审核通过！`)
             }
           }
           this.loading = false
-          this.form.url = ''
           this.$emit('update:show', false)
           this.$emit('submit')
         } else {
@@ -155,30 +152,15 @@ export default {
       })
     },
     async getNavInfo() {
-      const { url } = this.form
+      const { href: url } = this.form
       if (!url) return
       const { data } = await axios.get(API_NAV_REPTILE + `?url=${url}`)
 
-      this.form.logo = `${url}/favicon.ico`
+      this.form.logo = `https://www.google.com/s2/favicons?domain=${url}`
       this.form.name = data?.name
       this.form.desc = data?.desc
     }
   },
-  watch: {
-    item(ite) {
-      this.isMoreForm = true
-      this.form.name = ite.name
-      this.form.url = ite.href
-      this.form.desc = ite.desc
-      this.form.categoryId = ite.categoryId
-    },
-    isMoreForm(newVal) {
-      if (!newVal) {
-        this.form.name = ''
-        this.form.desc = ''
-      }
-    }
-  },
   created() {
     this.getCategorys()
   },

geekape-nav-server/app/controller/nav.ts

@@ -3,17 +3,17 @@ const request = require('request');
 const cheerio = require('cheerio');
 
 enum NAV_STATUS {
-  wait,
   pass,
+  wait,
   refuse,
 }
 
 export default class NavController extends Controller {
   async list() {
     const { ctx } = this
-    const { request, model } = ctx
+    const { model } = ctx
     try {
-      let { pageSize = 10, pageNumber = 1, status = 0, categoryId, name } = request.query
+      let { pageSize = 10, pageNumber = 1, status = 0, categoryId, name } = ctx.query
       pageSize = Number(pageSize)
       pageNumber = Number(pageNumber)
       const skipNumber = pageSize * pageNumber - pageSize
@@ -42,19 +42,7 @@ export default class NavController extends Controller {
       }
 
       const [resData, total] = await Promise.all([
-        model.Nav.aggregate([
-          {
-            $match: findParam
-          },
-          {
-            $lookup: {
-              from: 'category',
-              localField: 'categoryId',
-              foreignField: '_id',
-              as: 'category'
-            }
-          }
-        ]).skip(skipNumber).limit(pageSize).sort({_id: -1}),
+        model.Nav.find(findParam).skip(skipNumber).limit(pageSize).sort({_id: -1}),
         model.Nav.find(findParam).count(),
       ])
       this.success({
@@ -71,9 +59,9 @@ export default class NavController extends Controller {
     const { ctx } = this
     const { request: req, model } = ctx
     try {
-      req.body.status = 1
+      req.body.status = NAV_STATUS.wait
       req.body.createTime = new Date()
-      const res = model.Nav.create(req.body);
+      const res = await model.Nav.create(req.body);
       this.success(res)
     } catch (error) {
       this.error(error.message)
@@ -113,10 +101,14 @@ export default class NavController extends Controller {
 
   async edit() {
     const { body } = this.ctx.request
+    body.updateTime = new Date()
+    const res = this.ctx.service.common.update(body, 'Nav')
+    this.success(res);
+  }
 
-    if (body.status === NAV_STATUS.pass || body.status === NAV_STATUS.refuse) {
-      body.auditTime = new Date()
-    }
+  async audit() {
+    const { body } = this.ctx.request
+    body.auditTime = new Date()
     const res = this.ctx.service.common.update(body, 'Nav')
     this.success(res);
   }

geekape-nav-server/app/model/nav.ts

@@ -5,6 +5,7 @@ module.exports = app => {
   const NavSchema = new Schema({
     categoryId: String,
     name: String,
+    //网站url
     href: String,
     desc: String,
     logo: String,
@@ -24,13 +25,6 @@ module.exports = app => {
       type: Number,
       default: 0,
     },
-    list: {
-      type: [ Object ],
-      default: undefined,
-    },
-    category: [{
-      name: String
-    }]
   }, { collection: 'nav' });
   return mongoose.model('Nav', NavSchema);
 };

geekape-nav-server/app/router.ts

@@ -13,6 +13,7 @@ export default (app: Application) => {
   router.get("/api/nav/list", controller.nav.list)
   router.post("/api/nav", controller.nav.add)
   router.get("/api/nav", controller.nav.get)
+  router.put("/api/nav/audit", controller.nav.audit)
   router.get("/api/nav/reptile", controller.nav.reptile)
   router.get("/api/nav/random", controller.nav.random)
   router.delete("/api/nav", controller.nav.del)

geekape-nav-server/config/config.default.ts

@@ -39,6 +39,7 @@ export default (appInfo: EggAppInfo) => {
         "/api/nav",
         "/api/nav/random",
         "/api/nav/find",
+        "/api/nav/list",
         "/api/nav/reptile",
         "/api/login",
         "/api/index",