q-koa 10.6.6 → 10.6.9

package/core/app.js

@@ -1987,6 +1987,10 @@ APP.getClientTypeByCtx = (ctx) => {
 
 APP.getConfig = (app) => ({
   async getObject(type) {
+    if (!type) {
+      console.error(`getObject type : ${type}`)
+      return {}
+    }
     let configList = app.cache.get('configList')
     if (!configList) {
       configList = await app.model.setting.findAll({

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

@@ -87,4 +87,7 @@ exports.post = {
       return {}
     }
   },
+  extra: {
+    type: 'json-editor',
+  },
 }

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

@@ -552,8 +552,17 @@ exports.copyOther = async (ctx) => {
   for (let i = 0; i < list.length; i++) {
     const url = `${prefix}/${list[i]}/findAll`
 
-    const result = await axios.post(url).then((res) => res.data)
-    console.log(list[i])
+    const result = await axios
+      .post(
+        url,
+        {},
+        {
+          headers: {
+            'Client-Type': 0,
+          },
+        }
+      )
+      .then((res) => res.data)
     if (result.code === 200) {
       await app.model[list[i]].sync({
         force: true,

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

@@ -5,7 +5,7 @@ const axios = require('axios')
 const qr = require('qr-image')
 const path = require('path')
 const TOUTIAO = getService('toutiao')
-
+const md5 = require('md5')
 const utils = require('../../utils')
 
 exports.initData = async (ctx) => {
@@ -194,3 +194,193 @@ exports.login = async (ctx) => {
     user: result,
   })
 }
+
+const signResult = (params, salt) => {
+  var skip_arr = ['thirdparty_id', 'app_id', 'sign']
+  var paramArray = new Array()
+  for (var k in params) {
+    if (skip_arr.indexOf(k) != -1) {
+      continue
+    }
+    if (params[k] == '') {
+      continue
+    }
+    paramArray.push(params[k])
+  }
+  paramArray.push(salt)
+  paramArray.sort()
+  var signStr = paramArray.join('&')
+  return md5(signStr)
+}
+
+exports.pay = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { is_dev, site_host } = await appConfig.getObject('base')
+  const { app_id, salt, key, is_sandbox, ...rest } = await appConfig.getObject(
+    'toutiao'
+  )
+
+  const {
+    name,
+    out_trade_no: _out_trade_no,
+    prefix = '',
+    order_id,
+    type = 'TOUTIAO-WEIXIN',
+    price,
+    is_admin = false,
+    valid_time = 900,
+  } = ctx.request.body
+
+  const url = `https://${
+    is_sandbox ? 'open-sandbox.douyin.com' : 'developer.toutiao.com'
+  }/api/apps/ecpay/v1/create_order`
+
+  const out_order_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${key.length > 10 ? appName : key}_${prefix}-${order_id}_${type}`
+    : `${key.length > 10 ? appName : key}_${order_id}_${type}`
+
+  const notify_url = `https://${
+    site_host || 'api.kuashou.com'
+  }/${appName}/toutiao/notify`
+
+  const data = {
+    app_id,
+    out_order_no,
+    total_amount: is_admin || is_dev ? 1 : Math.round(price * 100),
+    subject: name,
+    body: `订单【${out_order_no}】`,
+    valid_time,
+    notify_url,
+  }
+
+  const res = await axios
+    .post(url, {
+      ...data,
+      sign: signResult(data, salt),
+    })
+    .then((res) => res.data)
+
+  if (res.err_no) {
+    throw new Error(res.err_tips)
+  }
+  ctx.SUCCESS(res.data)
+}
+
+exports.notify = async (ctx) => {
+  const { app } = getAppByCtx(ctx)
+  const { type, msg, nonce, msg_signature, timestamp } = ctx.request.body
+
+  const {
+    appid,
+    cp_orderno: out_trade_no,
+    cp_extra,
+    way,
+    channel_no,
+    payment_order_no,
+    total_amount,
+    status,
+    item_id,
+    seller_uid,
+    paid_at,
+    order_id: transactionid,
+  } = JSON.parse(msg)
+
+  let order_id = out_trade_no.split('_')[1]
+  const order_price = Number(total_amount) / 100
+  let prefix = ''
+  if (order_id.includes('-')) {
+    const arr = order_id.split('-')
+    order_id = Number(arr[1])
+    ;[prefix] = arr
+  } else {
+    order_id = Number(order_id)
+  }
+  const model = prefix ? `${prefix}_order` : 'order'
+  let openid = ''
+
+  console.log(order_id, '微信支付回调-----', model, order_price, transactionid)
+  if (app.service[model] && app.service[model].notify) {
+    await app.service[model].notify({
+      app,
+      order_id,
+      order: model,
+      order_price,
+      transactionid,
+      out_trade_no,
+      openid,
+    })
+  }
+
+  ctx.status = 200
+  ctx.body = {
+    err_no: 0,
+    err_tips: 'success',
+  }
+}
+
+exports.checkPay = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const {
+    id,
+    prefix,
+    type = 'TOUTIAO-DOUYIN',
+    out_trade_no: _out_trade_no,
+  } = ctx.request.body
+
+  const orderModel = prefix ? `${prefix}_order` : 'order'
+  const result = await app.model[orderModel].findOne({
+    where: {
+      id,
+    },
+  })
+  if (!result) return ctx.SUCCESS('找不到')
+
+  const appConfig = getConfig(app)
+  const { is_dev, site_host } = await appConfig.getObject('base')
+  const { app_id, salt, key, is_sandbox, ...rest } = await appConfig.getObject(
+    'toutiao'
+  )
+
+  const orderPrefix = prefix ? `${prefix}-` : ''
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : `${key}_${orderPrefix}${id}_${type}`
+
+  const url = `https://${
+    is_sandbox ? 'open-sandbox.douyin.com' : 'developer.toutiao.com'
+  }/api/apps/ecpay/v1/query_order`
+
+  const data = {
+    app_id,
+    out_order_no: out_trade_no,
+  }
+
+  const res = await axios
+    .post(url, {
+      ...data,
+      sign: signResult(data, salt),
+    })
+    .then((res) => res.data)
+
+  if (res.err_no) {
+    throw new Error(res.err_tips)
+  }
+
+  const order_price = Number(res.payment_info.total_fee) / 100
+  await app.service[orderModel].notify({
+    app,
+    order: orderModel,
+    order_id: id,
+    order_price,
+    transactionid: res.order_id,
+    out_trade_no: res.out_trade_no,
+  })
+  ctx.SUCCESS({
+    ...res.payment_info,
+    order_id: res.order_id,
+  })
+}

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

@@ -7,8 +7,6 @@ exports.login = async (ctx) => {
   const { mobile, password, config: _config, ...rest } = ctx.request.body
 
   const config = _config || ctx.request.header.config || 'weixin_mp'
-  const appConfig = getConfig(app)
-  const { app_id } = await appConfig.getObject(config)
 
   const where =
     process.env.NODE_ENV !== 'production'
@@ -36,6 +34,22 @@ exports.login = async (ctx) => {
     where,
   })
   if (!result) throw new Error('账号密码错误')
+  if (_config === 'none') {
+    const tokenResult = {
+      id: result.id,
+      name: result.name,
+      mobile: result.mobile,
+    }
+    const token = await app.sign({
+      user: tokenResult,
+    })
+    return ctx.SUCCESS({
+      token,
+      user: app.appConfig.loginData
+        ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
+        : result,
+    })
+  }
   if (
     ctx.request[`${appName}-user`] &&
     ctx.request[`${appName}-user`].mp_user
@@ -89,6 +103,8 @@ exports.login = async (ctx) => {
       }
     )
   }
+  const appConfig = getConfig(app)
+  const { app_id } = await appConfig.getObject(config)
   /**
    * 查出最新用户，存token并返回
    */
@@ -115,18 +131,20 @@ exports.login = async (ctx) => {
     : {
         model: app.model.mp_user,
       }
-  const includeDefault = [
-    {
-      model: app.model.github_user,
-    },
-    h5_user_include,
-    mp_user_include,
-    {
-      model: app.model.toutiao_user,
-    },
-    ...app.include.user,
-  ].filter((item) => item.model)
-
+  const includeDefault =
+    config !== 'none'
+      ? [
+          {
+            model: app.model.github_user,
+          },
+          h5_user_include,
+          mp_user_include,
+          {
+            model: app.model.toutiao_user,
+          },
+          ...app.include.user,
+        ].filter((item) => item.model)
+      : []
   if (app.appConfig.loginData) {
     const include = includeDefault.filter((i) => {
       return app.appConfig.loginData.excludeInclude.every((m) => {
@@ -267,13 +285,12 @@ exports.checkLogin = async (ctx) => {
   const { config: _config } = ctx.request.body
   const config = _config || 'weixin_mp'
   const appConfig = getConfig(app)
-  const { app_id } = await appConfig.getObject(config)
   if (ctx.request[`${appName}-user`] && ctx.request[`${appName}-user`].id) {
     const h5_user_include = config.includes('h5')
       ? {
           model: app.model.h5_user,
           where: {
-            appid: app_id,
+            appid: (await appConfig.getObject(config)).app_id,
           },
           attributes: {
             exclude: ['created_at', 'updated_at', 'createdid'],
@@ -286,7 +303,7 @@ exports.checkLogin = async (ctx) => {
       ? {
           model: app.model.mp_user,
           where: {
-            appid: app_id,
+            appid: (await appConfig.getObject(config)).app_id,
           },
         }
       : {
@@ -297,8 +314,8 @@ exports.checkLogin = async (ctx) => {
       {
         model: app.model.github_user,
       },
-      h5_user_include,
-      mp_user_include,
+      config === 'weixin_h5' ? h5_user_include : {},
+      config === 'weixin_mp' ? mp_user_include : {},
       {
         model: app.model.toutiao_user,
       },

package/package.json

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

package/core/file/plugins/routes/config 2.js

@@ -1,17 +0,0 @@
-module.exports = {
-  name: '后台导航',
-  belongs: 'auth',
-  multiple: false,
-  availableSort: true,
-  order: [],
-  select: [],
-  excludes: [],
-  limit: 40,
-  defaultOrder: [{ sort: 'ascending', type: 'sortOrder' }],
-  comment: {},
-  sortOrder: 1,
-  reference: [],
-  excludeAuth: [],
-  initList: [],
-  personal: [{ key: 'init_routes', name: '初始化', width: 200, common: true }],
-}