q-koa 13.0.3 → 13.0.5

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

@@ -594,12 +594,11 @@ exports.sql = async (ctx) => {
 
 exports.gpt = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
-  const appConfig = getConfig(app)
-  const { content } = ctx.request.body
-  if (!content) return ctx.ERROR('?content')
-  if (!app.service.common) throw new Error(`common可能没有service.js`)
-  const result = await app.service.common.gpt({
-    content,
-  })
-  return ctx.SUCCESS(result)
+  const { content = '' } = ctx.request.body
+
+  if (!content) return ctx.ERROR('没有内容')
+
+  const res = await app.service.common.gpt({ app, content })
+
+  ctx.SUCCESS(res)
 }

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

@@ -1,42 +1,36 @@
+const { getConfig, ServiceError } = require('q-koa')
 const axios = require('axios')
 const XLSX = require('xlsx')
 const moment = require('moment')
 
-exports.gpt = async ({ content }) => {
-  let result = ''
-  let messages = [
-    {
-      content,
-      role: 'user',
-    },
-  ]
+exports.gpt = async ({ app, content }) => {
+  if (!content) throw new ServiceError('?content')
 
-  for (let i = 0; i < 1000; i++) {
-    try {
-      const { choices } = await axios
-        .post('https://gpt.likangjian.cn:3001/gpt/chat', {
-          messages,
-        })
-        .then((res) => res.data)
-      console.log(choices.finish_reason, 'REPLY:', choices[0].message.content)
-      result += choices[0].message.content
-      if (choices.finish_reason === 'stop' || !choices.finish_reason) {
-        break
-      }
-      messages = [
-        ...messages,
-        choices[0].message,
-        {
-          content: '继续',
-          role: 'user',
+  const appConfig = getConfig(app)
+  const { ai_key } = await appConfig.getObject('base')
+  const url =
+    'https://dashscope.aliyuncs.com/api/v1/apps/69c314f8f87e4a2080af950e5997bdc6/completion'
+
+  const {
+    output: { text },
+  } = await axios
+    .post(
+      url,
+      {
+        input: {
+          prompt: content,
         },
-      ]
-    } catch (e) {
-      throw new Error('ai开小差了')
-    }
-  }
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${ai_key}`,
+          'Content-Type': 'application/json',
+        },
+      }
+    )
+    .then((res) => res.data)
 
-  return result
+  return text
 }
 
 exports.formatXLSX = ({ header, data, fileName: _fileName }) => {

package/core/file/services/express.js

@@ -38,11 +38,12 @@ module.exports = class Singleton {
         throw new Error(result.msg)
       }
     } catch (e) {
+      const message = ` ${no} ${e.message || '物流服务暂不可用'}`
       push({
         appName: 'express',
-        message: '物流服务暂不可用',
+        message,
       })
-      throw new Error('物流服务暂不可用')
+      throw new Error(message)
     }
   }
 

package/package.json

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