q-koa 9.7.2 → 9.7.4

package/core/app.js

@@ -294,6 +294,19 @@ class APP {
       process.on('exit', (code) => {
         console.log(`[exit custom], About to exit with code: ${code}`)
       })
+      if (this.app[appName].subscriber) {
+        try {
+          await this.app[appName].subscriber.subscribe(
+            'cache clear',
+            (clearTarget) => {
+              this.app[appName].cache.set(clearTarget, null)
+              console.log(`subscribe cache clear ${clearTarget}`)
+            }
+          )
+        } catch (e) {
+          console.log('---<>', e.message)
+        }
+      }
       if (
         this.app[appName].service.cache &&
         this.app[appName].service.cache.init
@@ -361,9 +374,13 @@ class APP {
           client.on('error', (err) => console.log('Redis Client Error', err))
 
           await client.connect()
+
+          const subscriber = client.duplicate()
+          await subscriber.connect()
           this.app[appName] = {
             sequelize: db,
             redisClient: client,
+            subscriber,
             appConfig: _.defaultsDeep(
               configExist ? require(path.resolve(__dirname, configPath)) : {},
               this.config.app
@@ -1948,7 +1965,11 @@ APP.getConfig = (app) => ({
     return result
   },
   update() {
-    app.cache.set('configList', null)
+    if (app.redisClient) {
+      app.redisClient.publish('cache clear', 'configList')
+    } else {
+      app.cache.set('configList', null)
+    }
   },
 })
 

package/core/file/plugins/application/afterExecute.js

@@ -0,0 +1,14 @@
+const { getAppByCtx, getConfig } = require('q-koa')
+
+exports.upsert = async (ctx) => {
+  const { app } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  appConfig.update()
+}
+
+exports.bulkUpdate = async (ctx) => {
+  const { app } = getAppByCtx(ctx)
+
+  const appConfig = getConfig(app)
+  appConfig.update()
+}

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

@@ -0,0 +1,25 @@
+module.exports = {
+  name: '应用配置',
+  belongs: 'page',
+  multiple: false,
+  availableSort: false,
+  order: [],
+  referenceSelect: [],
+  select: [],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [],
+  comment: {},
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  initList: ['exclude_list', 'model'],
+  editInline: {},
+  autoData: {},
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  modelQuery: {},
+  deleteCheckList: [],
+  bulkCreateList: [],
+}

package/core/file/utils/index.js

@@ -55,9 +55,10 @@ exports.getObject = (config, app) => async (type) => {
         const result = await app.model.application.findAll()
 
         if (result.length > 0) {
-          app.cache.set('application', JSON.parse(JSON.stringify(result)))
+          const formatData = JSON.parse(JSON.stringify(result))
+          app.cache.set('application', formatData)
 
-          const target = result.find(findConfig)
+          const target = formatData.find(findConfig)
           if (target) {
             flag = true
             return {

package/package.json

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