友宝上线更新

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

@@ -12,7 +12,30 @@ import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
 import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
 import cn.quantgroup.xyqb.entity.enumerate.Relation;
 import cn.quantgroup.xyqb.model.*;
+import cn.quantgroup.user.enums.*;
+import cn.quantgroup.xyqb.model.*;
+import cn.quantgroup.xyqb.model.IdType;
+import cn.quantgroup.xyqb.entity.Address;
+import cn.quantgroup.xyqb.entity.Contact;
+import cn.quantgroup.xyqb.entity.User;
+import cn.quantgroup.xyqb.entity.UserDetail;
+import cn.quantgroup.xyqb.entity.UserExtInfo;
+import cn.quantgroup.xyqb.entity.UserSpouse;
+import cn.quantgroup.xyqb.entity.WechatUserInfo;
+//import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+//import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.Relation;
+import cn.quantgroup.xyqb.model.AddressRet;
+import cn.quantgroup.xyqb.model.ContactRet;
 import cn.quantgroup.xyqb.model.IdType;
+import cn.quantgroup.xyqb.model.JsonResult;
+import cn.quantgroup.xyqb.model.UserDetailRet;
+import cn.quantgroup.xyqb.model.UserExtInfoRet;
+import cn.quantgroup.xyqb.model.UserRet;
+import cn.quantgroup.xyqb.model.UserSpouseRet;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
@@ -22,11 +45,18 @@ import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.google.common.base.MoreObjects;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.LoggerFactory;

src/main/java/cn/quantgroup/xyqb/controller/external/user/center/UserCenterController.java

@@ -2,6 +2,11 @@ package cn.quantgroup.xyqb.controller.external.user.center;
 
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.*;
+//import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
+//import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
+//import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
+import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.model.ContactRet;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.user.*;

src/main/resources/config/dev/logback.xml

@@ -8,7 +8,7 @@
             <maxHistory>30</maxHistory>
         </rollingPolicy>-->
 
-            <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 
         <layout class="ch.qos.logback.classic.PatternLayout">
             <pattern>%d{ISO8601} [%thread] [%-5level] %logger{36} - %msg%n</pattern>