q-koa 8.8.4 → 8.8.7

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

@@ -48,3 +48,56 @@ exports.copyOther = async (ctx) => {
 
   ctx.SUCCESS('ok')
 }
+
+exports.init = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const parentList = await app.model.setting.findAll({
+    where: {
+      parent_id: 0,
+    },
+    order: [['id', 'ASC']],
+    raw: true,
+  })
+
+  let list = []
+  let number = 0
+  for (let i = 0; i < parentList.length; i++) {
+    number += 1
+    const { id: parent_id, ...rest } = parentList[i]
+    list = [
+      ...list,
+      {
+        id: number,
+        ...rest,
+        parent_id: 0,
+      },
+    ]
+    const childList = await app.model.setting.findAll({
+      where: {
+        parent_id,
+      },
+      order: [['id', 'ASC']],
+      raw: true,
+    })
+    list = [
+      ...list,
+      ...childList.map((item, index) => {
+        const { id: child_id, ...restChild } = item
+        const id = number + index + 1
+
+        return {
+          id,
+          ...restChild,
+          parent_id: number,
+        }
+      }),
+    ]
+    number += childList.length
+  }
+
+  await app.model.setting.sync({ force: true })
+  await app.model.setting.bulkCreate(list)
+
+  ctx.SUCCESS(list)
+}

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

@@ -183,6 +183,8 @@ exports.showTables = async (ctx) => {
       deleteCheckList: lodash.get(target, 'deleteCheckList', []),
       // 批量更新字段
       bulkCreateList: lodash.get(target, 'bulkCreateList', []),
+
+      fn: app.controller[_model] ? Object.keys(app.controller[_model]) : [],
     }
   })
 

package/core/file/services/print.js

@@ -0,0 +1,115 @@
+const { lodash, getConfig } = require('q-koa')
+const yly = require('yly-nodejs-sdk')
+// const LRU = require('lru-cache')
+// const cache = new LRU({
+//   max: 100,
+//   maxAge: 1000 * 60 * 60,
+// })
+// const cacheKey = Symbol('print')
+module.exports = class Singleton {
+  constructor(config) {
+    this.config = {
+      ...config,
+    }
+
+    /**
+     * 单例模式
+     */
+    if (!Singleton.instance) {
+      Singleton.instance = this
+    }
+    const previous = Singleton.instance.getConfig()
+    if (!lodash.isEqual(previous, config)) {
+      Singleton.instance = this
+    }
+    return Singleton.instance
+  }
+
+  async getAccessToken() {
+    const app = this.config.app
+    const { cid, secret } = this.config
+    this.oauthConfig = new yly.Config({
+      cid,
+      secret,
+    })
+    const oauthClient = new yly.OauthClinet(this.oauthConfig)
+
+    const tokenData = await app.model.setting.findOne({
+      where: {
+        code: 'print_token',
+        name: 'AccessToken',
+      },
+    })
+    const print_token = tokenData.value
+    if (print_token) return print_token
+    const res = await oauthClient.getToken()
+    if (res.error !== 0 && res.error_description !== 'success') {
+      throw new Error('failed:' + res.error_description)
+    }
+    await app.model.setting.update(
+      {
+        value: res.body.access_token,
+      },
+      {
+        where: {
+          code: 'print_token',
+          name: 'AccessToken',
+        },
+      }
+    )
+
+    return res.body.access_token
+  }
+
+  async print({ order_id = 0, content }) {
+    const app = this.config.app
+    const accessToken = await this.getAccessToken()
+    try {
+      const RpcClient = new yly.RpcClient(accessToken, this.oauthConfig)
+      const Print = new yly.Print(RpcClient)
+      return await Print.index(this.config.machine_code, order_id, content)
+    } catch (e) {
+      throw new Error(`请重试,${e.message}`)
+      await app.model.setting.update(
+        {
+          value: '',
+        },
+        {
+          where: {
+            code: 'print_token',
+            name: 'AccessToken',
+          },
+        }
+      )
+      // return await this.print({ order_id, content })
+    }
+  }
+
+  async cancelAll() {
+    const app = this.config.app
+    const accessToken = await this.getAccessToken()
+    try {
+      const RpcClient = new yly.RpcClient(accessToken, this.oauthConfig)
+      const Print = new yly.Printer(RpcClient)
+      return await Print.cancelAll(this.config.machine_code)
+    } catch (e) {
+      throw new Error(`请重试,${e.message}`)
+      await app.model.setting.update(
+        {
+          value: '',
+        },
+        {
+          where: {
+            code: 'print_token',
+            name: 'AccessToken',
+          },
+        }
+      )
+      // return await this.print({ order_id, content })
+    }
+  }
+
+  getConfig() {
+    return this.config
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "8.8.4",
+  "version": "8.8.7",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -55,7 +55,8 @@
     "weixin-pay-fork": "^1.0.0",
     "node-uuid": "^1.4.8",
     "sha1": "^1.1.1",
-    "redis": "^4.0.3"
+    "redis": "^4.0.3",
+    "yly-nodejs-sdk": "^1.0.2"
   },
   "devDependencies": {
     "eslint": "^4.19.1",