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
b7d8f529
Commit
b7d8f529
authored
Jul 05, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注册接口修改
parent
2f1195f3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
Msg.java
...-server/src/main/java/com/xxfc/platform/im/model/Msg.java
+1
-1
User.java
...server/src/main/java/com/xxfc/platform/im/model/User.java
+3
-4
No files found.
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/model/Msg.java
View file @
b7d8f529
...
...
@@ -566,7 +566,7 @@ public class Msg {
Msg
entity
=
new
Msg
();
entity
.
id
=
ObjectId
.
get
();
entity
.
userId
=
Integer
.
parseInt
(
user
.
getId
().
toString
()
);
entity
.
userId
=
user
.
getId
(
);
if
(
"10000"
==
user
.
getId
().
toString
())
entity
.
nickname
=
"客服公众号"
;
else
...
...
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/model/User.java
View file @
b7d8f529
...
...
@@ -4,7 +4,6 @@ import java.util.List;
import
java.util.Map
;
import
com.xxfc.platform.im.utils.DateUtil
;
import
org.bson.types.ObjectId
;
import
org.mongodb.morphia.annotations.Embedded
;
import
org.mongodb.morphia.annotations.Entity
;
import
org.mongodb.morphia.annotations.Id
;
...
...
@@ -28,7 +27,7 @@ import lombok.Setter;
public
class
User
{
@Id
private
ObjectId
id
;
// 用户Id
private
Integer
id
;
// 用户Id
//@JSONField(serialize = false)
...
...
@@ -189,7 +188,7 @@ public class User {
// ********************引用字段********************
public
ObjectId
getId
()
{
public
Integer
getId
()
{
return
id
;
}
...
...
@@ -210,7 +209,7 @@ public class User {
this
.
num
=
num
;
}
public
void
set
id
(
ObjectId
id
)
{
public
void
set
Id
(
Integer
id
)
{
this
.
id
=
id
;
}
...
...
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