q-koa 12.3.2 → 12.3.4

package/core/app.js

@@ -231,7 +231,7 @@ class APP {
         ) {
           return await next()
         }
-        throw new Error('没有权限或登录失效，请重新登录')
+        throw new ServiceError('没有权限或登录失效，请重新登录')
       }
       await next()
     })

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

@@ -295,10 +295,10 @@ exports.swagger = async (ctx) => {
   ctx.SUCCESS(apis)
 }
 
-exports.getLocation = async (ctx) => {
+exports.getLocation = async (ctx, _data) => {
   const { app } = getAppByCtx(ctx)
 
-  const { provinceName, cityName, address } = ctx.request.body
+  const { provinceName, cityName, address } = _data || ctx.request.body
   if (!provinceName || !cityName || !address) {
     return ctx.SUCCESS({
       longitude: null,
@@ -320,16 +320,21 @@ exports.getLocation = async (ctx) => {
 
   const { lng: longitude, lat: latitude } = result.location
 
-  return ctx.SUCCESS({
+  ctx.SUCCESS({
     longitude,
     latitude,
   })
+
+  return {
+    longitude,
+    latitude,
+  }
 }
 
-exports.getLngAndLat = async (ctx) => {
+exports.getLngAndLat = async (ctx, _data) => {
   const { app } = getAppByCtx(ctx)
 
-  const { longitude, latitude } = ctx.request.body
+  const { longitude, latitude } = _data || ctx.request.body
 
   const appConfig = getConfig(app)
   const { tencent_key } = await appConfig.getObject('map')
@@ -346,7 +351,8 @@ exports.getLngAndLat = async (ctx) => {
     latitude,
   })
 
-  return ctx.SUCCESS(res)
+  ctx.SUCCESS(res)
+  return res
 }
 
 exports.syncModel = async (ctx) => {

package/core/file/services/geo.js

@@ -48,7 +48,7 @@ module.exports = class Singleton {
       .then((res) => res.data)
 
     if (data.status === 0) return data.result
-    throw new Error(data.message)
+    throw new Error(`${this.key.split('-')[0]}${data.message}`)
   }
 
   async getToLngAndLat(name) {
@@ -61,7 +61,7 @@ module.exports = class Singleton {
     if (data.message === '查询无结果') {
       throw new Error(`找不到【${name}】，可能需要更详细一点（省市区）`)
     } else {
-      throw new Error(data.message)
+      throw new Error(`${this.key.split('-')[0]}${data.message}`)
     }
   }
 

package/package.json

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