Commit d87c137c authored by 赵啸非's avatar 赵啸非

添加查询当前人员负责的窗口列表

parent 8ee63b6a
...@@ -33,9 +33,7 @@ public class SMSLoginController extends BaseJsonBodyController { ...@@ -33,9 +33,7 @@ public class SMSLoginController extends BaseJsonBodyController {
public Rest<Object> sendSmsVerifyCode(@RequestBody SMSLoginPdu smsLoginPdu) { public Rest<Object> sendSmsVerifyCode(@RequestBody SMSLoginPdu smsLoginPdu) {
Rest<Object> ret = new Rest(); Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap(); Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "发送手机验证码"; String busiDesc = "发送手机验证码";
int code = 1; int code = 1;
try { try {
userService.sendSmsVerifyCode(smsLoginPdu.getMobileNumber()); userService.sendSmsVerifyCode(smsLoginPdu.getMobileNumber());
......
...@@ -174,10 +174,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -174,10 +174,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
UserEntity userEntity = null; UserEntity userEntity = null;
try { try {
loginForm.validate(); loginForm.validate();
userEntity = userService.doLogin(loginName, password, ip); userEntity = userService.doLogin(loginName, password, ip);
userEntity.setLastLoginAddress(ip); userEntity.setLastLoginAddress(ip);
recordSysLog(request, userEntity, "用户登录系统成功!"); recordSysLog(request, userEntity, "用户登录系统成功!");
data.put("id", userEntity.getId()); data.put("id", userEntity.getId());
...@@ -186,6 +184,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -186,6 +184,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
userEntity.setToken(IdUtil.fastSimpleUUID()); userEntity.setToken(IdUtil.fastSimpleUUID());
userEntity.setExpireTime(DateUtils.addCurrDate(1).getTime()); userEntity.setExpireTime(DateUtils.addCurrDate(1).getTime());
String token = authTokenService.createToken(userEntity); String token = authTokenService.createToken(userEntity);
data.put("customer", userEntity);
data.put("token", token); data.put("token", token);
ret.put(KEY_RESULT_DATA, data); ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment