q-koa 12.3.1 → 12.3.3

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,
@@ -308,33 +308,51 @@ exports.getLocation = async (ctx) => {
   const appConfig = getConfig(app)
   const { tencent_key } = await appConfig.getObject('map')
 
-  const geo = new Geo(tencent_key)
+  let geo
+  if (Array.isArray(tencent_key)) {
+    geo = new Geo(lodash.shuffle(tencent_key)[0])
+  } else {
+    geo = new Geo(tencent_key)
+  }
+
   const addressName = address || `${provinceName}${cityName}`
   const result = await geo.getToLngAndLat(addressName)
 
   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')
 
-  const geo = new Geo(tencent_key)
+  let geo
+  if (Array.isArray(tencent_key)) {
+    geo = new Geo(lodash.shuffle(tencent_key)[0])
+  } else {
+    geo = new Geo(tencent_key)
+  }
+
   const res = await geo.getToLoation({
     longitude,
     latitude,
   })
 
-  return ctx.SUCCESS(res)
+  ctx.SUCCESS(res)
+  return res
 }
 
 exports.syncModel = async (ctx) => {

package/core/file/utils/index.js

@@ -44,6 +44,8 @@ exports.getObject = (config, app) => async (type) => {
         temObj[list[i].code] = Number(list[i].value)
       } else if (list[i].type === 'switch') {
         temObj[list[i].code] = Boolean(Number(list[i].value))
+      } else if (list[i].type === 'list' || list[i].type === 'json') {
+        temObj[list[i].code] = JSON.parse(list[i].value)
       } else {
         temObj[list[i].code] = list[i].value
       }

package/package.json

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