Merge branch 'master' into xyqb-user2-userCenter

Conflicts:
	src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
	src/main/resources/config/dev/xyqb.properties

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

@@ -4,6 +4,8 @@ import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.entity.*;
 import cn.quantgroup.xyqb.entity.enumerate.*;
 import cn.quantgroup.xyqb.model.*;
+import cn.quantgroup.motan.bean.AppLoginResultBean;
+import cn.quantgroup.motan.vo.UserSysResult;
 import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Address;
@@ -28,6 +30,7 @@ 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;
 import cn.quantgroup.xyqb.service.user.IAddressService;
 import cn.quantgroup.xyqb.service.user.IContactService;
@@ -38,8 +41,13 @@ import cn.quantgroup.xyqb.service.user.IUserSpouseService;
 import cn.quantgroup.xyqb.service.user.vo.UserDetailVO;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.util.ValidationUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.google.common.collect.ImmutableMap;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.Collections;
@@ -49,6 +57,7 @@ import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -88,6 +97,19 @@ public class InnerController implements IBaseController {
   @Autowired
   private ISessionService sessionService;
 
+  @Autowired
+  private IHttpService httpService;
+
+  @Value("${xyqb.user.query.url}")
+  private String queryUrl;
+
+  private static final ObjectMapper MAPPER = new ObjectMapper();
+
+  static {
+    MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    MAPPER.configure(SerializationFeature.WRITE_ENUMS_USING_INDEX, true);
+  }
+
   @RequestMapping("/user/search/phoneNo")
   @LogHttpCaller
   public JsonResult findByPhoneNo(String phoneNo) {
@@ -151,6 +173,8 @@ public class InnerController implements IBaseController {
     User user = userService.findByPhoneWithCache(phoneNo);
     if (user == null) {
       user = new User();
+    }else if(!user.getEnable()){
+      return JsonResult.buildErrorStateResult("用户已经注销", null);
     }
     if (org.apache.commons.lang.StringUtils.isEmpty(user.getUuid())) {
       user.setUuid(uuid);
@@ -406,8 +430,23 @@ public class InnerController implements IBaseController {
     if (StringUtils.isBlank(name) && StringUtils.isBlank(phoneNo) && StringUtils.isBlank(idNo)) {
       return JsonResult.buildErrorStateResult("至少必须满足一个条件不为空", null);
     }
-    List<UserDetailVO> userDetails = userDetailService.searchUserDetailList(name, phoneNo, idNo);
-    return JsonResult.buildSuccessResult("success", userDetails);
+
+    /*List<UserDetailVO> userDetails = userDetailService.searchUserDetailList(name, phoneNo, idNo);
+    return JsonResult.buildSuccessResult("success", userDetails);*/
+
+    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
+    if(StringUtils.isNotBlank(name)){
+      builder.put("name",name);
+    }
+    if(StringUtils.isNotBlank(phoneNo)){
+      builder.put("phoneNo",phoneNo);
+    }
+    if(StringUtils.isNotBlank(idNo)){
+      builder.put("idNo",idNo);
+    }
+    Map<String, String> param =builder.build();
+    String s = httpService.get(queryUrl.concat("/innerapi/user_detail/search_list"), param);
+    return  JSON.parseObject(s, JsonResult.class);
   }
 
   @RequestMapping("/user_ext_info/search/user_id")
@@ -514,7 +553,8 @@ public class InnerController implements IBaseController {
     if(StringUtils.isBlank(userPhones)){
       return JsonResult.buildErrorStateResult("传入用户手机号不可为空",null);
     }
-    List<String> phones = JSONObject.parseObject(userPhones, new TypeReference<List<String>>() {});
+    List<String> phones = JSONObject.parseObject(userPhones, new TypeReference<List<String>>() {
+    });
     if(org.apache.commons.collections.CollectionUtils.isNotEmpty(phones)) {
       if(!(phones.size()>500)) {
         List<User> users = userService.findByPhones(phones);
@@ -526,7 +566,7 @@ public class InnerController implements IBaseController {
       }
       return JsonResult.buildErrorStateResult("单次批量查询不可超过500个手机号",null);
     }
-    return JsonResult.buildErrorStateResult("传入用户手机号不可为空",null);
+    return JsonResult.buildErrorStateResult("传入用户手机号不可为空", null);
   }
 
 

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
-    <appender name="STDOUT" class="cn.quantgroup.xyqb.util.log.WithOutPhoneRollingFileAppender">
+    <!--<appender name="STDOUT" class="cn.quantgroup.xyqb.util.log.WithOutPhoneRollingFileAppender">
         <file>/home/quant_group/logs/xyqb_user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>/home/quant_group/logs/xyqb_user.log.%d{yyyy-MM-dd}</fileNamePattern>
             <append>true</append>
             <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <!--
+        </rollingPolicy>-->
+
             <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>
         </layout>

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

@@ -86,3 +86,4 @@ motan.application=xyqbUserMotan
 
 #xyqb-user-域名
 xyqb.user.domain=passport.xyqb.com
+xyqb.user.query.url=http://192.168.11.40:8081
\ No newline at end of file

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

@@ -49,4 +49,6 @@ motan.user.module=user-motan-rpc
 motan.application=xyqbUserMotan
 
 #xyqb-user-域名
-xyqb.user.domain=passport.xyqb.com
+xyqb.user.domain=passport.xyqb.com
\ No newline at end of file
+
+xyqb.user.query.url=http://userqry.xyqb.com
\ No newline at end of file

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

@@ -51,4 +51,5 @@ wechat.appid=wxcdf6077af8127559
 wechat.secret=16eaec16084d0d9c52d4114f359cc72c
 
 #xyqb-user-域名
-xyqb.user.domain=passport.xyqb.com
+xyqb.user.domain=passport.xyqb.com
\ No newline at end of file
+xyqb.user.query.url=http://userqry.xyqb.com
\ No newline at end of file