Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-api

pbl.js

@@ -511,27 +511,23 @@ router.route('/addRaceUser').all((req, res, next) => {
         mysql.usselect(p, function(ret) {
             let num = ret[0][0].num;
             let userid = ret[0][0].userid;
-            res.end(JSON.stringify({ num: num, userid: userid, success: 1 }));
-        });
-    }
-});
-//修改赛事账号及密码
-router.route('/upRUNP').post(function(req, res, next) {
-    //mode的处理
-    if (req.body[0]) {
-        p = [req.body[0].uid, req.body[0].n, bcrypt.hashSync(Object.values(req.body[0].p), bcrypt.genSaltSync(10))];
-        //参数拼接，注册
-        p.unshift(_mysqlLabor[0], _mysqlLabor[1], "upRaceUserNamePassword");
-        mysql.usselect(p, function(ret) {
-            res.end(JSON.stringify(ret));
+            if (num < 10) {
+                num = "SZ" + "00" + num + "@gdae.com";
+            } else if (num < 100) {
+                num = "SZ" + "0" + num + "@gdae.com";
+            } else if (num > 100) {
+                num = "SZ" + num + "@gdae.com";
+            }
+            y = [userid, num, bcrypt.hashSync("123456", bcrypt.genSaltSync(10))];
+            //参数拼接，注册
+            y.unshift(_mysqlLabor[0], _mysqlLabor[1], "upRaceUserNamePassword");
+            mysql.usselect(y, function(ret) {
+                res.end(JSON.stringify(ret));
+            });
+            res.end(JSON.stringify({ num: num, success: 1 }));
         });
     }
 });
-// router.route('/upRUNP').all((req, res, next) => {
-//     var json = queryString(req.url);
-//     getmysql(req, res, "upRaceUserNamePassword", json['uid'], json['n'], json['p']);
-// });
-
 
 //修改赛事项目
 router.route('/updateRace').all((req, res, next) => {