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

pbl.js

@@ -9,7 +9,7 @@ var mysql = require('./mysql');
 const _mysqlLabor = ["172.16.12.5", "pbl"]; //edu數據庫信息
 
 //統壹處理區域
-router.use(async function (req, res, next) {
+router.use(async function(req, res, next) {
     await asynnext(req, res, next);
     //// make sure we go to the next routes and don't stop here
     //res.end("");
@@ -20,7 +20,7 @@ router.use(async function (req, res, next) {
  */
 function asynnext(req, res, next) {
     //異步處理
-    return new Promise(async (resolve, reject) => {
+    return new Promise(async(resolve, reject) => {
         next();
         //resolve(true);aa
     });
@@ -35,7 +35,7 @@ router.route('/b').all((req, res, next) => {
     getmysql(req, res, "b", json['ph'], json['pa']);
 });
 /* 注册接口 */
-router.route('/register').post(function (req, res, next) {
+router.route('/register').post(function(req, res, next) {
     //mode的处理
     if (req.body[0]) {
         // 0 用户名 1 用户密码 2用户身份 3 第三方id（可有可无）
@@ -58,7 +58,7 @@ router.route('/register').post(function (req, res, next) {
         // mysql.usselect(p, function (ret) {
         //     res.end(ret);
         // });
-        mysql.usselect(p, function (ret) {
+        mysql.usselect(p, function(ret) {
             res.end(JSON.stringify(ret));
         });
     }
@@ -70,20 +70,20 @@ router.route('/login').all((req, res, next) => {
         // 0 用户名 1 用户密码
         c = Object.values(req.body[0]); //获取用户密码
         p = [c[0]]
-        // p[1] = bcrypt.hashSync(p[1], bcrypt.genSaltSync(10));
+            // p[1] = bcrypt.hashSync(p[1], bcrypt.genSaltSync(10));
         var _password = [c[0]];
         _password.unshift(_mysqlLabor[0], _mysqlLabor[1], "selectPassword");
 
-        mysql.usselect(_password, function (ret) {
+        mysql.usselect(_password, function(ret) {
             var _ret = ret
             var paJ = _ret[0][0].userpassword
-            bcrypt.compare(c[1], paJ, function (err, result) {
+            bcrypt.compare(c[1], paJ, function(err, result) {
                 // console.log(result)
                 if (result) {
                     //参数拼接，登录
                     p.unshift(_mysqlLabor[0], _mysqlLabor[1], "selectLogin");
                     //执行存储过程
-                    mysql.usselect(p, function (ret) {
+                    mysql.usselect(p, function(ret) {
                         res.end(JSON.stringify({ status: "1", ...ret }));
                     });
                 } else {
@@ -235,7 +235,7 @@ router.route('/selectClassBySchool').all((req, res, next) => {
     getmysql(req, res, "selectClassBySchool", json['oid']);
 });
 //学生注册接口
-router.route('/register_student').post(function (req, res, next) {
+router.route('/register_student').post(function(req, res, next) {
     //mode的处理
     if (req.body[0]) {
         // 0 用户名 1 用户密码 2用户身份 3 第三方id（可有可无）
@@ -258,7 +258,7 @@ router.route('/register_student').post(function (req, res, next) {
         // mysql.usselect(p, function (ret) {
         //     res.end(ret);
         // });
-        mysql.usselect(p, function (ret) {
+        mysql.usselect(p, function(ret) {
             res.end(JSON.stringify(ret));
         });
     }
@@ -395,6 +395,15 @@ router.route('/selectNoteContent').all((req, res, next) => {
     getmysql(req, res, "selectNoteContent", json['cn']);
 });
 
+router.route('/updateUserByEdu').all((req, res, next) => {
+    postmysql(req, res, "updateUserByEdu");
+});
+
+router.route('/selectUser').all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "selectUser", json['userid']);
+});
+
 //lsc
 //admin 查询学校
 router.route('/getSchoolAdmin').all((req, res, next) => {
@@ -519,7 +528,7 @@ router.route('/getCourseAdmin').all((req, res, next) => {
 
 //admin 查询模板文档
 router.route('/deleteCourseAdmin').all((req, res, next) => {
-    postmysql(req, res, "delete_courseAdmin",);
+    postmysql(req, res, "delete_courseAdmin", );
 });
 
 //teacher 查询模板
@@ -572,29 +581,29 @@ router.route('/dismiss').all((req, res, next) => {
     postmysql(req, res, "update_room");
 });
 
-queryString = function (url) {
+queryString = function(url) {
     var a = url.split("?");
     var json = querystring.parse(a[1])
     return json;
 }
 
 //post存儲過程處理
-postmysql = function (req, res, functionname) {
+postmysql = function(req, res, functionname) {
     //mode的處理
     if (req.body[0]) {
         p = Object.values(req.body[0]);
         p.unshift(_mysqlLabor[0], _mysqlLabor[1], functionname);
         //執行存儲過程
-        mysql.usselect(p, function (ret) { res.end(JSON.stringify(ret)); });
+        mysql.usselect(p, function(ret) { res.end(JSON.stringify(ret)); });
     }
 }
 
 //get獲取數據庫信息
-getmysql = function (req, res, functionname, ...p) {
+getmysql = function(req, res, functionname, ...p) {
     p = p || [];
     p.unshift(_mysqlLabor[0], _mysqlLabor[1], functionname);
     //執行存儲過程
-    mysql.usselect(p, function (ret) { res.end(JSON.stringify(ret)); }); //
+    mysql.usselect(p, function(ret) { res.end(JSON.stringify(ret)); }); //
 }