航班查询相关

controller/c_area.js

@@ -1,6 +1,6 @@
 const handle = require("../until/handle");
 const db_area = require("../database/d_area");
-
+const code = require('../maps/rcodeMap');
 /**
  * 新增城市
  * @param cityType
@@ -27,12 +27,15 @@ async function searchCity(cityType){
 /**
  * 更新城市信息
  * @param cityId
- * @param cityType
  * @param cityName
+ * @param cityType
  * @returns {Promise<*>}
  */
-async function updateCity(cityId,cityType,cityName){
-    let [err,result] = await handle(db_area.updateCity(cityId,cityType,cityName));
+async function updateCity(cityId,cityName,cityType){
+    if(!cityName&&!cityType){
+        throw {rcode:code.notParam,msg:'至少需要一个参数'}
+    }
+    let [err,result] = await handle(db_area.updateCity(cityId,cityName,cityType));
     if(err){throw err}
     return result;
 }

database/d_area.js

@@ -36,20 +36,22 @@ function searchAreas(cityType){
 /**
  * 更新指定城市
  * @param cityId 城市id
- * @param cityType 新的城市类型
- * @param cityName 新的城市名
+ * @param cityName 新的城市类型
+ * @param cityType 新的城市名
  * @returns {Promise<unknown>}
  */
-function updateCity(cityId,cityType,cityName){
+function updateCity(cityId,cityName,cityType){
     let sql=``,values=[];
     if(checkArgumentsIsEmpty(Array.from(arguments))){throw {rcode:code.notParam}}
     sql+=`update area set`
     if(cityType){
         sql+=' cityType = ?'
         values.push(cityType)
+
     }
     if(cityName){
-        sql+=' cityName = ?'
+        if(values.length>0){sql+=','}
+        sql+='cityName = ?'
         values.push(cityName)
     }
     sql += ` where id = ?;`

db.md

@@ -35,7 +35,6 @@
 | 字段            | 类型      | 默认值 | 可选值                      | 备注     |
 |---------------|---------|-----|--------------------------|--------|
 | id            | int     | pk  | n                        | id     |
-| routeId       | int     | pk  | 1                        | n      | 对应的航线id |
 | originalPrice | floor   | 1   | 0-99999                  | 原始机票价格 |
 | currentPrice  | floor   | 1   | 0-99999                  | 当前机票价格 |
 | sailingTime   | varcahr    | 0 | 0                      | 起飞时间,unix时间戳   |

routes/admin.js

@@ -46,7 +46,7 @@ router.post('/login',
         }catch (error) {
             if (error.rcode !== code.customError) {
                 console.log(error);
-                console.log.error(`login error ${error.message||error.msg}`);
+                console.error(`login error ${error.message||error.msg}`);
             }
             res.json({
                 rcode: error.rcode || code.serverError,
@@ -56,13 +56,11 @@ router.post('/login',
 })
 
 // 退出登陆
-router.post('/logout',
+router.get('/logout',
     async (req,res)=>{
         try{
             req.session[progress.adminSessionField] = null;
-            res.json({
-                rcode: code.ok,
-            })
+            res.redirect(302,progress.adminLoginUrl)
         }catch (error) {
             if (error.rcode !== code.customError) {
                 console.log(error);

routes/citys.js

@@ -56,12 +56,11 @@ router.post('/add',
 router.post('/change',
     checkLogin(field.adminType),
     paramsCheck({
-        body:{
-            cityType:{required:true},
-            cityName:{required:true}
+        post:{
+            cityId: {required:true},
         }}),async (req,res)=>{
         try{
-            let results = await c_area.addCity(req.body.cityType,req.body.cityName);
+            let results = await c_area.updateCity(req.body.cityId,req.body.cityName,req.body.cityType);
             res.json({
                 rcode: code.ok,
                 data: results

routes/users.js

@@ -1,10 +1,28 @@
 const router = require('express').Router();
 const userApi = require('./userApi');
+const progress = require("../maps/progress");
+const code = require("../maps/rcodeMap");
 /* 登录页面, . */
 router.get('/', function(req, res, next) {
   res.send('respond with a resource');
 });
 
+router.get('/logout',(req,res)=>{
+  try{
+    console.log('退出登陆')
+    req.session[progress.userSessionField] = null;
+    res.redirect(302,progress.userLoginUrl)
+  }catch (error) {
+    if (error.rcode !== code.customError) {
+      console.log(error);
+      console.log.error(`logout error ${error.message||error.msg}`);
+    }
+    res.json({
+      rcode: error.rcode || code.serverError,
+      msg: error.msg || error.message
+    });
+  }
+});
 router.use('/api',userApi)
 
 module.exports = router;