q-koa 11.2.1 → 11.2.4

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

@@ -62,7 +62,7 @@ exports.login = async (ctx) => {
       name,
     },
     attributes: {
-      exclude: ['createdid', 'updated_at', 'created_at'],
+      exclude: ['createdid', 'updated_at', 'created_at', 'password'],
     },
     include: [
       {
@@ -91,6 +91,7 @@ exports.login = async (ctx) => {
 exports.checkLogin = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { host } = ctx.request
+
   const is_dev = host.startsWith('localhost')
   const permissionList = await app.model.permission.findAll({
     attributes: {
@@ -123,9 +124,10 @@ exports.checkLogin = async (ctx) => {
     const result = await app.model.administrator.findOne({
       where: {
         id: ctx.request[`${appName}-user`].id,
+        password: ctx.request[`${appName}-user`].password || '',
       },
       attributes: {
-        exclude: ['createdid', 'updated_at', 'created_at'],
+        exclude: ['createdid', 'updated_at', 'created_at', 'password'],
       },
       include: [
         {
@@ -146,6 +148,7 @@ exports.checkLogin = async (ctx) => {
     const tokenResult = {
       id: result.id,
       name: result.name,
+      password: result.password,
     }
 
     const token = await app.sign({
@@ -257,10 +260,6 @@ exports.getPermission = async (ctx) => {
       role_id: administrator.role_id,
     },
   })
-  console.log(
-    'permission',
-    permission.map((item) => item.permission_id)
-  )
 
   const permissionList = await app.model.permission.findAll()
   const administratorData = {

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

@@ -0,0 +1,25 @@
+module.exports = {
+  name: '支付方式',
+  belongs: 'setting',
+  multiple: false,
+  availableSort: false,
+  order: [],
+  referenceSelect: [],
+  select: [],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [],
+  comment: {},
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  initList: [],
+  editInline: {},
+  autoData: {},
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  modelQuery: {},
+  deleteCheckList: [],
+  bulkCreateList: [],
+};

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

@@ -0,0 +1,47 @@
+const { Sequelize, Random } = require('q-koa')
+
+exports.name = {
+  type: Sequelize.STRING,
+  comment: '名字',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 1,
+}
+
+exports.desc = {
+  type: Sequelize.STRING,
+  comment: '介绍',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 2,
+}
+
+exports.key = {
+  type: Sequelize.STRING,
+  comment: 'key',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 3,
+}
+
+exports.image = {
+  type: Sequelize.STRING(300),
+  comment: '图标',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 4,
+}
+
+exports.is_on = {
+  type: Sequelize.BOOLEAN,
+  comment: '是否开启',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: true,
+  sortOrder: 5,
+  mock: () => Random.boolean(),
+}

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

@@ -1701,3 +1701,24 @@ exports.removereceiver = async (ctx) => {
   })
   return ctx.SUCCESS(res)
 }
+
+exports.setMsgJumpPath = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+
+  const {config = 'weixin_mp' ,path='pages/index/index'} = ctx.request.body
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+
+  weixinMp.init()
+
+  const result = await weixinMp.setMsgJumpPath({
+    path,
+  })
+
+  ctx.SUCCESS('ok')
+}

package/package.json

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