Merge branch 'master' of http://git.cc-lotus.info/new_train/service-center

app/controller/user.js

@@ -29,6 +29,12 @@ class UserController extends Controller {
     const res = await this.service.bind(this.ctx.request.body);
     this.ctx.ok({ data: res });
   }
+
+  // 学校用户生成
+  async schoolregister() {
+    const res = await this.service.schoolregister();
+    this.ctx.ok({ data: res });
+  }
 }
 
 module.exports = CrudController(UserController, meta);

app/router.js

@@ -127,15 +127,20 @@ module.exports = app => {
   router.post('region', '/api/train/region/update/:id', controller.region.update);
 
   // 用户表设置路由
+  router.get('/api/train/user/schoolregister', controller.user.schoolregister);// 学校账号一键生成
   router.resources('user', '/api/train/user', controller.user); // index、create、show、destroy
   router.post('user', '/api/train/user/update/:id', controller.user.update);
   router.post('user', '/api/train/user/register', controller.user.register);// 学校注册
   router.post('user', '/api/train/user/bind', controller.user.bind);// 学生或班主任微信绑定
 
+
   // 行政区划表设置路由
   router.resources('termquest', '/api/train/termquest', controller.termquest); // index、create、show、destroy
   router.post('termquest', '/api/train/termquest/update/:id', controller.termquest.update);
 
   // 微信端访问地址
   router.get('/api/train/auth', controller.weixin.auth); // 微信登录
+
+  // pc端登录
+  router.post('/api/train/login', controller.login.login);// 登录
 };

app/service/login.js

@@ -20,7 +20,7 @@ class LoginService extends CrudService {
   async login(data) {
     const { mobile, passwd } = data;
     assert(mobile, 'mobile不能为空');
-    assert(/^\d{11}$/i.test(mobile), 'mobile无效');
+    // assert(/^\d{11}$/i.test(mobile), 'mobile无效');
     assert(passwd, 'passwd不能为空');
     const res = await this.uModel.findOne({ mobile }, '+passwd');
     if (!res) {
@@ -56,10 +56,8 @@ class LoginService extends CrudService {
       _userid = uid.toString();
       res = await this.stuModel.findById(_userid);
     }
-    res.userid = _userid;
-    res.openid = openid;
-    res.type = type;
-    const token = await jwt.sign(res, secret, { expiresIn, issuer, subject });
+    const newdata = { userid: _userid, ...res, openid, type };
+    const token = await jwt.sign(newdata, secret, { expiresIn, issuer, subject });
     return token;
   }
 

app/service/user.js

@@ -85,6 +85,20 @@ class UserService extends CrudService {
     return user;
   }
 
+  // 学校用户生成
+  async schoolregister() {
+    const schools = await this.schModel.find();
+    for (const sch of schools) {
+      const user = await this.model.findOne({ uid: sch.id, type: '2' });
+      if (!user) {
+        const newdata = { name: sch.name, mobile: sch.code, type: '2', uid: sch.id };
+        newdata.passwd = { secret: '12345678' };
+        await this.model.create(newdata);
+      }
+    }
+    this.ctx.ok({ data: {} });
+  }
+
 }
 
 module.exports = UserService;