change:添加time模块

fix:修复模块引用问题

server/control/c_user.js

@@ -5,3 +5,8 @@ const d_user = require("../database/d_user");
 function login(owner,passwd){
   return d_user.login(owner,passwd);
 }
+
+
+module.exports = {
+    login
+}

server/database/d_user.js

@@ -0,0 +1,11 @@
+const mysql = require('./mysql');
+const {searchSql,limitSql} = require("../tools/searchSql");
+const log = require("../logger").logger("d_user","info");
+
+function login(account,passwd){
+
+}
+
+module.exports = {
+  login
+}

server/router/r_user.js

@@ -2,9 +2,9 @@ const router = require('express').Router();
 const {paramFail, ServerError, success, controlError, searchSuccess} = require("../tools/result");
 const c = require("../control/c_user");
 const typeTool = require("../tools/typeTool");
+const time = require("../../until/time");
 const {toSqlString} = require("../tools/searchSql");
 const log = require("../logger").logger("r_solution","info");
-
 router.post('/login', async (req, res) => {
   try{
     let err, userData;
@@ -33,7 +33,7 @@ router.post('/login', async (req, res) => {
     }
     // 加密模块
     // 尝试查找账户
-    [err,userData] = await c_user.userLogin(account, passwd);
+    [err,userData] = await c.login(account, passwd);
     if(err){
       log.warn(`[用户登录] 登陆失败 ${err.message}`);
       paramFail(res, `登陆失败 ${err.message}`);
@@ -41,11 +41,11 @@ router.post('/login', async (req, res) => {
       loginData.isLogin = true;
       loginData.userId = userData['userId'];
       // 存储用户状态到session
-      req.session[progressField.session_hfy] = userData;
-      res.json({
-        rcode: codeMap.ok,
-        data: userData
-      });
+      // req.session[progressField.session_hfy] = userData;
+      // res.json({
+      //   rcode: codeMap.ok,
+      //   data: userData
+      // });
     }
     let [Err,isOk] = await c_user.saveLoginData(loginData);
   }catch (e) {

until/time.js

@@ -64,3 +64,16 @@ export function timeFormat(time, format) {
     }
   })
 }
+
+export function getUnixTimeStamp(){
+  return Math.round(new Date().getTime()/1000);
+}
+
+if(module && module.exports){
+  module.exports = {
+    timestampToTime,
+    timeStrToTimeStamp,
+    timeFormat,
+    getUnixTimeStamp
+  }
+}