q-koa 10.7.8 → 10.8.1

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

@@ -1,6 +1,11 @@
 const Alipay = require('../../services/alipay')
 
 const { getAppByCtx, getConfig } = require('q-koa')
+
+const path = require('path')
+const fs = require('fs')
+const AlipaySdk = require('alipay-sdk').default
+
 exports.h5_pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
@@ -66,3 +71,67 @@ exports.notify = async (ctx) => {
     ctx.body = 'success'
   }
 }
+
+exports.mp_pay = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { is_dev, site_host } = await appConfig.getObject('base')
+  const {
+    app_id,
+    alipay_public_key,
+    key,
+    is_sandbox,
+    ...rest
+  } = await appConfig.getObject('alipay')
+
+  const {
+    name,
+    out_trade_no: _out_trade_no,
+    prefix = '',
+    order_id,
+    type,
+    price,
+    is_admin = false,
+    buyer_id = '2088722007804916',
+  } = ctx.request.body
+
+  const gateway = is_sandbox
+    ? `https://openapi.alipaydev.com/gateway.do`
+    : 'https://openapi.alipay.com/gateway.do'
+
+  const notify_url = `https://${
+    site_host || 'api.kuashou.com'
+  }/${appName}/alipay/notify`
+
+  const alipaySdk = new AlipaySdk({
+    appId: app_id,
+    signType: 'RSA2', // 签名算法,默认 RSA2
+    gateway, // 支付宝网关地址 ，沙箱环境下使用时需要修改
+    alipayPublicKey: alipay_public_key,
+    privateKey: fs.readFileSync(
+      path.resolve(__dirname, 'private-key.pem'),
+      'ascii'
+    ),
+    notify_url,
+  })
+
+  const out_trade_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 res = await alipaySdk.exec('alipay.trade.create', {
+    bizContent: {
+      out_trade_no,
+      total_amount: is_admin || is_dev ? 1 : Math.round(price * 100),
+      subject: name,
+      buyer_id,
+    },
+  })
+  if (res.code !== '10000') {
+    throw new Error(res.subMsg)
+  }
+  const { code, msg, tradeNo, ...other } = res
+  return ctx.SUCCESS(tradeNo)
+}

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

@@ -1,5 +1,42 @@
 module.exports = {
-  name: '语言包',
-  belongs: 'setting',
-  tab: 'lang_id',
-};
+  name: '语言设置',
+  belongs: 'page',
+  multiple: false,
+  availableSort: false,
+  order: [],
+  referenceSelect: [],
+  select: [
+    { key: 'name', symbol: '$like' },
+    {
+      key: 'type',
+      admin: {
+        name: 'admin',
+      },
+    },
+  ],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [{ sort: 'descending', type: 'id' }],
+  comment: {},
+  sortOrder: 1,
+  reference: [
+    { key: 'operate_language', name: '设置', width: 300, common: true },
+  ],
+  excludeAuth: [],
+  include: ((app) => {
+    return [
+      {
+        model: app.model.language_value,
+      },
+    ]
+  }).toString(),
+  initList: ['language_type'],
+  editInline: {},
+  autoData: {},
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  modelQuery: {},
+  deleteCheckList: [],
+  bulkCreateList: [],
+}

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

@@ -1,53 +1,21 @@
-const { Sequelize } = require('q-koa')
+const { Sequelize, Random } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING,
-  comment: '名字',
+  comment: '说明',
   allowNull: false,
+  is_mock: true,
   defaultValue: '',
-  validate: {
-    notNull: {
-      msg: '名字不允许为空',
-    },
-    notEmpty: {
-      msg: '名字不允许为空',
-    },
-  },
+  sortOrder: 1,
+  mock: () => Random.ctitle(),
 }
 
-exports.lang_id = {
-  type: Sequelize.INTEGER(11),
-  comment: '语言',
+exports.type = {
+  type: Sequelize.ENUM('input', 'textarea', 'content'),
+  comment: '类型',
   allowNull: false,
-  defaultValue: 1,
-}
-
-exports.key = {
-  type: Sequelize.STRING,
-  comment: 'key值',
-  allowNull: false,
-  defaultValue: '',
-  validate: {
-    notNull: {
-      msg: 'key值不允许为空',
-    },
-    notEmpty: {
-      msg: 'key值不允许为空',
-    },
-  },
-}
-
-exports.value = {
-  type: Sequelize.STRING,
-  comment: 'value值',
-  allowNull: false,
-  defaultValue: '',
-  validate: {
-    notNull: {
-      msg: 'value值不允许为空',
-    },
-    notEmpty: {
-      msg: 'value值不允许为空',
-    },
-  },
+  is_mock: true,
+  defaultValue: 'input',
+  sortOrder: 2,
+  mock: () => ['input', 'textarea', 'content'][Random.integer(0, 2)],
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.7.8",
+  "version": "10.8.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -16,6 +16,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "alipay-sdk": "^3.2.0",
     "@alicloud/pop-core": "^1.7.9",
     "@sigodenjs/wechatpay": "^2.1.1",
     "ali-oss": "^6.11.2",

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

@@ -1,4 +0,0 @@
-module.exports = {
-  name: '语言',
-  belongs: 'setting',
-};

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

@@ -1,15 +0,0 @@
-const { Sequelize } = require('q-koa')
-
-exports.name = {
-  type: Sequelize.STRING,
-  comment: '名字',
-  allowNull: false,
-  defaultValue: '',
-}
-
-exports.key = {
-  type: Sequelize.STRING,
-  comment: 'key',
-  allowNull: false,
-  defaultValue: '',
-}

package/core/file/plugins/language copy/config.js

@@ -1,42 +0,0 @@
-module.exports = {
-  name: '语言设置',
-  belongs: 'page',
-  multiple: false,
-  availableSort: false,
-  order: [],
-  referenceSelect: [],
-  select: [
-    { key: 'name', symbol: '$like' },
-    {
-      key: 'type',
-      admin: {
-        name: 'admin',
-      },
-    },
-  ],
-  excludes: [],
-  limit: 20,
-  defaultOrder: [{ sort: 'descending', type: 'id' }],
-  comment: {},
-  sortOrder: 1,
-  reference: [
-    { key: 'operate_language', name: '设置', width: 300, common: true },
-  ],
-  excludeAuth: [],
-  include: ((app) => {
-    return [
-      {
-        model: app.model.language_value,
-      },
-    ]
-  }).toString(),
-  initList: ['language_type'],
-  editInline: {},
-  autoData: {},
-  is_split: false,
-  is_split_count: false,
-  show_virtual: false,
-  modelQuery: {},
-  deleteCheckList: [],
-  bulkCreateList: [],
-}

package/core/file/plugins/language copy/model.js

@@ -1,21 +0,0 @@
-const { Sequelize, Random } = require('q-koa')
-
-exports.name = {
-  type: Sequelize.STRING,
-  comment: '说明',
-  allowNull: false,
-  is_mock: true,
-  defaultValue: '',
-  sortOrder: 1,
-  mock: () => Random.ctitle(),
-}
-
-exports.type = {
-  type: Sequelize.ENUM('input', 'textarea', 'content'),
-  comment: '类型',
-  allowNull: false,
-  is_mock: true,
-  defaultValue: 'input',
-  sortOrder: 2,
-  mock: () => ['input', 'textarea', 'content'][Random.integer(0, 2)],
-}