q-koa 8.3.2 → 8.4.1

package/core/app.js

@@ -5,6 +5,7 @@ const path = require('path')
 const fs = require('fs')
 const fsPromise = require('fs/promises')
 const Sequelize = require('sequelize')
+const redis = require('redis')
 const moment = require('moment')
 const { EventEmitter } = require('events')
 const nodeVm = require('vm')
@@ -351,13 +352,29 @@ class APP {
         const configFile = path.resolve(__dirname, configPath)
         const configExist = fs.existsSync(configFile)
 
-        this.app[appName] = {
-          sequelize: db,
-          appConfig: _.defaultsDeep(
-            configExist ? require(path.resolve(__dirname, configPath)) : {},
-            this.config.app
-          ),
+        if (this.config.redis && this.config.redis.url) {
+          const client = redis.createClient(this.config.redis)
+          client.on('error', (err) => console.log('Redis Client Error', err))
+
+          await client.connect()
+          this.app[appName] = {
+            sequelize: db,
+            redisClient: client,
+            appConfig: _.defaultsDeep(
+              configExist ? require(path.resolve(__dirname, configPath)) : {},
+              this.config.app
+            ),
+          }
+        }else{
+          this.app[appName] = {
+            sequelize: db,
+            appConfig: _.defaultsDeep(
+              configExist ? require(path.resolve(__dirname, configPath)) : {},
+              this.config.app
+            ),
+          }
         }
+        
 
         // const proxyConfig = _.get(this.app[appName], 'appConfig.proxy');
         // const taskConfig = _.get(this.app[appName], 'appConfig.task', {
@@ -1671,15 +1688,17 @@ class APP {
             throw new Error('新增不能为空')
           }
           const _exclude =
-            ctx.request[`${appName}-user`] &&
-            ((ctx.request[`${appName}-user`].name &&
-              ctx.request[`${appName}-user`].name === 'admin') ||
-              (ctx.request[`${appName}-user`].mobile &&
-                ctx.request[`${appName}-user`].mobile === '18978909244') ||
-              ctx.request[`${appName}-user`].is_admin ||
-              ctx.request[`${appName}-user`].is_dev)
+            ctx.request.clientType === 1 ||
+            (ctx.request[`${appName}-user`] &&
+              ((ctx.request[`${appName}-user`].name &&
+                ctx.request[`${appName}-user`].name === 'admin') ||
+                (ctx.request[`${appName}-user`].mobile &&
+                  ctx.request[`${appName}-user`].mobile === '18978909244') ||
+                ctx.request[`${appName}-user`].is_admin ||
+                ctx.request[`${appName}-user`].is_dev))
               ? ['updated_at']
               : ['created_at', 'updated_at']
+
           const newData = _.omit(_.omitBy(ctx.request.body, _.isNull), _exclude)
 
           const flag = await app[appName].model[controller][fn]({

package/core/config.js

@@ -68,6 +68,9 @@ module.exports = {
       // some logic that returns a boolean
     },
   },
+  redis: {
+    url: '',
+  },
   db: {
     username: 'root',
     password: '123456789abc',

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

@@ -8,13 +8,15 @@ const superAdmin = {
 
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
+  const { host } = ctx.request
   const { name, password } = ctx.request.body
-
+  const is_dev = host.startsWith('localhost')
   const permissionList = await app.model.permission.findAll({
     attributes: {
       exclude: ['createdid', 'updated_at', 'created_at', 'name'],
     },
   })
+  if (name === superAdmin.name && !is_dev) throw new Error('账号密码错误')
   if (name === superAdmin.name && password === superAdmin.password) {
     const token = await app.sign({
       user: superAdmin,
@@ -85,12 +87,20 @@ exports.login = async (ctx) => {
 
 exports.checkLogin = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
+  const { host } = ctx.request
+  const is_dev = host.startsWith('localhost')
   const permissionList = await app.model.permission.findAll({
     attributes: {
       exclude: ['createdid', 'updated_at', 'created_at', 'name'],
     },
   })
   if (ctx.request[`${appName}-user`]) {
+    if (ctx.request[`${appName}-user`].name === superAdmin.name && !is_dev) {
+      return ctx.SUCCESS({
+        token: null,
+        user: null,
+      })
+    }
     if (ctx.request[`${appName}-user`].name === superAdmin.name) {
       const token = await app.sign({
         user: superAdmin,

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

@@ -70,7 +70,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
 
           if (app.controller[model] && app.controller[model][fn]) {
             return app.controller[model][fn](ctx, data).then((result) => {
-              if (!result) {
+              if (!result && process.env.NODE_ENV !== 'production') {
                 console.log(`需要在控制器${fn}中返回`)
               }
               return {

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

@@ -918,7 +918,7 @@ exports.notify = async (ctx) => {
     transactionid = result.xml.transaction_id
   } catch (e) {}
 
-  console.log(order_id, '微信支付回调-----', model, order_price, transactionid)
+  // console.log(order_id, '微信支付回调-----', model, order_price, transactionid)
   if (app.service[model] && app.service[model].notify) {
     await app.service[model].notify({
       app,
@@ -1094,9 +1094,9 @@ exports.refund_notify = async (ctx) => {
     : Number(out_refund_no)
   const type = out_refund_no.includes('_') ? out_refund_no.split('_')[1] : ''
   const model = prefix ? `${prefix}_order` : 'order'
-  console.log(
-    `微信退款回调 prefix:${prefix}/model:${model}/order_id:${order_id}/type:${type}`
-  )
+  // console.log(
+  //   `微信退款回调 prefix:${prefix}/model:${model}/order_id:${order_id}/type:${type}`
+  // )
   if (app.service[model] && app.service[model].refund_notify) {
     await app.service[model].refund_notify({
       app,

package/core/file/services/express.js

@@ -30,7 +30,6 @@ module.exports = class Singleton {
         },
       }).then((res) => res.data)
 
-      console.log('result', result)
       if (result.msg === 'ok' || result.status === '205') {
         return result.result
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "8.3.2",
+  "version": "8.4.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -54,7 +54,8 @@
     "wechat-oauth": "^1.5.0",
     "weixin-pay-fork": "^1.0.0",
     "node-uuid": "^1.4.8",
-    "sha1": "^1.1.1"
+    "sha1": "^1.1.1",
+    "redis": "^4.0.3"
   },
   "devDependencies": {
     "eslint": "^4.19.1",