|
|
@@ -69,10 +69,9 @@ public class UserLoginController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/mlogin", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public Result mLogin(User user, Boolean remember) {
|
|
|
- Result res = new Result();
|
|
|
+ public Result<Object> mLogin(User user, Boolean remember) {
|
|
|
+ Result<Object> res = new Result<>();
|
|
|
JSONObject jo = (JSONObject) JSON.toJSON(TokenManager.login(user, remember));
|
|
|
-
|
|
|
UserBasicInfo ubi=userService.selectBaseInfo();
|
|
|
jo.put("easemobName",ubi.getEasemobName());
|
|
|
jo.put("easemobPass",ubi.getEasemobPass());
|