|
@ -24,6 +24,7 @@ import com.ekexiu.portal.dao.ProfessorDao;
|
24
|
24
|
import com.ekexiu.portal.dao.UserDao;
|
25
|
25
|
import com.ekexiu.portal.mail.MailService;
|
26
|
26
|
import com.ekexiu.portal.mobile.MobilePhoneService;
|
|
27
|
import com.ekexiu.portal.po.Professor;
|
27
|
28
|
import com.ekexiu.portal.po.User;
|
28
|
29
|
import com.ekexiu.portal.pojo.SessionUser;
|
29
|
30
|
|
|
@ -358,7 +359,7 @@ public class SysService {
|
358
|
359
|
"userType=result.getType()",
|
359
|
360
|
"userAuth=String.valueOf(result.isAuth())",
|
360
|
361
|
"userEmail=result.getEmail()==null?\"\":result.getEmail()",
|
361
|
|
// "userName=result.getName()"
|
|
362
|
"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")"
|
362
|
363
|
})
|
363
|
364
|
@Post
|
364
|
365
|
@Path("/regmail/{key}")
|
|
@ -381,9 +382,9 @@ public class SysService {
|
381
|
382
|
return null;
|
382
|
383
|
SessionUser ret = new SessionUser();
|
383
|
384
|
ret.setId(user.getId());
|
384
|
|
// if (null != this.professorDao.query(con, user.getId())) {
|
385
|
|
// ret.setName(this.professorDao.query(con, user.getId()).getName());
|
386
|
|
// }
|
|
385
|
if (null != this.professorDao.query(con, user.getId())) {
|
|
386
|
ret.setName(this.professorDao.query(con, user.getId()).getName());
|
|
387
|
}
|
387
|
388
|
ret.setMobilePhone(user.getMobilePhone());
|
388
|
389
|
ret.setType(user.getUserType());
|
389
|
390
|
ret.setEmail(user.getEmail());
|
|
@ -460,7 +461,7 @@ public class SysService {
|
460
|
461
|
"userType=result.getType()",
|
461
|
462
|
"userAuth=String.valueOf(result.isAuth())",
|
462
|
463
|
"userEmail=result.getEmail()==null?\"\":result.getEmail()",
|
463
|
|
// "userName=result.getName()"
|
|
464
|
"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")"
|
464
|
465
|
})
|
465
|
466
|
@Post
|
466
|
467
|
@Path("/slogin")
|
|
@ -471,13 +472,13 @@ public class SysService {
|
471
|
472
|
return null;
|
472
|
473
|
if (!mobile.equals(user.getMobilePhone()))
|
473
|
474
|
return null;
|
474
|
|
// Professor professor = this.professorDao.query(con, code);
|
|
475
|
Professor professor = this.professorDao.query(con, code);
|
475
|
476
|
SessionUser ret = new SessionUser();
|
476
|
477
|
ret.setId(code);
|
477
|
478
|
ret.setMobilePhone(mobile);
|
478
|
479
|
ret.setType(user.getUserType());
|
479
|
480
|
ret.setEmail(user.getEmail());
|
480
|
|
// ret.setName(professor.getName());
|
|
481
|
ret.setName(professor.getName());
|
481
|
482
|
ret.setAuth(!DEFAULT_PASS_WORD.equals(user.getPasswd()));
|
482
|
483
|
return ret;
|
483
|
484
|
}
|
|
@ -487,7 +488,7 @@ public class SysService {
|
487
|
488
|
"userType=result.getType()",
|
488
|
489
|
"userAuth=String.valueOf(result.isAuth())",
|
489
|
490
|
"userEmail=result.getEmail()==null?\"\":result.getEmail()",
|
490
|
|
// "userName=result.getName()"
|
|
491
|
"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")"
|
491
|
492
|
})
|
492
|
493
|
@Post
|
493
|
494
|
@Path("/login")
|
|
@ -503,9 +504,9 @@ public class SysService {
|
503
|
504
|
|
504
|
505
|
SessionUser ret = new SessionUser();
|
505
|
506
|
ret.setId(user.getId());
|
506
|
|
// if (null != this.professorDao.query(con, user.getId())) {
|
507
|
|
// ret.setName(this.professorDao.query(con, user.getId()).getName());
|
508
|
|
// }
|
|
507
|
if (null != this.professorDao.query(con, user.getId())) {
|
|
508
|
ret.setName(this.professorDao.query(con, user.getId()).getName());
|
|
509
|
}
|
509
|
510
|
ret.setMobilePhone(user.getMobilePhone());
|
510
|
511
|
ret.setType(user.getUserType());
|
511
|
512
|
ret.setEmail(user.getEmail());
|