q-koa 12.1.7 → 12.2.1

package/core/file/plugins/administrator/controller.js

@@ -128,6 +128,7 @@ exports.checkLogin = async (ctx) => {
     const result = await app.model.administrator.findOne({
       where: {
         id: ctx.request[`${appName}-user`].id,
+        name: ctx.request[`${appName}-user`].name || '',
         password: ctx.request[`${appName}-user`].password || '',
       },
       attributes: {

package/core/file/plugins/weixin/controller.js

@@ -1817,27 +1817,45 @@ exports.getVisitTrend = async (ctx) => {
   const { config = 'weixin_mp', type = 'day', date } = ctx.request.body
   const { app_id, app_secrect } = await appConfig.getObject(config)
 
-  const weixinMp = new WeixinMp({
-    appid: app_id,
-    secrect: app_secrect,
-  })
+  const diff = moment().hour() > 8 ? -1 : -2
 
-  weixinMp.init()
+  const begin_date = moment(date ? date : moment().add(diff, 'days')).format(
+    'YYYYMMDD'
+  )
+
+  if (app.model.weixin_visit) {
+    const target = await app.model.weixin_visit.findOne({
+      where: {
+        ref_date: date
+          ? Number(moment(date).format('YYYYMMDD'))
+          : Number(moment(begin_date).format('YYYYMMDD')),
+      },
+    })
+    if (target) {
+      return ctx.SUCCESS({
+        list: [target],
+      })
+    }
+  }
 
   let obj = {}
-  const diff = moment().hour() > 8 ? -1 : -2
   if (type === 'day') {
     obj = {
-      begin_date: moment(date ? date : moment().add(diff, 'days')).format(
-        'YYYYMMDD'
-      ),
+      begin_date,
       end_date: moment(date ? date : moment().add(diff, 'days')).format(
         'YYYYMMDD'
       ),
     }
   }
 
-  const result = await weixinMp.getVisitTrend({ ...obj, type })
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
 
+  weixinMp.init()
+
+  const result = await weixinMp.getVisitTrend({ ...obj, type })
+  await app.model.weixin_visit.create(result.list[0])
   ctx.SUCCESS(result)
 }

package/core/file/plugins/weixin_visit/config.js

@@ -0,0 +1,22 @@
+module.exports = {
+  name: '微信每日数据',
+  belongs: 'page',
+  multiple: false,
+  availableSort: false,
+  order: [],
+  referenceSelect: [],
+  select: [],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [],
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  initList: [],
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  deleteCheckList: [],
+  bulkCreateList: [],
+  indexList: [],
+};

package/core/file/plugins/weixin_visit/model.js

@@ -0,0 +1,93 @@
+const { Sequelize, Random } = require('q-koa')
+
+exports.ref_date = {
+  type: Sequelize.INTEGER,
+  comment: '日期',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: 0,
+  sortOrder: 1,
+  mock: () => Random.natural(100, 1000),
+}
+
+exports.session_cnt = {
+  type: Sequelize.INTEGER.UNSIGNED,
+  comment: '数字',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: 0,
+  sortOrder: 2,
+  mock: () => Random.natural(100, 1000),
+}
+
+exports.stay_time_session = {
+  type: Sequelize.DECIMAL,
+  comment: '两位小数',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '0.00',
+  sortOrder: 3,
+  get: function () {
+    return this.getDataValue('stay_time_session') === null
+      ? 0
+      : Number(this.getDataValue('stay_time_session'))
+  },
+}
+
+exports.stay_time_uv = {
+  type: Sequelize.DECIMAL,
+  comment: '两位小数',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '0.00',
+  sortOrder: 4,
+  get: function () {
+    return this.getDataValue('stay_time_uv') === null
+      ? 0
+      : Number(this.getDataValue('stay_time_uv'))
+  },
+}
+
+exports.visit_depth = {
+  type: Sequelize.DECIMAL,
+  comment: '两位小数',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '0.00',
+  sortOrder: 5,
+  get: function () {
+    return this.getDataValue('visit_depth') === null
+      ? 0
+      : Number(this.getDataValue('visit_depth'))
+  },
+}
+
+exports.visit_pv = {
+  type: Sequelize.INTEGER.UNSIGNED,
+  comment: '数字',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: 0,
+  sortOrder: 6,
+  mock: () => Random.natural(100, 1000),
+}
+
+exports.visit_uv = {
+  type: Sequelize.INTEGER.UNSIGNED,
+  comment: '数字',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: 0,
+  sortOrder: 7,
+  mock: () => Random.natural(100, 1000),
+}
+
+exports.visit_uv_new = {
+  type: Sequelize.INTEGER.UNSIGNED,
+  comment: '数字',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: 0,
+  sortOrder: 8,
+  mock: () => Random.natural(100, 1000),
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "12.1.7",
+  "version": "12.2.1",
   "description": "",
   "main": "index.js",
   "scripts": {