冲突修改

sso-server/build.gradle

@@ -42,8 +42,6 @@ dependencies {
     compile("org.apache.httpcomponents:httpmime:4.4")
     compile("org.apache.httpcomponents:httpcore:4.4.5")
     compile("org.apache.httpcomponents:httpclient:4.4")
-    compile("org.codehaus.jackson:jackson-core-asl:1.9.13")
-    compile("org.codehaus.jackson:jackson-mapper-asl:1.9.13")
 
     testCompile("org.springframework.boot:spring-boot-starter-test")
 }

sso-server/src/main/java/com/uas/sso/entity/User.java

@@ -186,6 +186,7 @@ public class User implements Serializable {
     /**
      * 用户登录记录
      */
+    @JsonIgnore
     @OneToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @JoinColumn(name = "record_id")
     private UserRecord userRecord;
@@ -193,10 +194,12 @@ public class User implements Serializable {
     /**
      * 密保问题
      */
+    @JsonIgnore
     @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.REMOVE})
     @JoinColumn(name = "useruu", nullable = false)
     private List<UserQuestion> questions;
 
+    @JsonIgnore
     @ManyToMany(mappedBy = "users")
     private Set<Userspace> userSpaces = new HashSet<>();
 
@@ -403,8 +406,6 @@ public class User implements Serializable {
         this.lock = lock;
     }
 
-    @JsonIgnore
-    @JSONField(serialize = false)
     public UserRecord getUserRecord() {
         return userRecord;
     }
@@ -413,8 +414,6 @@ public class User implements Serializable {
         this.userRecord = userRecord;
     }
 
-    @JsonIgnore
-    @JSONField(serialize = false)
     public List<UserQuestion> getQuestions() {
         return questions;
     }
@@ -422,8 +421,7 @@ public class User implements Serializable {
     public void setQuestions(List<UserQuestion> questions) {
         this.questions = questions;
     }
-    @JsonIgnore
-    @JSONField(serialize = false)
+
     public Set<Userspace> getUserSpaces() {
         return userSpaces;
     }

sso-server/src/main/java/com/uas/sso/entity/Userspace.java

@@ -184,6 +184,7 @@ public class Userspace implements Serializable {
     /**
      * 企业下的用户
      */
+    @JsonIgnore
     @ManyToMany
     @JoinTable(name = "sso$user_userspace",
             joinColumns = {@JoinColumn(name="space_uu", referencedColumnName="spaceuu")},
@@ -414,8 +415,6 @@ public class Userspace implements Serializable {
         this.domain = domain;
     }
 
-    @JsonIgnore
-    @JSONField(serialize = false)
     public List<User> getUsers() {
         return users;
     }

sso-server/src/main/java/com/uas/sso/service/impl/ApplyUserSpaceServiceImpl.java

@@ -67,7 +67,7 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
         }
 
         // 判断用户是否在该企业
-        for (Userspace us : user.getUserspaces()) {
+        for (Userspace us : user.getUserSpaces()) {
             if (us.getSpaceUU().equals(userspace.getSpaceUU())) {
                 throw new VisibleError("你已在该企业");
             }

sso-server/src/main/java/com/uas/sso/service/impl/UserServiceImpl.java

@@ -36,6 +36,7 @@ import javax.persistence.criteria.*;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 用户service实现类
@@ -351,7 +352,7 @@ public class UserServiceImpl implements UserService {
         Userspace userspace = userspaceService.findOne(spaceUU);
 
         // 将企业添加到用户列表上
-        List<Userspace> userspaces = user.getUserspaces();
+        Set<Userspace> userspaces = user.getUserSpaces();
         userspaces.add(userspace);
 
         // 保存