回归提交代码

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

@@ -85,12 +85,9 @@ public class InnerController implements IBaseController {
   @Autowired
   private IUserRegisterService userRegisterService;
 
-  @Value("${xyqb.user.query.url}")
+  @Value("${userqry.http}")
   private String queryUrl;
 
-  @Value("${xyqb.auth.url}")
-  private String hanguguanUrl;
-
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
   static {
@@ -117,8 +114,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", userRet);
   }
 
-  @RequestMapping("/user/search/uuid")
   @LogHttpCaller
+  @RequestMapping("/user/search/uuid")
   public JsonResult findByUuid(String uuid) {
     User user = userService.findByUuidInDb(uuid);
     if (user == null) {
@@ -128,8 +125,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", userRet);
   }
 
-  @RequestMapping("/userInfo/search/uuid")
   @LogHttpCaller
+  @RequestMapping("/userInfo/search/uuid")
   public JsonResult findUserInfoByUuid(@RequestParam(value = "uuid") String uuid) {
     LOGGER.info("需要查询的用户uuidid, uuid:" + uuid);
 
@@ -148,8 +145,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", null);
   }
 
-  @RequestMapping("/userInfo/search/phone")
   @LogHttpCaller
+  @RequestMapping("/userInfo/search/phone")
   public JsonResult findUserInfoByPhone(@RequestParam(value = "phone") String phone) {
     LOGGER.info("需要查询的用户phone, phone:" + phone);
 
@@ -168,9 +165,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", null);
   }
 
-
-  @RequestMapping("/user/getPhoneByUserIds")
   @LogHttpCaller
+  @RequestMapping("/user/getPhoneByUserIds")
   public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString) {
     LOGGER.info("批量查询用户的手机号列表, userIdsString:" + userIdsString);
     if (StringUtils.isEmpty(userIdsString)) {
@@ -234,7 +230,6 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, userRet);
   }
 
-
   /**
    * 保存用户详细信息
    */
@@ -295,8 +290,8 @@ public class InnerController implements IBaseController {
   /**
    * 根据用户id查询用户的详细信息
    */
-  @RequestMapping("/user_detail/search/userId")
   @LogHttpCaller
+  @RequestMapping("/user_detail/search/userId")
   public JsonResult findUserDetailByUserId(Long userId) {
     UserDetail userDetail = userDetailService.findByUserId(userId);
     if (userDetail != null) {
@@ -305,8 +300,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildErrorStateResult("", null);
   }
 
-  @RequestMapping("/user/search/userId")
   @LogHttpCaller
+  @RequestMapping("/user/search/userId")
   public JsonResult findUserByUserId(Long userId) {
     User user = userService.findById(userId);
     if (user != null) {
@@ -315,8 +310,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildErrorStateResult("", null);
   }
 
-  @RequestMapping("/user_detail/search/phone")
   @LogHttpCaller
+  @RequestMapping("/user_detail/search/phone")
   public JsonResult findUserDetailByPhone(String phoneNo) {
     UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo);
     if (userDetail != null) {
@@ -331,8 +326,8 @@ public class InnerController implements IBaseController {
    * @param phoneNo
    * @return
    */
-  @RequestMapping("/user_full_info/search/phone")
   @LogHttpCaller
+  @RequestMapping("/user_full_info/search/phone")
   public JsonResult findUserFullInfoByPhone(String phoneNo) {
     if (StringUtils.isBlank(phoneNo)) {
       LOGGER.warn("[findUserFullInfoByPhone]phoneNo为空");
@@ -352,8 +347,8 @@ public class InnerController implements IBaseController {
    * @param uuid
    * @return
    */
-  @RequestMapping("/user_full_info/search/uuid")
   @LogHttpCaller
+  @RequestMapping("/user_full_info/search/uuid")
   public JsonResult findUserFullInfoByUUuid(String uuid) {
     if (StringUtils.isBlank(uuid)) {
       LOGGER.warn("[findUserFullInfoByUUuid]uuid为空");
@@ -376,8 +371,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, null);
   }
 
-  @RequestMapping("/contact/search/user_id")
   @LogHttpCaller
+  @RequestMapping("/contact/search/user_id")
   public JsonResult findContactsByUserId(Long userId) {
     if (null == userId) {
       return JsonResult.buildErrorStateResult(null, null);
@@ -488,8 +483,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(addressObj));
   }
 
-  @RequestMapping("/user_ext_info/update")
   @LogHttpCaller
+  @RequestMapping("/user_ext_info/update")
   public JsonResult updateMarryStatus(
           Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum,
           OccupationEnum occupationEnum, EducationEnum educationEnum, Boolean hasCar,
@@ -566,8 +561,8 @@ public class InnerController implements IBaseController {
     return JSON.parseObject(s, JsonResult.class);
   }
 
-  @RequestMapping("/user_ext_info/search/user_id")
   @LogHttpCaller
+  @RequestMapping("/user_ext_info/search/user_id")
   public JsonResult searchUserExtInfoByUserId(Long userId) {
     if (userId == null) {
       return JsonResult.buildErrorStateResult("userId不能为空", null);
@@ -579,8 +574,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, UserExtInfoRet.getUserExtInfoRet(userExtInfo));
   }
 
-  @RequestMapping("/user/query/openId")
   @LogHttpCaller
+  @RequestMapping("/user/query/openId")
   public JsonResult queryOpenIdByUserId(Long userId) {
     if (userId == null) {
       return JsonResult.buildErrorStateResult("userId不能为空", null);
@@ -791,8 +786,8 @@ public class InnerController implements IBaseController {
     return contactRets;
   }
 
-  @RequestMapping("/user/wechat/phone_no")
   @LogHttpCaller
+  @RequestMapping("/user/wechat/phone_no")
   public JsonResult queryOpenIdByPhoneNo(String phoneNo) {
     if (StringUtils.isBlank(phoneNo)) {
       return JsonResult.buildErrorStateResult("手机号错误", null);
@@ -871,8 +866,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
   }
 
-  @RequestMapping("/user/spouse/findByUserId")
   @LogHttpCaller
+  @RequestMapping("/user/spouse/findByUserId")
   public JsonResult querySpouse(Long userId) {
     if (userId == null || userId == 0) {
       return JsonResult.buildErrorStateResult("用户不能为空", null);
@@ -942,8 +937,8 @@ public class InnerController implements IBaseController {
   /**
    * 保存用户信息，地址信息，联系人信息
    */
-  @RequestMapping("/user/save_multi")
   @LogHttpCaller
+  @RequestMapping("/user/save_multi")
   public JsonResult saveMulti(
           String registeredFrom,
           String channelId,
@@ -1032,9 +1027,8 @@ public class InnerController implements IBaseController {
   }
 
   //根据日期时间段查询新注册用户信息并返回
-
-  @RequestMapping("/contract/queryRegisterUsers")
   @LogHttpCaller
+  @RequestMapping("/contract/queryRegisterUsers")
   public JsonResult findRegisterUserByTime(String beginTime, String endTime) {
     if (null == beginTime || endTime == null) {
       return JsonResult.buildErrorStateResult(null, null);
@@ -1084,15 +1078,6 @@ public class InnerController implements IBaseController {
     }
     int affectedRows = userDetailService.updateIdCard(name, idNo, phoneNo);
     LOGGER.info("更新用户的信息,name;{},idNo:{},phoneNo:{},操作的理由reason:{},受影响的行数affectedRows:{}", name, idNo, phoneNo, reason, affectedRows);
-    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
-    builder.put("phoneNo", phoneNo);
-    builder.put("name", name);
-    builder.put("idNo", idNo);
-    builder.put("reason", reason);
-    builder.put("content", content);
-    LOGGER.info("去函谷关修改用户身份证号或姓名");
-    Map<String, String> param = builder.build();
-    httpService.get(hanguguanUrl.concat("/innerapi/updateIdCard"), param);
     return JsonResult.buildSuccessResult("修改用户身份证号或姓名成功", affectedRows);
   }
 
@@ -1117,14 +1102,6 @@ public class InnerController implements IBaseController {
 
     int affectedRows = userService.forbiddenUser(enable, phoneNo);
     LOGGER.info("禁用或者重启用户的理由,reason:{},手机号phoneNo:{},受影响的行数affectedRows:{}", reason, phoneNo, affectedRows);
-    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
-    builder.put("phoneNo", phoneNo);
-    builder.put("enable", String.valueOf(enable));
-    builder.put("reason", reason);
-    builder.put("content", content);
-    LOGGER.info("去函谷关禁用或者重启用户");
-    Map<String, String> param = builder.build();
-    httpService.get(hanguguanUrl.concat("/innerapi/forbiddenUserOrNot"), param);
     return JsonResult.buildSuccessResult("用户禁用或重启成功成功", affectedRows);
   }