Merge branch 'master' into feature/huanguguan

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -451,9 +451,15 @@ public class InnerController implements IBaseController {
     if (hasCar != null) {
       info.setHasCar(hasCar);
     }
-    if (hasSocialSecurity != null) {
+    if (hasCreditCard != null) {
       info.setHasCreditCard(hasCreditCard);
     }
+
+    if (hasSocialSecurity != null) {
+      info.setHasSocialSecurity(hasSocialSecurity);
+    }
+
+
     if (hasHouse != null) {
       info.setHasHouse(hasHouse);
     }
@@ -542,9 +548,23 @@ public class InnerController implements IBaseController {
         bean.setProvince(address.getProvince());
       }
       if (null != extInfo) {
-        bean.setEducationEnum(extInfo.getEducationEnum().getName());
-        bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
-        bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
+        if(null==extInfo.getEducationEnum()){
+          bean.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.UNKNOWN.getName());
+        }else{
+          bean.setEducationEnum(extInfo.getEducationEnum().getName());
+        }
+        if(null==extInfo.getOccupationEnum()){
+          bean.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.UNKNOWN.getName());
+        }else{
+          bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
+        }
+
+        if(null==extInfo.getMarryStatus()){
+          bean.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN.getDescription());
+        }else{
+          bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
+        }
+
       }
       if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
         List<XContactInfo> userContacts = contacts2ContactRets(contacts);
@@ -580,9 +600,22 @@ public class InnerController implements IBaseController {
         bean.setProvince(address.getProvince());
       }
       if (null != extInfo) {
-        bean.setEducationEnum(extInfo.getEducationEnum().getName());
-        bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
-        bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
+        if(null==extInfo.getEducationEnum()){
+          bean.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.UNKNOWN.getName());
+        }else{
+          bean.setEducationEnum(extInfo.getEducationEnum().getName());
+        }
+        if(null==extInfo.getOccupationEnum()){
+          bean.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.UNKNOWN.getName());
+        }else{
+          bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
+        }
+
+        if(null==extInfo.getMarryStatus()){
+          bean.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN.getDescription());
+        }else{
+          bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
+        }
       }
       if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
         List<XContactInfo> userContacts = contacts2ContactRets(contacts);

src/main/resources/config/dev/xyqb.properties

@@ -81,7 +81,7 @@ protocol.contentLength=1048576
 protocol.isDefault=true
 #motan registry center
 registry.protocol=zookeeper
-registry.address=192.168.4.163:2181
+registry.address=192.168.4.22:2181
 motan.port=8086
 motan.user.group=userGroup
 motan.user.module=user-motan-rpc