添加后端接口修改前端及小程序

government-backend/config/index.js

@@ -1,13 +1,16 @@
-const DB_HOST = process.env.DB_HOST || '129.211.213.226';
+// 数据库配置
 const DB_PORT = process.env.DB_PORT || 9527;
 const DB_NAME = process.env.DB_NAME || 'ningxia_zhengfu';
 const DB_USER = process.env.DB_USER || 'root';
 const DB_PASSWORD = process.env.DB_PASSWORD || 'aiotAiot123!';
 const DB_DIALECT = process.env.DB_DIALECT || 'mysql';
-// const DB_HOST = process.env.DB_HOST || '129.211.213.226';
+const DB_HOST = process.env.DB_HOST || '129.211.213.226';
 
 module.exports = {
+  // JWT密钥配置
   JWT_SECRET: 'your-secret-key-here', // 请在生产环境中替换为强密钥
+  
+  // 数据库连接配置
   DB_CONFIG: {
     host: DB_HOST,
     user: DB_USER,
@@ -16,5 +19,7 @@ module.exports = {
     port: DB_PORT,
     dialect: DB_DIALECT
   },
+  
+  // 服务器端口
   PORT: 5352
-}
+};

government-backend/controllers/authController.js

@@ -2,6 +2,8 @@ const jwt = require('jsonwebtoken');
 const User = require('../models/User');
 const AdminStaff = require('../models/AdminStaff');
 const bcrypt = require('bcryptjs');
+const jwtModule = require('jsonwebtoken');
+const tokenBlacklist = require('../utils/tokenBlacklist');
 
 // JWT配置
 const JWT_SECRET = process.env.JWT_SECRET || 'your-secret-key-change-in-production';
@@ -40,7 +42,7 @@ exports.login = async (req, res) => {
       last_login: new Date()
     });
     
