Merge branch 'feature/caiwu'

# Conflicts:
#	src/main/resources/config/dev/xyqb.properties

pom.xml

@@ -273,7 +273,7 @@
         <dependency>
             <groupId>cn.quantgroup</groupId>
             <artifactId>xyqb-user-rpc-commons</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/cn/quantgroup/xyqb/controller/external/index/HelloController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/hello")
 public class HelloController {
+  
   @RequestMapping("/hello")
   public String hello(){
     return "ok";

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -7,7 +7,7 @@ import cn.quantgroup.motan.vo.UserSysResult;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.*;
 //import cn.quantgroup.xyqb.entity.enumerate.*;
-import cn.quantgroup.user.enums.*;
+import cn.quantgroup.motan.enums.*;
 import cn.quantgroup.xyqb.model.*;
 import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.model.session.LoginInfo;
@@ -96,10 +96,9 @@ public class MotanUserServiceImpl implements UserMotanService {
 
   @Autowired
   private IUserApiService userApiService;
-  @Override
-  public UserSysResult<XUser> saveUserRelatedInfo(UserRelatedBean userRelatedBean) {
-    return null;
-  }
+  //public UserSysResult<XUser> saveUserRelatedInfo(UserRelatedBean userRelatedBean) {
+  //  return null;
+  //}
 
   @Override
   public UserSysResult<XUser> findUserByPhoneNo(String phoneNo) {
@@ -531,7 +530,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     xUserSpouse.setSpouseName(userSpouse.getSpouseName());
     xUserSpouse.setCreatedAt(userSpouse.getCreatedAt());
     xUserSpouse.setUpdateAt(userSpouse.getUpdateAt());
-    xUserSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(userSpouse.getStatus().name()));
+    xUserSpouse.setStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(userSpouse.getStatus().name()));
     return xUserSpouse;
   }
 
@@ -586,10 +585,10 @@ public class MotanUserServiceImpl implements UserMotanService {
     if (xUserSpouse.getUserId() == null || xUserSpouse.getUserId() == 0) {
       return returnErrorValue("用户不能为空");
     }
-    cn.quantgroup.user.enums.MaritalStatus status = xUserSpouse.getStatus();
+    cn.quantgroup.motan.enums.MaritalStatus status = xUserSpouse.getStatus();
     String spousePhone = xUserSpouse.getSpousePhone();
     String spouseName = xUserSpouse.getSpouseName();
-    if (xUserSpouse.getStatus() == cn.quantgroup.user.enums.MaritalStatus.MARRIED) {
+    if (xUserSpouse.getStatus() == cn.quantgroup.motan.enums.MaritalStatus.MARRIED) {
       if (!ValidationUtil.validatePhoneNo(spousePhone)) {
         return returnErrorValue("手机号格式错误");
       }
@@ -603,9 +602,9 @@ public class MotanUserServiceImpl implements UserMotanService {
       userSpouse = new UserSpouse(xUserSpouse.getUserId());
       userSpouse.setCreatedAt(timestamp);
     }
-    userSpouse.setSpouseName(status == cn.quantgroup.user.enums.MaritalStatus.MARRIED ? spouseName : "");
-    userSpouse.setSpousePhone(status == cn.quantgroup.user.enums.MaritalStatus.MARRIED ? spousePhone : "");
-    userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(status.name()));
+    userSpouse.setSpouseName(status == cn.quantgroup.motan.enums.MaritalStatus.MARRIED ? spouseName : "");
+    userSpouse.setSpousePhone(status == cn.quantgroup.motan.enums.MaritalStatus.MARRIED ? spousePhone : "");
+    userSpouse.setStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(status.name()));
     userSpouse.setUpdateAt(timestamp);
     userSpouse = userSpouseService.save(userSpouse);
     return returnSuccessValue(fromUserSpouse(userSpouse));
@@ -829,12 +828,12 @@ public class MotanUserServiceImpl implements UserMotanService {
     return user;
   }
 
-  @Override
+
   public UserSysResult<XUserDetail> modifyUserDetail(UserDetailUpdateBean userDetailUpdateBean) {
     return returnErrorValue("MotanUserServiceImpl modifyUserDetail(UserDetailUpdateBean userDetailUpdateBean) need to be finish.");
   }
 
-  @Override
+
   public UserSysResult<Map<Long, String>> findPhoneByUserIds(List<Long> userIds) {
 
     if(!CollectionUtils.isEmpty(userIds) && userIds.size()<=500) {

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

@@ -6,11 +6,10 @@ import cn.quantgroup.xyqb.entity.*;
 //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.motan.enums.*;
 import cn.quantgroup.xyqb.model.ContactRet;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.user.*;
-import cn.quantgroup.user.enums.*;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import org.apache.commons.collections.CollectionUtils;

src/main/java/cn/quantgroup/xyqb/entity/Contact.java

 package cn.quantgroup.xyqb.entity;
 
-import cn.quantgroup.user.enums.Relation;
+import cn.quantgroup.motan.enums.Relation;
 import lombok.Data;
 
 import javax.persistence.*;

src/main/java/cn/quantgroup/xyqb/entity/UserDetail.java

@@ -75,10 +75,10 @@ public class UserDetail implements Serializable {
     xUserDetail.setName(this.getName());
     xUserDetail.setIdNo(this.getIdNo());
     if (this.getIdType() != null) {
-      xUserDetail.setIdType(cn.quantgroup.user.enums.IdType.valueOf(this.getIdType().name()));
+      xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
     }
     if (this.getGender() != null) {
-      xUserDetail.setGender(cn.quantgroup.user.enums.Gender.valueOf(this.getGender().name()));
+      xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(this.getGender().name()));
     }
     xUserDetail.setEmail(this.getEmail());
     xUserDetail.setQq(this.getQq());

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

@@ -2,7 +2,7 @@ package cn.quantgroup.xyqb.entity;
 
 import cn.quantgroup.motan.retbean.XUserExtInfo;
 //import cn.quantgroup.xyqb.entity.enumerate.*;
-import cn.quantgroup.user.enums.*;
+import cn.quantgroup.motan.enums.*;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -51,14 +51,14 @@ public class UserExtInfo implements Serializable {
     XUserExtInfo xUserExtInfo = new XUserExtInfo();
     xUserExtInfo.setId(this.id);
     xUserExtInfo.setUserId(this.userId);
-    xUserExtInfo.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.valueOf(this.educationEnum.name()));
-    xUserExtInfo.setIncomeEnum(cn.quantgroup.user.enums.IncomeEnum.valueOf(this.incomeEnum.name()));
-    xUserExtInfo.setIncomeRangeEnum(cn.quantgroup.user.enums.IncomeRangeEnum.valueOf(this.incomeRangeEnum.name()));
-    xUserExtInfo.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.valueOf(this.occupationEnum.name()));
+    xUserExtInfo.setEducationEnum(cn.quantgroup.motan.enums.EducationEnum.valueOf(this.educationEnum.name()));
+    xUserExtInfo.setIncomeEnum(cn.quantgroup.motan.enums.IncomeEnum.valueOf(this.incomeEnum.name()));
+    xUserExtInfo.setIncomeRangeEnum(cn.quantgroup.motan.enums.IncomeRangeEnum.valueOf(this.incomeRangeEnum.name()));
+    xUserExtInfo.setOccupationEnum(cn.quantgroup.motan.enums.OccupationEnum.valueOf(this.occupationEnum.name()));
     xUserExtInfo.setHasCar(this.hasCar);
     xUserExtInfo.setHasSocialSecurity(this.hasSocialSecurity);
     xUserExtInfo.setHasCreditCard(this.hasCreditCard);
-    xUserExtInfo.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(this.marryStatus.name()));
+    xUserExtInfo.setMarryStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(this.marryStatus.name()));
     xUserExtInfo.setCreatedAt(this.createdAt);
     xUserExtInfo.setUpdateAt(this.updateAt);
     return xUserExtInfo;

src/main/java/cn/quantgroup/xyqb/entity/UserSpouse.java

 package cn.quantgroup.xyqb.entity;
 
 
-import cn.quantgroup.user.enums.MaritalStatus;
+import cn.quantgroup.motan.enums.MaritalStatus;
 import lombok.*;
 
 import javax.persistence.*;

src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

@@ -26,7 +26,7 @@ import java.io.PrintWriter;
 public class RequestFilter implements Filter {
 
   private static final String[] ALLOWED_PATTERNS = {
-      "/innerapi/**", "/user/exist", "/motan/**", "/user/register", "/user/login", "/user/register/fast","/auth/info/login",
+      "/hello/**","/innerapi/**", "/user/exist", "/motan/**", "/user/register", "/user/login", "/user/register/fast","/auth/info/login",
       "/user/login/fast", "/user/reset_password", "/user/exist_check","/user/center/**",
       "/jr58/**", "/app/login", "/app/login_super", "/wechat/**", "/config/**", "/api/**", "/user/exists_token","/query/**",
       "/platform/api/page/return_url", "/MP_" +

src/main/java/cn/quantgroup/xyqb/model/ContactRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.Contact;
-import cn.quantgroup.user.enums.Relation;
+import cn.quantgroup.motan.enums.Relation;
 import lombok.Data;
 import org.apache.commons.collections.CollectionUtils;
 

src/main/java/cn/quantgroup/xyqb/model/UserExtInfoRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.UserExtInfo;
-import cn.quantgroup.user.enums.*;
+import cn.quantgroup.motan.enums.*;
 import lombok.Data;
 
 /**

src/main/java/cn/quantgroup/xyqb/model/UserSpouseRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.UserSpouse;
-import cn.quantgroup.user.enums.MaritalStatus;
+import cn.quantgroup.motan.enums.MaritalStatus;
 import lombok.Data;
 
 /**

src/main/java/cn/quantgroup/xyqb/service/user/impl/ContactServiceImpl.java

@@ -20,13 +20,13 @@ public class ContactServiceImpl implements IContactService {
   private IContactRepository contactRepository;
 
   @Override
-  @Cacheable(value = "contact", key = "'contact' + #userId", unless = "#result == null or #result.size() == 0", cacheManager = "cacheManager")
+  @Cacheable(value = "contact1", key = "'contact' + #userId", unless = "#result == null or #result.size() == 0", cacheManager = "cacheManager")
   public List<Contact> findByUserId(Long userId) {
     return contactRepository.findByUserId(userId);
   }
 
   @Override
-  @CacheEvict(value = "contact", key = "'contact' + #contacts.get(0).userId", cacheManager = "cacheManager")
+  @CacheEvict(value = "contact1", key = "'contact' + #contacts.get(0).userId", cacheManager = "cacheManager")
   public List<Contact> save(List<Contact> contacts) {
     return contactRepository.save(contacts);
   }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

 package cn.quantgroup.xyqb.service.user.impl;
 
-import cn.quantgroup.user.enums.Relation;
+import cn.quantgroup.motan.enums.Relation;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.*;
 import cn.quantgroup.xyqb.model.IdCardInfo;

src/main/java/cn/quantgroup/xyqb/service/user/vo/UserDetailVO.java

@@ -68,10 +68,10 @@ public class UserDetailVO {
     xUserDetail.setName(this.getName());
     xUserDetail.setIdNo(this.getIdNo());
     if (this.getIdType() != null) {
-      xUserDetail.setIdType(cn.quantgroup.user.enums.IdType.valueOf(this.getIdType().name()));
+      xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
     }
     if (this.getGender() != null) {
-      xUserDetail.setGender(cn.quantgroup.user.enums.Gender.valueOf(this.getGender().name()));
+      xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(this.getGender().name()));
     }
     xUserDetail.setEmail(this.getEmail());
     xUserDetail.setQq(this.getQq());

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

@@ -101,7 +101,7 @@ loanvest.rabbitmq.connection.virtual-host=/loan_order
 #loanvest.rabbitmq.stateMsgQueue=loan_vest_msg_queue
 loanvest.rabbitmq.queue=loan_user_queue
 loanvest.rabbitmq.exchange=loan_vest_exchange
-loanvest.rabbitmq.connection.host=192.168.4.155
+loanvest.rabbitmq.connection.host=192.168.4.153
 loanvest.rabbitmq.connection.port=5672
 loanvest.rabbitmq.connection.user=qa
 loanvest.rabbitmq.connection.password=qatest