q-koa 13.1.2 → 13.1.4

package/core/app.js

@@ -10,6 +10,7 @@ const moment = require('moment')
 const { EventEmitter } = require('events')
 const nodeVm = require('vm')
 const LRU = require('lru-cache')
+const axios = require('axios')
 
 const { Serve } = require('static-koa-router')
 
@@ -426,7 +427,8 @@ class APP {
             subscriber,
             appConfig: _.defaultsDeep(
               configExist ? require(path.resolve(__dirname, configPath)) : {},
-              this.config.app
+              this.config.app,
+              { appName, ip: this.config.ip, port: this.port }
             ),
           }
         } else {
@@ -434,7 +436,8 @@ class APP {
             sequelize: db,
             appConfig: _.defaultsDeep(
               configExist ? require(path.resolve(__dirname, configPath)) : {},
-              this.config.app
+              this.config.app,
+              { appName, ip: this.config.ip, port: this.port }
             ),
           }
         }
@@ -2211,6 +2214,26 @@ APP.getConfig = (app) => ({
       app.redisClient.publish('cache clear', target)
     } else {
       app.cache.set(target, null)
+
+      if (app.appConfig.appName) {
+        const ipHost = (
+          Array.isArray(app.appConfig.productionHost)
+            ? app.appConfig.productionHost
+            : [app.appConfig.productionHost]
+        ).filter((url) => {
+          return url.match(
+            /^(http:\/\/|https:\/\/)?(\d{1,3}\.){3}\d{1,3}:\d{1,5}/
+          )
+        })
+
+        Promise.all(
+          ipHost.map((host) => {
+            return axios
+              .get(`${host}/${app.appConfig.appName}/cache/clear?key=${target}`)
+              .then((res) => res.data)
+          })
+        )
+      }
     }
   },
 })

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

@@ -26,5 +26,8 @@ exports.clear = async (ctx) => {
   if (!key) return ctx.ERROR('缺key')
   app.cache.set(key, '')
 
+  const url = `${app.appConfig.ip}:${app.appConfig.port}`
+  app.service.log.push({ app, message: `${url}缓存${key}清除` })
+
   ctx.SUCCESS('ok')
 }

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

@@ -604,7 +604,7 @@ exports.gpt = async (ctx) => {
   const appConfig = getConfig(app)
   const { ai_key } = await appConfig.getObject('base')
   const { content, session_id, is_chunk = true } = ctx.request.body
-
+  if (!ai_key) throw new ServiceError('没有配置ai_key')
   if (!content) throw new ServiceError('没有内容content')
   let statusCode = 200
   const url =

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

@@ -134,6 +134,7 @@ exports.html = async (ctx) => {
   const { code } = ctx.request.query
   if (!code) {
     ctx.body = `没有code`
+    return
   }
   const target = await app.model.setting.findOne({
     where: {

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

@@ -72,32 +72,44 @@ exports.initModel = async (ctx) => {
       return ctx.ERROR('请检查，model为空')
     }
     if (app.appConfig.productionHost) {
-      const { code, data: productionModel } = await axios
-        .post(
-          `${app.appConfig.productionHost}/${appName}/system/getTable`,
-          {
-            model,
-          },
-          {
-            headers: {
-              'client-type': 0,
-            },
-          }
+      const productionHost = (
+        Array.isArray(app.appConfig.productionHost)
+          ? app.appConfig.productionHost
+          : [app.appConfig.productionHost]
+      ).filter((url) => {
+        return !url.match(
+          /^(http:\/\/|https:\/\/)?(\d{1,3}\.){3}\d{1,3}:\d{1,5}/
         )
-        .then((res) => res.data)
-      if (code === 200) {
-        const findList = Object.keys(productionModel).filter((key) => {
-          return (
-            !['id', 'created_at', 'createdid', 'updated_at'].includes(key) &&
-            !Object.keys(app.attributes[model]).includes(key)
-          )
-        })
-        if (findList.length > 0) {
-          return ctx.ERROR(
-            `${model} 线上字段 ${findList.join(
-              '/'
-            )} 不能被删除，请先修改线上model.js`
+      })
+
+      for (const host of productionHost) {
+        const { code, data: productionModel } = await axios
+          .post(
+            `${host}/${appName}/system/getTable`,
+            {
+              model,
+            },
+            {
+              headers: {
+                'client-type': 0,
+              },
+            }
           )
+          .then((res) => res.data)
+        if (code === 200) {
+          const findList = Object.keys(productionModel).filter((key) => {
+            return (
+              !['id', 'created_at', 'createdid', 'updated_at'].includes(key) &&
+              !Object.keys(app.attributes[model]).includes(key)
+            )
+          })
+          if (findList.length > 0) {
+            return ctx.ERROR(
+              `${model} 线上字段 ${findList.join(
+                '/'
+              )} 不能被删除，请先修改线上model.js`
+            )
+          }
         }
       }
     }

package/package.json

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