q-koa 9.3.3 → 9.3.4

package/core/app.js

@@ -1819,6 +1819,7 @@ APP.getAppByCtx = (ctx) => {
   const appName = ctx.router.opts.prefix.substring(1)
 
   let controller = ''
+  let payName = appName
   try {
     const url = ctx.request.url
     const _split = url.split('/')
@@ -1826,10 +1827,23 @@ APP.getAppByCtx = (ctx) => {
   } catch (e) {
     console.warn(e)
   }
+  try {
+    const url = ctx.request.url
+    const referer = ctx.request.header.referer
+    if (!referer.includes(url)) {
+      const arr = ctx.request.header.referer.split('/').reverse()
+      if (arr.length >= 4) {
+        payName = arr[2]
+      }
+    }
+  } catch (e) {
+    console.warn(e)
+  }
   const { [appName]: app } = ctx.app
   return {
     appName,
     app,
+    payName,
     controller,
   }
 }

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

@@ -14,7 +14,9 @@ exports.copyOther = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
   const { type, source } = ctx.request.body
-  const url = `http://localhost:3001/${source}/setting/findAll`
+  const url = source.startsWith('http')
+    ? source
+    : `http://localhost:3001/${source}/setting/findAll`
   const result = await axios.post(url).then((res) => res.data)
   if (result.code !== 200) {
     throw new Error(result.message + url)
@@ -24,11 +26,21 @@ exports.copyOther = async (ctx) => {
 
   if (!copyType) throw new Error('克隆方找不到')
 
-  const copyList = data.filter((item) => item.parent_id === copyType.id)
-
   const list = await app.model.setting.findAll()
 
   const findType = list.find((item) => item.code === type)
+  if (findType && findType.parent_id) {
+    if (!findType) {
+      throw new Error(`当前找不到${type}`)
+    }
+    await app.model.setting.upsert({
+      id: findType.id,
+      value: copyType.value,
+    })
+    return ctx.SUCCESS('ok')
+  }
+  const copyList = data.filter((item) => item.parent_id === copyType.id)
+
   if (!findType) {
     const { id, ...rest } = copyType
     const newParent = await app.model.setting.create({

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

@@ -782,7 +782,7 @@ exports.h5_pay = async (ctx) => {
 }
 
 exports.mp_pay = async (ctx) => {
-  const { app, appName } = getAppByCtx(ctx)
+  const { app, appName, payName } = getAppByCtx(ctx)
   const {
     name,
     order_id,
@@ -843,12 +843,12 @@ exports.mp_pay = async (ctx) => {
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${appName}_${prefix}-${order_id}_${type}`
-    : `${appName}_${order_id}_${type}`
+    ? `${payName}_${prefix}-${order_id}_${type}`
+    : `${payName}_${order_id}_${type}`
 
   const notify_url = `https://${
     site_host || 'api.kuashou.com'
-  }/${appName}/weixin/notify`
+  }/${payName}/weixin/notify`
   const prePayResult = await pay({
     openid: userDetail.openid,
     body: name,

package/package.json

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