-    const token = jwt.sign({
+    const token = jwtModule.sign({
       id: user.id,
       username: user.username,
       role: user.role
@@ -74,17 +76,18 @@ exports.getUserInfo = async (req, res) => {
     }
 
     try {
-      const decoded = jwt.verify(token, JWT_SECRET);
+      // 先检查token是否在黑名单中
+      if (tokenBlacklist.isBlacklisted(token)) {
+        return res.status(401).json({
+          code: 401,
+          message: '认证令牌已失效（已退出登录）'
+        });
+      }
+      
+      const decoded = jwtModule.verify(token, JWT_SECRET);
       
       // 从数据库获取用户信息
-      const user = await User.findByPk(decoded.id, {
-        include: [
-          {
-            model: AdminStaff,
-            as: 'staffInfo'
-          }
-        ]
-      });
+      const user = await User.findByPk(decoded.id);
       
       if (!user || user.status !== 'active') {
         return res.status(401).json({
@@ -150,7 +153,7 @@ exports.getUserInfo = async (req, res) => {
 };
 
 // 根据角色获取权限
-exports.getPermissionsByRole = (role) => {
+function getPermissionsByRole(role) {
   const basePermissions = ['dashboard'];
   
   switch (role) {
@@ -165,4 +168,44 @@ exports.getPermissionsByRole = (role) => {
     default:
       return basePermissions;
   }
+};
+
+// 退出登录
+exports.logout = async (req, res) => {
+  try {
+    // 从请求头中获取token
+    const token = req.headers.authorization?.replace('Bearer ', '');
+    
+    if (token) {
+      try {
+        // 解码token获取过期时间
+        const decoded = jwtModule.decode(token);
+        if (decoded && decoded.exp) {
+          // 计算token剩余有效期（毫秒）
+          const currentTime = Math.floor(Date.now() / 1000);
+          const expiresIn = (decoded.exp - currentTime) * 1000;
+          
+          if (expiresIn > 0) {
+            // 将token添加到黑名单
+            tokenBlacklist.addToBlacklist(token, expiresIn);
+            console.log(`用户退出登录，token已添加到黑名单: ${token.substring(0, 20)}...`);
+          }
+        }
+      } catch (decodeError) {
+        console.warn('解码token失败:', decodeError);
+      }
+    }
+    
+    return res.json({
+      code: 200,
+      message: '退出登录成功'
+    });
+  } catch (err) {
+    console.error('退出登录错误:', err);
+    res.status(500).json({
+      code: 500,
+      message: '服务器错误',
+      error: err.message
+    });
+  }
 };

government-backend/routes/auth.js

@@ -1,6 +1,6 @@
 const express = require('express')
 const router = express.Router()
-const { login, getUserInfo } = require('../controllers/authController')
+const { login, getUserInfo, logout } = require('../controllers/authController')
 
 // 用户登录
 router.post('/login', login)
@@ -8,4 +8,7 @@ router.post('/login', login)
 // 获取用户信息
 router.get('/userinfo', getUserInfo)
 
+// 退出登录
+router.post('/logout', logout)
+
 module.exports = router

government-backend/test-epidemic-fix.js

@@ -0,0 +1,101 @@
+// 测试修复后的epidemic agencies接口
+const axios = require('axios');
+
+// 政府后端服务地址
+const BASE_URL = 'http://localhost:5352/api';
+
+// 登录获取token
+async function login() {
+  try {
+    console.log('开始登录...');
+    const response = await axios.post(`${BASE_URL}/auth/login`, {
+      username: 'admin',
+      password: '123456'
+    });
+    
+    console.log('登录响应:', response.data);
+    
+    if (response.data.code === 200 && response.data.data && response.data.data.token) {
+      console.log('登录成功，获取到token');
+      return response.data.data.token;
+    } else {
+      console.log('登录失败，未获取到token');
+      console.log('错误信息:', response.data.message || '未知错误');
+      return null;
+    }
+  } catch (error) {
+    console.error('登录请求失败:', error.message);
+    if (error.response) {
+      console.error('错误状态码:', error.response.status);
+      console.error('错误数据:', error.response.data);
+    }
+    return null;
+  }
+}
+
+// 测试新增防疫机构
+async function testCreateAgency(token) {
+  try {
+    console.log('\n开始测试新增防疫机构...');
+    const testData = {
+      name: '测试防疫机构' + Date.now(),
+      code: 'TEST-' + Date.now(),
+      type: 'station',
+      level: 'county',
+      manager: '测试负责人',
+      phone: '13800138999',
+      address: '测试地址',
+      epidemicScope: '测试防疫范围',
+      remarks: '测试备注',
+      email: 'test@example.com',
+      status: 'active',
+      establishmentDate: '2024-01-01'
+    };
+    
+    console.log('提交的数据:', testData);
+    
+    const response = await axios.post(`${BASE_URL}/epidemic/agencies`, testData, {
+      headers: {
+        'Authorization': `Bearer ${token}`
+      }
+    });
+    
+    console.log('新增防疫机构成功');
+    console.log(`- 状态码: ${response.status}`);
+    console.log(`- 返回数据:`, response.data);
+    
+    return response.data;
+  } catch (error) {
+    console.error('测试新增防疫机构失败:', error.message);
+    if (error.response) {
+      console.error('错误状态码:', error.response.status);
+      console.error('错误数据:', error.response.data);
+    }
+    return null;
+  }
+}
+
+// 执行测试
+async function runTests() {
+  try {
+    console.log('开始测试修复后的epidemic agencies接口...');
+    
+    // 1. 登录获取token
+    const token = await login();
+    if (!token) {
+      console.log('未获取到token，测试终止');
+      return;
+    }
+    
+    // 2. 测试新增防疫机构
+    const createResult = await testCreateAgency(token);
+    
+    console.log('\n测试完成！');
+    
+  } catch (error) {
+    console.error('测试过程中发生错误:', error);
+  }
+}
+
+// 执行测试
+runTests();

government-backend/utils/tokenBlacklist.js

@@ -0,0 +1,36 @@
+// token黑名单管理模块
+
+// 简单的内存存储，实际生产环境中可以替换为Redis或数据库
+const tokenBlacklist = new Set();
+
+/**
+ * 将token添加到黑名单
+ * @param {string} token - JWT令牌
+ * @param {number} expiresIn - 过期时间（毫秒）
+ */
+exports.addToBlacklist = (token, expiresIn) => {
+  tokenBlacklist.add(token);
+  
+  // 设置定时任务，在token过期后从黑名单中移除
+  setTimeout(() => {
+    tokenBlacklist.delete(token);
+    console.log(`Token已从黑名单中移除: ${token.substring(0, 20)}...`);
+  }, expiresIn);
+};
+
+/**
+ * 检查token是否在黑名单中
+ * @param {string} token - JWT令牌
+ * @returns {boolean} - 如果token在黑名单中返回true，否则返回false
+ */
+exports.isBlacklisted = (token) => {
+  return tokenBlacklist.has(token);
+};
+
+/**
+ * 获取当前黑名单大小
+ * @returns {number} - 黑名单中的token数量
+ */
+exports.getBlacklistSize = () => {
+  return tokenBlacklist.size;
+};