Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
WebWechatBot
1
1
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

对代码做了部分优化

Pchen 1 year ago
parent
bdf14ea51d
commit
f8b92a7de0
13 changed files with 21 additions and 17 deletions
Unified View Show Diff Stats
  1. 2 2
      API/xunfei.js
  2. 1 1
      README.md
  3. 0 1
      app.js
  4. 0 0
      public/css/app.5db3910d.css
  5. 0 0
      public/css/app.a1a2bfd3.css
  6. 1 1
      public/index.html
  7. 0 0
      public/js/app.06c11dd4.js
  8. 0 0
      public/js/app.06c11dd4.js.map
  9. 0 0
      public/js/app.7f67ff3c.js
  10. 0 0
      public/js/app.7f67ff3c.js.map
  11. 10 4
      router.js
  12. BIN
      wechat/avatar/avatar.jpg
  13. 7 8
      wechat/main.js

+ 2 - 2
API/xunfei.js
View File 

@@ -99,11 +99,11 @@ GET ${path} HTTP/1.1`
 
             }))
 
             }))
 
         })
 
         })
 
 
 
-        console.log(domain,temperature)
 
         let apiMessage = ''
 
         let apiMessage = ''
 
 
 
         sock.on("error", function (err) {
 
         sock.on("error", function (err) {
 
-            reject(err)
 
+            let errMessage = '获取消息失败!'+err.message
 
+                reject(errMessage)
 
         })
 
         })
 
 
 
         sock.on("close", function () {
 
         sock.on("close", function () {

+ 1 - 1
README.md
View File 

@@ -1,6 +1,6 @@
 
 <h1 align="center">Web Wechat Bot</h1>
 
 <h1 align="center">Web Wechat Bot</h1>
 
 
 
-「Web Wechat Bot」是一个基于Wechaty、可通过网页远程登录管理、可接入讯飞星火、ChatGPT等大语言模型的微信聊天机器人，使用微信网页版协议。
 
+「Web Wechat Bot」是一个基于Wechaty、可通过网页远程登录管理、可接入讯飞星火、ChatGPT等大语言模型的微信聊天机器人，使用微信网页版协议。你可以通过网页登录微信、设置回复规则、配置API接口等。

+ 0 - 1
app.js
View File 

@@ -1,5 +1,4 @@
 
 const express = require('express')
 
 const express = require('express')
 
-
 
 const router = require('./router.js')
 
 const router = require('./router.js')
 
 const config = require('./config.js')
 
 const config = require('./config.js')

File diff suppressed because it is too large
+ 0 - 0
public/css/app.5db3910d.css


File diff suppressed because it is too large
+ 0 - 0
public/css/app.a1a2bfd3.css


+ 1 - 1
public/index.html
View File 

@@ -1 +1 @@
 
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>webbot</title><script defer="defer" src="js/chunk-vendors.310ecf7c.js"></script><script defer="defer" src="js/app.06c11dd4.js"></script><link href="css/chunk-vendors.0e83c255.css" rel="stylesheet"><link href="css/app.5db3910d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but webbot doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>webbot</title><script defer="defer" src="js/chunk-vendors.310ecf7c.js"></script><script defer="defer" src="js/app.7f67ff3c.js"></script><link href="css/chunk-vendors.0e83c255.css" rel="stylesheet"><link href="css/app.a1a2bfd3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but webbot doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

File diff suppressed because it is too large
+ 0 - 0
public/js/app.06c11dd4.js


File diff suppressed because it is too large
+ 0 - 0
public/js/app.06c11dd4.js.map


File diff suppressed because it is too large
+ 0 - 0
public/js/app.7f67ff3c.js


File diff suppressed because it is too large
+ 0 - 0
public/js/app.7f67ff3c.js.map


+ 10 - 4
router.js
View File 

@@ -53,8 +53,9 @@ router.use(checkToken)
 
 
 
 //用户登录
 
 //用户登录
 
 router.post('/userlogin', (req, res) => {
 
 router.post('/userlogin', (req, res) => {
 
-    var username = req.body.username
 
-    var password = req.body.password
 
+    const username = req.body.username
 
+    const password = req.body.password
 
+    const remember = req.body.remember
 
 
 
     // 匹配密码
 
     // 匹配密码
 
     db.all('select * from user where username=?', username, function (err, row) {
 
     db.all('select * from user where username=?', username, function (err, row) {
 
@@ -67,8 +68,13 @@ router.post('/userlogin', (req, res) => {
 
                     res.send({ status: 500, msg: "密码错误" })
 
                     res.send({ status: 500, msg: "密码错误" })
 
                 } else {
 
                 } else {
 
                     // 如果用户名存在且密码匹配，则登录成功。
 
                     // 如果用户名存在且密码匹配，则登录成功。
 
-                    const tokenStr = jsonwebtoken.sign({ username: username }, secretKey, { expiresIn: '24h' })
 
-                    res.send({ status: 200, msg: "登录成功", token: "Bearer " + tokenStr })
 
+                    if(remember) {
 
+                        const tokenStr = jsonwebtoken.sign({ username: username }, secretKey)
 
+                        res.send({ status: 200, msg: "登录成功", token: "Bearer " + tokenStr })
 
+                    } else{
 
+                        const tokenStr = jsonwebtoken.sign({ username: username }, secretKey, { expiresIn: '24h' })
 
+                        res.send({ status: 200, msg: "登录成功", token: "Bearer " + tokenStr })
 
+                    }
 
                 }
 
                 }
 
             }
 
             }
 
         }
 
         }

BIN
wechat/avatar/avatar.jpg
View File


+ 7 - 8
wechat/main.js
View File 

@@ -56,15 +56,17 @@ loadConfigValues()
 
 
 
 //选择模型
 
 //选择模型
 
 async function sendMessageToAPI(message) {
 
 async function sendMessageToAPI(message) {
 
-    if (usemodel==='xunfei'){
 
+    if (usemodel === 'xunfei'){
 
         const response = await getXunfeiMessage(message)
 
         const response = await getXunfeiMessage(message)
 
         const content = prefix + response + suffix
 
         const content = prefix + response + suffix
 
         return content
 
         return content
 
-    }   else  {
 
+    }   else if(usemodel === 'chatgpt') {
 
         const response = await getGPTMessage(message)
 
         const response = await getGPTMessage(message)
 
         const content = prefix + response + suffix
 
         const content = prefix + response + suffix
 
         return content
 
         return content
 
-    }  
+    }  else {
 
+        return
 
+    }
 
 }
 
 }
 
 
 
 //获取时间
 
 //获取时间
 
@@ -93,11 +95,9 @@ async function stopWx() {
 
     } 
     } 
 }
 
 }
 
 
 
-
 
 let Status = { status: null }
 
 let Status = { status: null }
 
 let User = {name: null}
 
 let User = {name: null}
 
 
 
-
 
 async function wxlogin() {
 
 async function wxlogin() {
 
     if (isRunning) {
 
     if (isRunning) {
 
         isRunning = false
 
         isRunning = false
 
@@ -123,12 +123,11 @@ async function wxlogin() {
 
                 Status.status = 200
 
                 Status.status = 200
 
                 // 获取登录用户的信息
 
                 // 获取登录用户的信息
 
                 const contact = await wechaty.Contact.find({ id: user.id })
 
                 const contact = await wechaty.Contact.find({ id: user.id })
 
-                const name = await contact.name()
 
+                const name = contact.name()
 
                 const avatarFileBox = await contact.avatar()
 
                 const avatarFileBox = await contact.avatar()
 
                 User.name = name
 
                 User.name = name
 
                 // 将头像保存到本地
 
                 // 将头像保存到本地
 
-                const avatarFilePath = `./wechat/avatar/avatar.jpg`
 
-                await avatarFileBox.toFile(avatarFilePath,true)
 
+                    await avatarFileBox.toFile(`./wechat/avatar/avatar.jpg`,true)
 
             })
 
             })
 
 
 
             .on('logout', async () => {
 
             .on('logout', async () => {

Some files were not shown because too many files changed in this diff