Skip to content

C
cloud-platform
Commit 573d0cbe authored by hezhen's avatar hezhen
Browse files
Options

123

parent caa63d8f
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
View file @ 573d0cbe
...@@ -241,8 +241,8 @@ public class AppPermissionService { ...@@ -241,8 +241,8 @@ public class AppPermissionService {
userLogin.setUsername(username); userLogin.setUsername(username);
appUserLoginBiz.updateSelectiveById(userLogin); appUserLoginBiz.updateSelectiveById(userLogin);
} }
data.put("im_token",access_token); data.put("imToken",access_token);
data.put("im_userId",imUserId); data.put("imUserId",imUserId);
} }
if (data != null) { if (data != null) {
...@@ -282,7 +282,7 @@ public class AppPermissionService { ...@@ -282,7 +282,7 @@ public class AppPermissionService {
// 返回结果 // 返回结果
// data.put("token", token); // data.put("token", token);
data.put("username", username); data.put("username", username);
data.put("userid", userid); data.put("userId", userid);
} }
return data; return data;
...@@ -366,8 +366,8 @@ public class AppPermissionService { ...@@ -366,8 +366,8 @@ public class AppPermissionService {
String imPassword=userLogin.getImPassword(); String imPassword=userLogin.getImPassword();
if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){ if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
String access_token=loginIm(username,imPassword,imUserId); String access_token=loginIm(username,imPassword,imUserId);
data.put("im_token",access_token); data.put("imToken",access_token);
data.put("im_userId",imUserId); data.put("imUserId",imUserId);
} }
if (data != null) { if (data != null) {
return JsonResultUtil.createSuccessResultWithObj(data); return JsonResultUtil.createSuccessResultWithObj(data);
...@@ -453,8 +453,8 @@ public class AppPermissionService { ...@@ -453,8 +453,8 @@ public class AppPermissionService {
String imPassword=userLogin.getImPassword(); String imPassword=userLogin.getImPassword();
if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){ if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
String access_token=loginIm(userLogin.getUsername(),imPassword,imUserId); String access_token=loginIm(userLogin.getUsername(),imPassword,imUserId);
data.put("im_token",access_token); data.put("imToken",access_token);
data.put("im_userId",imUserId); data.put("imUserId",imUserId);
} }
if (data != null) { if (data != null) {
return JsonResultUtil.createSuccessResultWithObj(data); return JsonResultUtil.createSuccessResultWithObj(data);
...@@ -495,8 +495,8 @@ public class AppPermissionService { ...@@ -495,8 +495,8 @@ public class AppPermissionService {
String imPassword=user.getImPassword(); String imPassword=user.getImPassword();
if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){ if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
String access_token=loginIm(username,imPassword,imUserId); String access_token=loginIm(username,imPassword,imUserId);
data.put("im_token",access_token); data.put("imToken",access_token);
data.put("im_userId",imUserId); data.put("imUserId",imUserId);
} }
if (data != null) { if (data != null) {
return JsonResultUtil.createSuccessResultWithObj(data); return JsonResultUtil.createSuccessResultWithObj(data);
......
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java
View file @ 573d0cbe
...@@ -75,6 +75,7 @@ public class UserBiz { ...@@ -75,6 +75,7 @@ public class UserBiz {
return baseResponse; return baseResponse;
} }
/** /**
* 登录 * 登录
* @param map * @param map
......
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