|
@@ -62,15 +62,15 @@ public class DemandCollectionApiController extends CertifyApiController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value="/open/login",method = RequestMethod.POST)
|
|
@RequestMapping(value="/open/login",method = RequestMethod.POST)
|
|
|
- public Result demandCollectionList(String account ,String password){
|
|
|
|
|
|
|
+ public Result demandCollectionList(String userName ,String password){
|
|
|
Result res =new Result();
|
|
Result res =new Result();
|
|
|
//模拟登陆
|
|
//模拟登陆
|
|
|
- if (account==null||password==null) {
|
|
|
|
|
|
|
+ if (userName==null||password==null) {
|
|
|
res.getError().add(buildError("账号密码不能为空!","账号密码不能为空!"));
|
|
res.getError().add(buildError("账号密码不能为空!","账号密码不能为空!"));
|
|
|
return res ;
|
|
return res ;
|
|
|
}
|
|
}
|
|
|
SkjtUser user=new SkjtUser();
|
|
SkjtUser user=new SkjtUser();
|
|
|
- user.setAccount(account);
|
|
|
|
|
|
|
+ user.setAccount(userName);
|
|
|
user.setPassword(password);
|
|
user.setPassword(password);
|
|
|
res.setData(TokenManager.skjtLogin(user, true));
|
|
res.setData(TokenManager.skjtLogin(user, true));
|
|
|
return res;
|
|
return res;
|