chao 2 days ago
parent
commit
66f8876c0c
2 changed files with 9 additions and 106 deletions
  1. 0 88
      model/register.js
  2. 9 18
      routes/router.js

+ 0 - 88
model/register.js

@@ -1,88 +0,0 @@
-var mongoose = require('mongoose');
-var bcrypt = require('bcryptjs');
-
-
-var UserSchema = mongoose.Schema({
-    type: { type: Number, default: 1 }, // 报名类型,1代表个人报名,2代表团队报名
-    uploadUrl: String, // 上传文件的URL
-    idCard: String, // 选手身份证号拼接 报名表
-    registrationFormUrl: String, // 报名表URL 报名成功后使用
-    user: [{
-        name: String, // 选手姓名
-        gender: String, // 性别
-        ethnicity: String, // 民族
-        birthdate: String, // 出生日期
-        email: String, // 电子邮箱
-        idNumber: Number, // 身份证号码
-        group: Number, // 1代表小学组,2代表初中组,3代表高中组, 4代表大学组
-        grade: String, // 年级
-        school: String, // 学校
-        schoolRegion: String, // 学校所在区县
-        phone: Number, // 联系电话
-    }]
-});
-
-UserSchema.statics.authopenid = function (openid, callback) {
-  User.findOne({ googleId: openid })
-    .exec(function (err, user) {
-      if (err) {
-        return callback(err)
-      } else if (!user) {
-        var err = new Error('User not found.');
-        err.status = 401;
-        return callback(err);
-      }
-      return callback(null, user);
-    });
-}
-UserSchema.statics.authPassword = function (userId, password, callback) {
-  User.findOne({ _id: userId })
-    .exec(function (err, user) {
-      if (err) {
-        return callback(err)
-      } else if (!user) {
-        var err = new Error('User not found');
-        err.status = 401;
-        return callback(err);
-      }
-      bcrypt.compare(password, user.password, function (err, result) {
-        if (result === true) {
-          return callback(null, user);
-        } else {
-          return callback();
-        }
-      })
-    })
-}
-UserSchema.pre('update', function (next) {
-  var user = this;
-  //if update content is active
-  if (user._update.$set.password) {
-    // user._update.$set.password
-    bcrypt.hash(user._update.$set.password, 10, function (err, hash) {
-      if (err) {
-        return next(err);
-      }
-      user.update({}, { $set: { password: hash } })
-      console.log('from pre: ' + hash)
-      next();
-    })
-  } else {
-    next();
-  }
-});
-
-//hashing a password before saving it to the database
-UserSchema.pre('save', function (next) {
-  var user = this;
-  bcrypt.hash(user.password, 10, function (err, hash) {
-    if (err) {
-      return next(err);
-    }
-    user.password = hash;
-    next();
-  })
-});
-
-var User = mongoose.model('User', UserSchema);
-module.exports = User;

+ 9 - 18
routes/router.js

@@ -2,30 +2,21 @@ var express = require('express');
 var router = express.Router();
 var mysql = require('../model/mysql');
 const _mysqluser = ["123.58.32.151", "cocorobouser"]; //用戶數據庫信息
-const User = require('../model/register');
 
 
 router.route('/user').post(async function (req, res) {
     const signUpData = req.body;
 
-    User.create(signUpData, function (err, user) {
-        if (err) {
-            console.log(err);
-            return res.status(500).send({ status: 'error', message: err });
-        } else {
-            console.log("用户报名成功");
-            signUpData.unshift(_mysqluser[0], _mysqluser[1], "add_register");
-            mysql.usselect(signUpData, function (data) {
-                console.log(data);
-                if(data[0] && data[0][0] && data[0][0].type == 1) {
-                    console.log("报名成功");
-                    res.send({ status: 'ok', user: user,message: '用户报名成功' });
-                }
-            });
-            
+    console.log("用户报名成功",signUpData);
+    signUpData.unshift(_mysqluser[0], _mysqluser[1], "registration");
+    mysql.usselect(signUpData, function (data) {
+        console.log(data);
+        if (data[0] && data[0][0] && data[0][0].type == 1) {
+            console.log("报名成功");
+            res.send({ status: 'ok', user: user, message: '用户报名成功' });
         }
-
     });
+
 });
 
 
@@ -37,4 +28,4 @@ router.route('/user').post(async function (req, res) {
 
 
 
-    module.exports = router;
+module.exports = router;