Merge branch 'master' into feature/20170622

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
#	src/main/resources/config/dev/xyqb.properties

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

@@ -275,7 +275,7 @@ public class UserQueryLogController {
           uqi.setAddress(oad.get().toString());
         }
       }
-      if(columns.contains("bankCard")){
+      if(columns.contains("bankCard")&&phonesCards!=null){
         uqi.setBankCards(phonesCards.get(ud.getPhoneNo()));
       }
 
@@ -286,7 +286,7 @@ public class UserQueryLogController {
     //保存记录
     UserQueryLog log=new UserQueryLog();
     log.setQueryItems(columns.replace("userId","用户ID").replace("phoneNo","手机号").replace("idNo","身份证号").replace("bankCard","银行卡号").replace("address","地址"));
-    log.setResultAmount(Long.valueOf(userDetailPage.getTotalPages()));
+    log.setResultAmount(Long.valueOf(userDetailPage.getTotalElements()));
     //转换存储
     log.setQueryCondition(key.replace("userId","用户ID").replace("phoneNo","手机号").replace("idNo","身份证号"));
     log.setQueryDetail(keyValues.replace("\n",";"));
@@ -304,8 +304,11 @@ public class UserQueryLogController {
   }
 
   private HashMap<String,String> getBankCardsByPhoneNos(List<String> phoneNos){
+    HashMap<String,Object> ha=new HashMap<String,Object>();
+    ha.put("type","1");
+    ha.put("phones",phoneNos);
+    String phoneNoStr= new Gson().toJson(ha);
 
-    String phoneNoStr= new Gson().toJson(phoneNos);
     String data="";
     String sign="";
     HashMap<String,String> phonesMap=new HashMap<String,String>();
@@ -333,8 +336,7 @@ public class UserQueryLogController {
         //校验签名
         if(MD5Util.build(dataStr).equals(signStr)){
           String jsonDataStr=RSA.decrypt(dataStr,privateKey);
-          //String chang=jsonDataStr.substring(1,jsonDataStr.length()-1);
-          JsonArray listObj = new JsonParser().parse(jsonDataStr).getAsJsonArray();//.getAsJsonObject();
+          JsonArray listObj = new JsonParser().parse(jsonDataStr).getAsJsonArray();
           for(JsonElement jsonElement : listObj) {
             JsonObject jo = jsonElement.getAsJsonObject();
             JsonArray cardList = jo.get("cardList").getAsJsonArray();
@@ -344,20 +346,21 @@ public class UserQueryLogController {
             for(JsonElement element : cardList){
               cards=cards+element.getAsString()+";";
             }
-            phonesMap.put(phone,cards.substring(0,cards.length()-1));
+            if(cards.length()>0){
+              phonesMap.put(phone,cards.substring(0,cards.length()-1));
+            }
+
           }
         }else{
           phonesMap.put("errorMsg","签名校验失败！");
             LOGGER.info("签名校验失败！");
         }
-      }else{
-          phonesMap.put("errorMsg",obj.get("msg").getAsString());
-          LOGGER.info("从支付中心接口返回data为null");
       }
-//      if(obj.get("msg")!=null&&!obj.get("msg").getAsString().equals("")){
-//        phonesMap.put("errorMsg",obj.get("msg").getAsString());
-//        LOGGER.info("从支付中心接口返回");
+//      else{
+//          phonesMap.put("errorMsg",obj.get("msg").getAsString());
+//          LOGGER.info("从支付中心接口返回data为null");
 //      }
+
     }catch(Exception e){
        phonesMap.put("errorMsg","查询银行卡信息接口返回解析异常");
         LOGGER.info("查询银行卡信息接口返回解析异常");
@@ -366,17 +369,19 @@ public class UserQueryLogController {
   }
 
   @RequestMapping("/exportUserInfo")
-  public JsonResult exportExcel(final HttpServletResponse response,String key,String keyValues, String columns,String token){
+  public JsonResult exportExcel(final HttpServletResponse response, HttpServletRequest request,String key,String keyValues, String columns){
 
-    //String token=request.getHeader("x-auth-token");
+
+    String token=request.getHeader("x-auth-token");
     if(token==null||token.equals("")){
+      LOGGER.info("token为空，非法查询");
       return JsonResult.buildErrorStateResult("缺少授权信息",null);
     }
+
     String userName=checkUserToken(token);
     if(userName.equals("")){
       return JsonResult.buildErrorStateResult("未授权查询",null);
     }
-
     //输入enter换行\n
     if(org.apache.commons.lang3.StringUtils.isEmpty(keyValues)){
       return JsonResult.buildErrorStateResult("请输入查询条件",null);
@@ -479,22 +484,22 @@ public class UserQueryLogController {
           uqi.setAddress(oad.get().toString());
         }
       }
-      if(columns.contains("bankCard")){
+      if(columns.contains("bankCard")&&phonesCards!=null){
         uqi.setBankCards(phonesCards.get(ud.getPhoneNo()));
       }
       uqls.add(uqi);
 
     }
 
-    //保存记录
-    UserQueryLog log=new UserQueryLog();
-    log.setQueryItems(columns.replace("userId","用户ID").replace("phoneNo","手机号").replace("idNo","身份证号").replace("bankCard","银行卡号").replace("address","地址"));
-    log.setResultAmount(Long.valueOf(userDetails.size()));
-    //转换存储
-    log.setQueryCondition(key.replace("userId","用户ID").replace("phoneNo","手机号").replace("idNo","身份证号"));
-    log.setQueryDetail(keyValues.replace("\n",";"));
-    log.setLoginUserName(userName);
-    userQueryLogService.save(log);
+//    //不保存记录
+//    UserQueryLog log=new UserQueryLog();
+//    log.setQueryItems(columns.replace("userId","用户ID").replace("phoneNo","手机号").replace("idNo","身份证号").replace("bankCard","银行卡号").replace("address","地址"));
+//    log.setResultAmount(Long.valueOf(userDetails.size()));
+//    //转换存储
+//    log.setQueryCondition(key.replace("userId","用户ID").replace("phoneNo","手机号").replace("idNo","身份证号"));
+//    log.setQueryDetail(keyValues.replace("\n",";"));
+//    log.setLoginUserName(userName);
+//    userQueryLogService.save(log);
 
     HSSFWorkbook wb = new HSSFWorkbook();
     // 第二步，在webbook中添加一个sheet,对应Excel文件中的sheet
@@ -556,11 +561,6 @@ public class UserQueryLogController {
           cell4.setCellValue(user.getAddress()==null?" ":user.getAddress());
         }
 
-//        row.createCell(0).setCellValue();
-//        row.createCell(1).setCellValue(user.getPhoneNo());
-//        row.createCell(2).setCellValue(user.getIdNo());
-//        row.createCell(3).setCellValue(user.getBankCards());
-//        row.createCell(4).setCellValue(user.getAddress());
       }
     }
     // 第六步，将文件存到指定位置
@@ -568,8 +568,9 @@ public class UserQueryLogController {
     {
       OutputStream output=response.getOutputStream();
       response.reset();
-      response.setHeader("Content-disposition", "attachment; filename=users.xls");
-      response.setContentType("application/msexcel");
+      response.setHeader("Content-disposition", "attachment; filename=users.xlsx");
+      response.setContentType("application/vnd.ms-excel;charset=utf-8");
+      response.setCharacterEncoding("utf-8");
       wb.write(output);
       output.close();
 

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

@@ -20,6 +20,7 @@ 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.UserInfo;
 import cn.quantgroup.xyqb.model.UserRet;
 import cn.quantgroup.xyqb.model.UserSpouseRet;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
@@ -124,8 +125,8 @@ public class InnerController implements IBaseController {
     if (user == null) {
       return JsonResult.buildErrorStateResult("", null);
     }
-    UserRet userRet = new UserRet(user);
 
+    UserRet userRet = new UserRet(user);
 
     return JsonResult.buildSuccessResult("", userRet);
   }
@@ -137,10 +138,50 @@ public class InnerController implements IBaseController {
     if (user == null) {
       return JsonResult.buildErrorStateResult("", null);
     }
-    UserRet userRet  = new UserRet(user);
+    UserRet userRet = new UserRet(user);
     return JsonResult.buildSuccessResult("", userRet);
   }
 
+  @RequestMapping("/userInfo/search/uuid")
+  @LogHttpCaller
+  public JsonResult findUserInfoByUuid(@RequestParam(value = "uuid") String uuid) {
+    LOGGER.info("需要查询的用户uuidid, uuid:" + uuid);
+
+    if (StringUtils.isBlank(uuid)) {
+      return JsonResult.buildSuccessResult(null, null);
+    }
+    User user = userService.findByUuidInDb(uuid);
+    if(null!=user){
+      if(!user.getEnable()){
+        return JsonResult.buildSuccessResult("", null);
+      }
+      UserDetail userDetail = userDetailService.findByUserId(user.getId());
+      UserInfo info = new UserInfo(user,userDetail);
+      return JsonResult.buildSuccessResult("", info);
+    }
+    return JsonResult.buildSuccessResult("", null);
+  }
+  @RequestMapping("/userInfo/search/phone")
+  @LogHttpCaller
+  public JsonResult findUserInfoByPhone(@RequestParam(value = "phone") String phone) {
+    LOGGER.info("需要查询的用户phone, phone:" + phone);
+
+    if (StringUtils.isBlank(phone)) {
+      return JsonResult.buildSuccessResult(null, null);
+    }
+    User user = userService.findByPhoneInDb(phone);
+    if(null!=user){
+      if(!user.getEnable()){
+        return JsonResult.buildSuccessResult("", null);
+      }
+      UserDetail userDetail = userDetailService.findByUserId(user.getId());
+      UserInfo info = new UserInfo(user,userDetail);
+      return JsonResult.buildSuccessResult("", info);
+    }
+    return JsonResult.buildSuccessResult("", null);
+  }
+
+
   @RequestMapping("/user/getPhoneByUserIds")
   @LogHttpCaller
   public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString) {
@@ -266,7 +307,7 @@ public class InnerController implements IBaseController {
   public JsonResult findUserByUserId(Long userId) {
     User user = userService.findById(userId);
     if (user != null) {
-      return JsonResult.buildSuccessResult(null,  new UserRet(user));
+      return JsonResult.buildSuccessResult(null, new UserRet(user));
     }
     return JsonResult.buildErrorStateResult("", null);
   }

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

@@ -33,7 +33,7 @@ public class UserQueryLog implements Serializable {
   @Column(name = "query_detail")
   private String queryDetail;
   @Column(name = "created_at")
-  private Date createdAt;
+  private Date createdAt=new Date();
 
   @Transient
   private String createDate;

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

+package cn.quantgroup.xyqb.model;
+
+import cn.quantgroup.xyqb.entity.User;
+import cn.quantgroup.xyqb.entity.UserDetail;
+import java.io.Serializable;
+import jdk.nashorn.internal.ir.IdentNode;
+import lombok.Data;
+
+/**
+ * Created by xuran on 2017/7/5.
+ */
+@Data
+public class UserInfo implements Serializable {
+  private static final long serialVersionUID = -1L;
+
+  private Long id;
+
+  private String name;
+
+  private String phoneNo;
+
+  private Long registerFrom;
+
+  private String uuid;
+  private String IdNo;
+
+  public UserInfo(User user, UserDetail userDetail) {
+    assert user != null;
+    this.id = user.getId();
+    this.phoneNo = user.getPhoneNo();
+    this.registerFrom = user.getRegisteredFrom();
+    this.uuid = user.getUuid();
+    if (userDetail != null) {
+      this.name = userDetail.getName();
+      this.IdNo = userDetail.getIdNo();
+    }
+  }
+}

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

@@ -160,7 +160,7 @@ public class UserDetailServiceImpl implements IUserDetailService {
   private PageRequest buildPageRequest(int pageNumber, int pagzSize, String sortType) {
     Sort sort = null;
     if ("auto".equals(sortType)) {
-      sort = new Sort(Sort.Direction.DESC, "userId");
+      sort = new Sort(Sort.Direction.ASC, "userId");
     }
 
     return new PageRequest(pageNumber - 1, pagzSize, sort);

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

@@ -186,15 +186,16 @@ public class UserServiceImpl implements IUserService {
       log.info("白条注册渠道信息保存完成");
       registerSuccess=true;
     }
-    smsService.sendAfterRegister(phoneNo);
 
+    if(registerFrom!=158412){////网易KA引入注册时不发送短信提醒
+      smsService.sendAfterRegister(phoneNo);
+    }
     if(registerSuccess){
       //增加登陆统计发送
       UserStatistics statistics=new UserStatistics(user,dimension,2,channelId);
       MqUtils.sendLoanVest(statistics);
     }
-
-    return registerSuccess;
+    return user != null;
   }
 
 
@@ -250,7 +251,10 @@ public class UserServiceImpl implements IUserService {
     //user.setRegisteredFrom(registerFrom);
 
     user = userRepository.save(user);
-    smsService.sendAfterRegister(phoneNo);
+    if(registerFrom!=158412){//网易KA引入注册时不发送短信提醒
+      smsService.sendAfterRegister(phoneNo);
+    }
+
     return user != null;
   }
 

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

@@ -3,7 +3,7 @@ configserver.disable=1
 configserver.system=xyqb-user
 
 #xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.22:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
-xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.23:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
+xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.26:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
 
 xyqb.data.mysql.password=qatest
 
@@ -92,7 +92,7 @@ xyqb.user.domain=passport.xyqb.com
 xyqb.user.query.url=http://192.168.11.40:8081
 xyqb.domain = http://192.168.4.153:7003
 
-xyqb.paycenter.url=http://payapi.xyqb.com/
+xyqb.paycenter.url=http://192.168.4.26:7006
 xyqb.paycenter.id=3
 #内部运营系统
 xyqb.yunying.url=http://192.168.4.50:7047
@@ -104,4 +104,5 @@ loanvest.rabbitmq.exchange=loan_vest_exchange
 loanvest.rabbitmq.connection.host=192.168.4.153
 loanvest.rabbitmq.connection.port=5672
 loanvest.rabbitmq.connection.user=qa
-loanvest.rabbitmq.connection.password=qatest
+loanvest.rabbitmq.connection.password=qatest
\ No newline at end of file
+