q-koa 13.0.5 → 13.0.9

package/core/app.js

@@ -1171,7 +1171,9 @@ class APP {
                 },
               }
               const $between = {
-                check: (param) => Array.isArray(param),
+                check: (param) =>
+                  Array.isArray(param) &&
+                  param.every((p) => p.includes('now()')),
                 result: (param, key) => {
                   return {
                     [key]: param[key].map(Sequelize.literal),
@@ -2005,13 +2007,13 @@ class APP {
           const where =
             ctx.request.clientType > 1
               ? {
-                  ...ctx.request.body,
                   createdid:
                     ctx.request.clientType > 1
                       ? ctx.request[`${appName}-user`]
                         ? ctx.request[`${appName}-user`].id
                         : 0
                       : 0,
+                  ...ctx.request.body,
                 }
               : ctx.request.body
           const result = await app[appName].model[controller][fn]({

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

@@ -2,7 +2,14 @@ const fs = require('fs')
 const fsPromise = require('fs/promises')
 const path = require('path')
 const crypto = require('crypto')
-const { Random, lodash, getAppByCtx, getConfig } = require('q-koa')
+const {
+  Random,
+  lodash,
+  getAppByCtx,
+  getConfig,
+  ServiceError,
+  sleep,
+} = require('q-koa')
 const Captchapng = require('captchapng')
 const qr = require('qr-image')
 const OSS = require('ali-oss')
@@ -594,11 +601,77 @@ exports.sql = async (ctx) => {
 
 exports.gpt = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
-  const { content = '' } = ctx.request.body
+  const appConfig = getConfig(app)
+  const { ai_key } = await appConfig.getObject('base')
+  const { content, session_id, is_chunk = true } = ctx.request.body
+
+  if (!content) throw new ServiceError('没有内容content')
+  let statusCode = 200
+  const url =
+    'https://dashscope.aliyuncs.com/api/v1/apps/69c314f8f87e4a2080af950e5997bdc6/completion'
+
+  const response = await axios({
+    url,
+    method: 'POST',
+    ...(is_chunk
+      ? {
+          responseType: 'stream',
+        }
+      : {}),
+    data: {
+      input: {
+        prompt: content,
+        ...(session_id
+          ? {
+              session_id,
+            }
+          : {}),
+      },
+    },
+    headers: {
+      Authorization: `Bearer ${ai_key}`,
+      'Content-Type': 'application/json',
+      ...(is_chunk
+        ? {
+            'X-DashScope-SSE': 'enable',
+          }
+        : {}),
+    },
+  }).catch((e) => {
+    if (e.message.includes('401')) {
+      statusCode = 401
+      ctx.response.status = statusCode
+    }
+    if (e.message.includes('500')) {
+      statusCode = 500
+      ctx.response.status = statusCode
+    }
+    throw new Error(e.message)
+  })
 
-  if (!content) return ctx.ERROR('没有内容')
+  if (!is_chunk) {
+    const res = response.data
+    return ctx.SUCCESS(res)
+  }
 
-  const res = await app.service.common.gpt({ app, content })
+  // console.log('response', response)
 
-  ctx.SUCCESS(res)
+  ctx.response.status = statusCode
+  if (statusCode !== 200) {
+    return
+  }
+  ctx.res.setHeader('Content-Type', 'text/event-stream')
+  ctx.res.setHeader('Cache-Control', 'no-cache')
+  ctx.res.setHeader('Connection', 'keep-alive')
+
+  response.data.on('data', (chunk) => {
+    ctx.res.write(chunk)
+  })
+  response.data.on('end', (chunk) => {
+    ctx.res.end()
+  })
+  response.data.on('error', (res) => {
+    console.log(res)
+  })
+  await sleep(1000000)
 }

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

@@ -153,7 +153,7 @@ exports.login = async (ctx) => {
     const application = await getAppConfig({ app, config })
 
     const loginData = lodash.mergeWith(
-      app.appConfig.loginData,
+      lodash.cloneDeep(app.appConfig.loginData),
       lodash.get(application, 'loginData', {}),
       (objValue, srcValue) => {
         if (lodash.isArray(objValue)) {
@@ -355,9 +355,8 @@ exports.checkLogin = async (ctx) => {
 
     if (app.appConfig.loginData) {
       const application = await getAppConfig({ app, config })
-
       const loginData = lodash.mergeWith(
-        app.appConfig.loginData,
+        lodash.cloneDeep(app.appConfig.loginData),
         lodash.get(application, 'loginData', {}),
         (objValue, srcValue) => {
           if (lodash.isArray(objValue)) {
@@ -365,6 +364,7 @@ exports.checkLogin = async (ctx) => {
           }
         }
       )
+
       const include = includeDefault.filter((i) => {
         return loginData.excludeInclude.every((m) => {
           return app.model[m] !== i.model

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

@@ -444,7 +444,7 @@ exports.mp_login = async (ctx) => {
   if (app.appConfig.loginData) {
     const application = await getAppConfig({ app, config })
     const loginData = lodash.mergeWith(
-      app.appConfig.loginData,
+      lodash.cloneDeep(app.appConfig.loginData),
       lodash.get(application, 'loginData', {}),
       (objValue, srcValue) => {
         if (lodash.isArray(objValue)) {

package/package.json

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