注册接口修改

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java

@@ -66,7 +66,7 @@ public class UserBiz {
             }else{
                 json.put("password",mgt.getPassword());
                 Map<String,Object> params = new HashMap<String,Object>();
-                params.put("userId",mgt.getUserId());
+                params.put("userId",mgt.getId());
                 json.put("data",params);
                 result = json.toJSONString();
                 /*Map<String,Object>params = new HashMap<String,Object>();

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/model/User.java

@@ -4,6 +4,7 @@ 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;
@@ -27,7 +28,7 @@ import lombok.Setter;
 public class User {
 
 	@Id
-	private Integer userId;// 用户Id
+	private ObjectId id;// 用户Id
 
 	//@JSONField(serialize = false)
 	
@@ -188,8 +189,8 @@ public class User {
 	
 	// ********************引用字段********************
 	
-	public Integer getUserId() {
-		return userId;
+	public ObjectId getId() {
+		return id;
 	}
 
 
@@ -209,8 +210,8 @@ public class User {
 		this.num = num;
 	}
 
-	public void setUserId(Integer userId) {
-		this.userId = userId;
+	public void setid(ObjectId id) {
+		this.id = id;
 	}
 
 	public String getUserKey() {