Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
5260124d
Commit
5260124d
authored
Jun 12, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'base-modify' of
http://10.5.52.3/youjj/cloud-platform
into base-modify
parents
dae43c38
69b288d7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
UserBiz.java
...erver/src/main/java/com/xxfc/platform/im/biz/UserBiz.java
+4
-0
No files found.
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java
View file @
5260124d
...
@@ -57,7 +57,11 @@ public class UserBiz {
...
@@ -57,7 +57,11 @@ public class UserBiz {
params
.
put
(
"password"
,
mgt
.
getPassword
());
params
.
put
(
"password"
,
mgt
.
getPassword
());
result
=
this
.
login
(
params
);
result
=
this
.
login
(
params
);
}
}
}
else
{
json
.
put
(
"password"
,
map
.
get
(
"password"
).
toString
());
result
=
json
.
toJSONString
();
}
}
baseResponse
.
setStatus
(
200
);
baseResponse
.
setStatus
(
200
);
baseResponse
.
setMessage
(
result
);
baseResponse
.
setMessage
(
result
);
return
baseResponse
;
return
baseResponse
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment