Commit 67fd8d7e authored by xiaoguang.xu's avatar xiaoguang.xu

refact: 所有接口都加上日志打印

parent 4847a019
package cn.quantgroup.xyqb.aspect.logcaller; package cn.quantgroup.xyqb.aspect.logcaller;
import cn.quantgroup.xyqb.util.ApplicationContextHolder;
import cn.quantgroup.xyqb.util.IPUtil; import cn.quantgroup.xyqb.util.IPUtil;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
...@@ -10,7 +9,6 @@ import org.slf4j.Logger; ...@@ -10,7 +9,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
...@@ -29,7 +27,8 @@ public class LogCallHttpAspect { ...@@ -29,7 +27,8 @@ public class LogCallHttpAspect {
private static final Logger LOGGER = LoggerFactory.getLogger(LogCallHttpAspect.class); private static final Logger LOGGER = LoggerFactory.getLogger(LogCallHttpAspect.class);
@Pointcut("@annotation(cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller)") @Pointcut(value = "execution(public * cn.quantgroup.xyqb.controller..*.*(..)) " +
"&& !execution(* cn.quantgroup.xyqb.controller.ExceptionHandlingController.*(..))")
private void logHttpCaller() { private void logHttpCaller() {
} }
...@@ -41,9 +40,7 @@ public class LogCallHttpAspect { ...@@ -41,9 +40,7 @@ public class LogCallHttpAspect {
try { try {
HttpServletRequest request = attrs.getRequest(); HttpServletRequest request = attrs.getRequest();
String remoteIP = IPUtil.getRemoteIP(request); String remoteIP = IPUtil.getRemoteIP(request);
LogCallHttpAspect logCallHttpAspect = ApplicationContextHolder.getBean(LogCallHttpAspect.class); this.asyncRecordIt(pjp, result, remoteIP);
// 异步记录日志
logCallHttpAspect.asyncRecordIt(pjp, result, remoteIP);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("打印http请求日志出错", e); LOGGER.error("打印http请求日志出错", e);
} }
...@@ -58,12 +55,11 @@ public class LogCallHttpAspect { ...@@ -58,12 +55,11 @@ public class LogCallHttpAspect {
* @param result * @param result
* @param remoteIP * @param remoteIP
*/ */
@Async("logExecutor") private void asyncRecordIt(ProceedingJoinPoint pjp, Object result, String remoteIP) {
public void asyncRecordIt(ProceedingJoinPoint pjp, Object result, String remoteIP) {
Object[] args = pjp.getArgs(); Object[] args = pjp.getArgs();
String methodName = pjp.getSignature().getName(); String methodName = pjp.getSignature().getName();
String targetName = pjp.getTarget().getClass().getName(); String targetName = pjp.getTarget().getClass().getName();
LOGGER.info("http api is called,from IP:[{}],method :[{}],args:[{}],response:[{}]", remoteIP, targetName.concat(".").concat(methodName), args, result); LOGGER.info("http api is called,from IP:[{}],method :[{}],args:[{}]", remoteIP, targetName.concat(".").concat(methodName), args);
} }
} }
...@@ -88,22 +88,4 @@ public class LoanVestMQConfig { ...@@ -88,22 +88,4 @@ public class LoanVestMQConfig {
template.setExchange(loanVestExchange); template.setExchange(loanVestExchange);
return template; return template;
} }
//@Bean(name = "loanVestMsgQueue")
//public Queue loanStateMsgQueue() {
// return new Queue(stateQueueName);
//}
//@Bean(name = "loanVestListenerContainer")
//public SimpleMessageListenerContainer loanVestSimpleMessageListenerContainer(@Qualifier("loanVestMQService") IVestService vestService, @Qualifier("vestFactory") ConnectionFactory vestFactory, @Qualifier("loanVestMsgQueue")Queue loanVestMsgQueue) {
// SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
// container.setConnectionFactory(vestFactory);
// container.setQueues(loanVestMsgQueue);
// container.setAcknowledgeMode(AcknowledgeMode.NONE);
// container.setMessageListener(new MessageListenerAdapter(vestService));
// container.start();
// return container;
//
//}
} }
...@@ -37,7 +37,7 @@ public class NewCaptchaController { ...@@ -37,7 +37,7 @@ public class NewCaptchaController {
@Value("${geetest.close:false}") @Value("${geetest.close:false}")
private String geetestClose; private String geetestClose;
@LogHttpCaller
@RequestMapping(value = "/captcha/new") @RequestMapping(value = "/captcha/new")
public JsonResult getCaptcha(String phoneNo, String clientType, HttpServletRequest request) { public JsonResult getCaptcha(String phoneNo, String clientType, HttpServletRequest request) {
String remoteIp = IPUtil.getRemoteIP(request); String remoteIp = IPUtil.getRemoteIP(request);
......
...@@ -61,7 +61,7 @@ public class AppController implements IBaseController { ...@@ -61,7 +61,7 @@ public class AppController implements IBaseController {
* @param request * @param request
* @return Token和phoneNo * @return Token和phoneNo
*/ */
@LogHttpCaller
@IpValidator @IpValidator
@RequestMapping("/login") @RequestMapping("/login")
public JsonResult login( public JsonResult login(
...@@ -119,7 +119,7 @@ public class AppController implements IBaseController { ...@@ -119,7 +119,7 @@ public class AppController implements IBaseController {
* @param request * @param request
* @return 用户信息 * @return 用户信息
*/ */
@LogHttpCaller
@IpValidator @IpValidator
@RequestMapping("/login_super") @RequestMapping("/login_super")
public JsonResult loginSuper( public JsonResult loginSuper(
...@@ -186,7 +186,7 @@ public class AppController implements IBaseController { ...@@ -186,7 +186,7 @@ public class AppController implements IBaseController {
* @param request * @param request
* @return Token和phoneNo * @return Token和phoneNo
*/ */
@LogHttpCaller
@IpValidator @IpValidator
@RequestMapping("/login2") @RequestMapping("/login2")
public JsonResult login2( public JsonResult login2(
......
...@@ -103,7 +103,7 @@ public class InnerController implements IBaseController { ...@@ -103,7 +103,7 @@ public class InnerController implements IBaseController {
}; };
@RequestMapping("/user/search/phoneNo") @RequestMapping("/user/search/phoneNo")
@LogHttpCaller
public JsonResult findByPhoneNo(String phoneNo) { public JsonResult findByPhoneNo(String phoneNo) {
User user = userService.findByPhoneInDb(phoneNo); User user = userService.findByPhoneInDb(phoneNo);
if (user == null) { if (user == null) {
...@@ -115,7 +115,7 @@ public class InnerController implements IBaseController { ...@@ -115,7 +115,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("", userRet); return JsonResult.buildSuccessResult("", userRet);
} }
@LogHttpCaller
@RequestMapping("/user/search/uuid") @RequestMapping("/user/search/uuid")
public JsonResult findByUuid(String uuid) { public JsonResult findByUuid(String uuid) {
User user = userService.findByUuidWithCache(uuid); User user = userService.findByUuidWithCache(uuid);
...@@ -126,7 +126,7 @@ public class InnerController implements IBaseController { ...@@ -126,7 +126,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("", userRet); return JsonResult.buildSuccessResult("", userRet);
} }
@LogHttpCaller
@RequestMapping("/userInfo/search/uuid") @RequestMapping("/userInfo/search/uuid")
public JsonResult findUserInfoByUuid(@RequestParam(value = "uuid") String uuid) { public JsonResult findUserInfoByUuid(@RequestParam(value = "uuid") String uuid) {
log.info("需要查询的用户uuidid, uuid:" + uuid); log.info("需要查询的用户uuidid, uuid:" + uuid);
...@@ -146,7 +146,7 @@ public class InnerController implements IBaseController { ...@@ -146,7 +146,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("", null); return JsonResult.buildSuccessResult("", null);
} }
@LogHttpCaller
@RequestMapping("/userInfo/search/phone") @RequestMapping("/userInfo/search/phone")
public JsonResult findUserInfoByPhone(@RequestParam(value = "phone") String phone) { public JsonResult findUserInfoByPhone(@RequestParam(value = "phone") String phone) {
log.info("需要查询的用户phone, phone:" + phone); log.info("需要查询的用户phone, phone:" + phone);
...@@ -166,7 +166,7 @@ public class InnerController implements IBaseController { ...@@ -166,7 +166,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("", null); return JsonResult.buildSuccessResult("", null);
} }
@LogHttpCaller
@RequestMapping("/user/getPhoneByUserIds") @RequestMapping("/user/getPhoneByUserIds")
public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString) { public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString) {
log.info("批量查询用户的手机号列表, userIdsString:" + userIdsString); log.info("批量查询用户的手机号列表, userIdsString:" + userIdsString);
...@@ -183,7 +183,7 @@ public class InnerController implements IBaseController { ...@@ -183,7 +183,7 @@ public class InnerController implements IBaseController {
} }
} }
@LogHttpCaller
@RequestMapping("/user/save") @RequestMapping("/user/save")
public JsonResult saveUser( public JsonResult saveUser(
String phoneNo, Long registeredFrom, Long createdAt, Long updatedAt, String phoneNo, Long registeredFrom, Long createdAt, Long updatedAt,
...@@ -235,7 +235,7 @@ public class InnerController implements IBaseController { ...@@ -235,7 +235,7 @@ public class InnerController implements IBaseController {
* 保存用户详细信息 * 保存用户详细信息
* 适用于:创建 或 修改 * 适用于:创建 或 修改
*/ */
@LogHttpCaller
@RequestMapping("/user_detail/save") @RequestMapping("/user_detail/save")
public JsonResult saveUserDetail(Long userId, String phoneNo, String name, String idNo, public JsonResult saveUserDetail(Long userId, String phoneNo, String name, String idNo,
String email, String qq) { String email, String qq) {
...@@ -306,7 +306,7 @@ public class InnerController implements IBaseController { ...@@ -306,7 +306,7 @@ public class InnerController implements IBaseController {
/** /**
* 根据用户id查询用户的详细信息 * 根据用户id查询用户的详细信息
*/ */
@LogHttpCaller
@RequestMapping("/user_detail/search/userId") @RequestMapping("/user_detail/search/userId")
public JsonResult findUserDetailByUserId(Long userId) { public JsonResult findUserDetailByUserId(Long userId) {
UserDetail userDetail = null; UserDetail userDetail = null;
...@@ -320,7 +320,7 @@ public class InnerController implements IBaseController { ...@@ -320,7 +320,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, UserDetailRet.getUserDetail(userDetail)); return JsonResult.buildSuccessResult(null, UserDetailRet.getUserDetail(userDetail));
} }
@LogHttpCaller
@RequestMapping("/user/search/userId") @RequestMapping("/user/search/userId")
public JsonResult findUserByUserId(Long userId) { public JsonResult findUserByUserId(Long userId) {
User user = userService.findById(userId); User user = userService.findById(userId);
...@@ -330,7 +330,7 @@ public class InnerController implements IBaseController { ...@@ -330,7 +330,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("", null);
} }
@LogHttpCaller
@RequestMapping("/user_detail/search/phone") @RequestMapping("/user_detail/search/phone")
public JsonResult findUserDetailByPhone(String phoneNo) { public JsonResult findUserDetailByPhone(String phoneNo) {
UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo); UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo);
...@@ -346,7 +346,7 @@ public class InnerController implements IBaseController { ...@@ -346,7 +346,7 @@ public class InnerController implements IBaseController {
* @param phoneNo * @param phoneNo
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/user_full_info/search/phone") @RequestMapping("/user_full_info/search/phone")
public JsonResult findUserFullInfoByPhone(String phoneNo) { public JsonResult findUserFullInfoByPhone(String phoneNo) {
if (StringUtils.isBlank(phoneNo)) { if (StringUtils.isBlank(phoneNo)) {
...@@ -367,7 +367,7 @@ public class InnerController implements IBaseController { ...@@ -367,7 +367,7 @@ public class InnerController implements IBaseController {
* @param uuid * @param uuid
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/user_full_info/search/uuid") @RequestMapping("/user_full_info/search/uuid")
public JsonResult findUserFullInfoByUUuid(String uuid) { public JsonResult findUserFullInfoByUUuid(String uuid) {
if (StringUtils.isBlank(uuid)) { if (StringUtils.isBlank(uuid)) {
...@@ -390,7 +390,7 @@ public class InnerController implements IBaseController { ...@@ -390,7 +390,7 @@ public class InnerController implements IBaseController {
* @param userId - 用户主键 * @param userId - 用户主键
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/user_detail/update") @RequestMapping("/user_detail/update")
public JsonResult updateUserDetail(String qq, String email, Long userId) { public JsonResult updateUserDetail(String qq, String email, Long userId) {
if (Objects.isNull(userId) || userId == 0L) { if (Objects.isNull(userId) || userId == 0L) {
...@@ -405,7 +405,7 @@ public class InnerController implements IBaseController { ...@@ -405,7 +405,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, null); return JsonResult.buildSuccessResult(null, null);
} }
@LogHttpCaller
@RequestMapping("/user_detail/update/qq") @RequestMapping("/user_detail/update/qq")
public JsonResult updateUserQQ(String qq, Long userId) { public JsonResult updateUserQQ(String qq, Long userId) {
if (StringUtils.isEmpty(qq) || userId == null || userId == 0L) { if (StringUtils.isEmpty(qq) || userId == null || userId == 0L) {
...@@ -415,7 +415,7 @@ public class InnerController implements IBaseController { ...@@ -415,7 +415,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, null); return JsonResult.buildSuccessResult(null, null);
} }
@LogHttpCaller
@RequestMapping("/contact/search/user_id") @RequestMapping("/contact/search/user_id")
public JsonResult findContactsByUserId(Long userId) { public JsonResult findContactsByUserId(Long userId) {
if (null == userId) { if (null == userId) {
...@@ -428,7 +428,7 @@ public class InnerController implements IBaseController { ...@@ -428,7 +428,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, ContactRet.contacts2ContactRets(contacts)); return JsonResult.buildSuccessResult(null, ContactRet.contacts2ContactRets(contacts));
} }
@LogHttpCaller
@RequestMapping("/contact/save/contacts") @RequestMapping("/contact/save/contacts")
public JsonResult save2Contact(Long userId, @RequestParam(value = "contacts") String contactsStr) { public JsonResult save2Contact(Long userId, @RequestParam(value = "contacts") String contactsStr) {
if (Objects.isNull(userId) || StringUtils.isBlank(contactsStr)) { if (Objects.isNull(userId) || StringUtils.isBlank(contactsStr)) {
...@@ -452,7 +452,7 @@ public class InnerController implements IBaseController { ...@@ -452,7 +452,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("保存成功", ContactRet.contacts2ContactRets(result)); return JsonResult.buildSuccessResult("保存成功", ContactRet.contacts2ContactRets(result));
} }
@LogHttpCaller
@RequestMapping("/contact/update/contact") @RequestMapping("/contact/update/contact")
public JsonResult updateContact(@RequestParam Long contactId, @RequestParam(required = false) String name, public JsonResult updateContact(@RequestParam Long contactId, @RequestParam(required = false) String name,
@RequestParam(required = false) String phoneNo, @RequestParam(required = false) String phoneNo,
...@@ -486,7 +486,7 @@ public class InnerController implements IBaseController { ...@@ -486,7 +486,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("修改联系人成功", contact); return JsonResult.buildSuccessResult("修改联系人成功", contact);
} }
@LogHttpCaller
@RequestMapping("/address/search/user_id") @RequestMapping("/address/search/user_id")
public JsonResult findAddressByUserId(Long userId) { public JsonResult findAddressByUserId(Long userId) {
if (userId == null) { if (userId == null) {
...@@ -499,7 +499,7 @@ public class InnerController implements IBaseController { ...@@ -499,7 +499,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(address)); return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(address));
} }
@LogHttpCaller
@RequestMapping("/address/save") @RequestMapping("/address/save")
public JsonResult saveAddress( public JsonResult saveAddress(
Long userId, Long provinceCode, Long cityCode, String city, Long userId, Long provinceCode, Long cityCode, String city,
...@@ -533,7 +533,7 @@ public class InnerController implements IBaseController { ...@@ -533,7 +533,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(addressObj)); return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(addressObj));
} }
@LogHttpCaller
@RequestMapping("/user_ext_info/update") @RequestMapping("/user_ext_info/update")
public JsonResult updateMarryStatus( public JsonResult updateMarryStatus(
Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum, Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum,
...@@ -584,7 +584,7 @@ public class InnerController implements IBaseController { ...@@ -584,7 +584,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, UserExtInfoRet.getUserExtInfoRet(info)); return JsonResult.buildSuccessResult(null, UserExtInfoRet.getUserExtInfoRet(info));
} }
@LogHttpCaller
@RequestMapping("/user_detail/search_list") @RequestMapping("/user_detail/search_list")
public JsonResult searchUserDetailList(String name, String phoneNo, String idNo) { public JsonResult searchUserDetailList(String name, String phoneNo, String idNo) {
...@@ -616,7 +616,7 @@ public class InnerController implements IBaseController { ...@@ -616,7 +616,7 @@ public class InnerController implements IBaseController {
return JSON.parseObject(s, JsonResult.class); return JSON.parseObject(s, JsonResult.class);
} }
@LogHttpCaller
@RequestMapping("/user_ext_info/search/user_id") @RequestMapping("/user_ext_info/search/user_id")
public JsonResult searchUserExtInfoByUserId(Long userId) { public JsonResult searchUserExtInfoByUserId(Long userId) {
if (userId == null) { if (userId == null) {
...@@ -629,7 +629,7 @@ public class InnerController implements IBaseController { ...@@ -629,7 +629,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, UserExtInfoRet.getUserExtInfoRet(userExtInfo)); return JsonResult.buildSuccessResult(null, UserExtInfoRet.getUserExtInfoRet(userExtInfo));
} }
@LogHttpCaller
@RequestMapping("/user/query/openId") @RequestMapping("/user/query/openId")
public JsonResult queryOpenIdByUserId(Long userId) { public JsonResult queryOpenIdByUserId(Long userId) {
if (userId == null) { if (userId == null) {
...@@ -655,7 +655,7 @@ public class InnerController implements IBaseController { ...@@ -655,7 +655,7 @@ public class InnerController implements IBaseController {
* 个人信息 * 个人信息
* } * }
*/ */
@LogHttpCaller
@RequestMapping("/user-association/search") @RequestMapping("/user-association/search")
public JsonResult findUserAssociationModel(Long id, String phoneNo, String uuid) { public JsonResult findUserAssociationModel(Long id, String phoneNo, String uuid) {
User user = null; User user = null;
...@@ -739,7 +739,7 @@ public class InnerController implements IBaseController { ...@@ -739,7 +739,7 @@ public class InnerController implements IBaseController {
return bean; return bean;
} }
@LogHttpCaller
@RequestMapping("/user-association/search/userId") @RequestMapping("/user-association/search/userId")
public JsonResult findUserAssociationModelByUserId(Long userId, String phoneNo) { public JsonResult findUserAssociationModelByUserId(Long userId, String phoneNo) {
boolean userIdOk = Objects.nonNull(userId) && userId > 0; boolean userIdOk = Objects.nonNull(userId) && userId > 0;
...@@ -755,7 +755,7 @@ public class InnerController implements IBaseController { ...@@ -755,7 +755,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("", bean); return JsonResult.buildSuccessResult("", bean);
} }
@LogHttpCaller
@RequestMapping("/user-association/search/phone") @RequestMapping("/user-association/search/phone")
public JsonResult findUserAssociationByPhone(String phoneNo) { public JsonResult findUserAssociationByPhone(String phoneNo) {
UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo); UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo);
...@@ -763,7 +763,7 @@ public class InnerController implements IBaseController { ...@@ -763,7 +763,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("", bean); return JsonResult.buildSuccessResult("", bean);
} }
@LogHttpCaller
@RequestMapping("/user-association/search/uid") @RequestMapping("/user-association/search/uid")
public JsonResult findUserAssociationByUid(Long uid) { public JsonResult findUserAssociationByUid(Long uid) {
UserDetail userDetail = userDetailService.findByUserId(uid); UserDetail userDetail = userDetailService.findByUserId(uid);
...@@ -844,7 +844,7 @@ public class InnerController implements IBaseController { ...@@ -844,7 +844,7 @@ public class InnerController implements IBaseController {
return contactRets; return contactRets;
} }
@LogHttpCaller
@RequestMapping("/user/wechat/phone_no") @RequestMapping("/user/wechat/phone_no")
public JsonResult queryOpenIdByPhoneNo(String phoneNo) { public JsonResult queryOpenIdByPhoneNo(String phoneNo) {
if (StringUtils.isBlank(phoneNo)) { if (StringUtils.isBlank(phoneNo)) {
...@@ -891,7 +891,7 @@ public class InnerController implements IBaseController { ...@@ -891,7 +891,7 @@ public class InnerController implements IBaseController {
* @param phoneNo * @param phoneNo
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/flush/cache") @RequestMapping("/flush/cache")
public JsonResult flushCache(String phoneNo) { public JsonResult flushCache(String phoneNo) {
if (!ValidationUtil.validatePhoneNo(phoneNo)) { if (!ValidationUtil.validatePhoneNo(phoneNo)) {
...@@ -907,7 +907,7 @@ public class InnerController implements IBaseController { ...@@ -907,7 +907,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("用户缓存信息已经删除", null); return JsonResult.buildSuccessResult("用户缓存信息已经删除", null);
} }
@LogHttpCaller
@RequestMapping("/user/spouse/save") @RequestMapping("/user/spouse/save")
public JsonResult saveSpouse(Long userId, MaritalStatus status, String spousePhone, String spouseName) { public JsonResult saveSpouse(Long userId, MaritalStatus status, String spousePhone, String spouseName) {
if (userId == null || userId == 0) { if (userId == null || userId == 0) {
...@@ -935,7 +935,7 @@ public class InnerController implements IBaseController { ...@@ -935,7 +935,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse)); return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
} }
@LogHttpCaller
@RequestMapping("/user/spouse/findByUserId") @RequestMapping("/user/spouse/findByUserId")
public JsonResult querySpouse(Long userId) { public JsonResult querySpouse(Long userId) {
if (userId == null || userId == 0) { if (userId == null || userId == 0) {
...@@ -949,7 +949,7 @@ public class InnerController implements IBaseController { ...@@ -949,7 +949,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse)); return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
} }
@LogHttpCaller
@RequestMapping("/user/findByPhones") @RequestMapping("/user/findByPhones")
public JsonResult getUserIdByPhones(@RequestParam("userPhones") String userPhones) { public JsonResult getUserIdByPhones(@RequestParam("userPhones") String userPhones) {
if (StringUtils.isBlank(userPhones)) { if (StringUtils.isBlank(userPhones)) {
...@@ -977,7 +977,7 @@ public class InnerController implements IBaseController { ...@@ -977,7 +977,7 @@ public class InnerController implements IBaseController {
* @param userPhones * @param userPhones
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/uuid/findByPhones") @RequestMapping("/uuid/findByPhones")
public JsonResult getUuidsByPhones(@RequestParam("userPhones") String userPhones) { public JsonResult getUuidsByPhones(@RequestParam("userPhones") String userPhones) {
...@@ -990,7 +990,7 @@ public class InnerController implements IBaseController { ...@@ -990,7 +990,7 @@ public class InnerController implements IBaseController {
* @author v0.2 jinsong.zhu 2018年05月16日14:22:13 * @author v0.2 jinsong.zhu 2018年05月16日14:22:13
* 保存用户信息,其中地址信息和联系人信息为非必要条件;注意:如果同时提供了province和address字段则需要保证Address的完整 * 保存用户信息,其中地址信息和联系人信息为非必要条件;注意:如果同时提供了province和address字段则需要保证Address的完整
*/ */
@LogHttpCaller
@RequestMapping("/user/save_multi") @RequestMapping("/user/save_multi")
public JsonResult saveMulti( public JsonResult saveMulti(
String registeredFrom, String registeredFrom,
...@@ -1079,7 +1079,7 @@ public class InnerController implements IBaseController { ...@@ -1079,7 +1079,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, userRet); return JsonResult.buildSuccessResult(null, userRet);
} }
@LogHttpCaller
@RequestMapping("/user/register") @RequestMapping("/user/register")
public JsonResult register(String phoneNo, String password, Long channelId) { public JsonResult register(String phoneNo, String password, Long channelId) {
if (!ValidationUtil.validatePhoneNo(phoneNo)) { if (!ValidationUtil.validatePhoneNo(phoneNo)) {
...@@ -1097,7 +1097,7 @@ public class InnerController implements IBaseController { ...@@ -1097,7 +1097,7 @@ public class InnerController implements IBaseController {
} }
//根据日期时间段查询新注册用户信息并返回 //根据日期时间段查询新注册用户信息并返回
@LogHttpCaller
@RequestMapping("/contract/queryRegisterUsers") @RequestMapping("/contract/queryRegisterUsers")
public JsonResult findRegisterUserByTime(String beginTime, String endTime) { public JsonResult findRegisterUserByTime(String beginTime, String endTime) {
if (null == beginTime || endTime == null) { if (null == beginTime || endTime == null) {
...@@ -1138,7 +1138,7 @@ public class InnerController implements IBaseController { ...@@ -1138,7 +1138,7 @@ public class InnerController implements IBaseController {
* @param verificationCode 验证码(短信/语音) * @param verificationCode 验证码(短信/语音)
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/verifyPhoneAndCode") @RequestMapping("/verifyPhoneAndCode")
public JsonResult verifyPhoneAndCode( public JsonResult verifyPhoneAndCode(
@RequestParam String phoneNo, @RequestParam String verificationCode, @RequestParam String phoneNo, @RequestParam String verificationCode,
...@@ -1188,7 +1188,7 @@ public class InnerController implements IBaseController { ...@@ -1188,7 +1188,7 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("校验成功", new UserRet(user)); return JsonResult.buildSuccessResult("校验成功", new UserRet(user));
} }
@LogHttpCaller
@RequestMapping("/login") @RequestMapping("/login")
public JsonResult login(@RequestParam String phoneNo, @RequestParam String password) { public JsonResult login(@RequestParam String phoneNo, @RequestParam String password) {
User user = checkPhoneNoAndPassword(phoneNo, password); User user = checkPhoneNoAndPassword(phoneNo, password);
...@@ -1235,7 +1235,7 @@ public class InnerController implements IBaseController { ...@@ -1235,7 +1235,7 @@ public class InnerController implements IBaseController {
* @param phoneNo * @param phoneNo
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/user/enable") @RequestMapping("/user/enable")
public JsonResult isEnable(String phoneNo) { public JsonResult isEnable(String phoneNo) {
boolean flag = false; boolean flag = false;
...@@ -1258,7 +1258,7 @@ public class InnerController implements IBaseController { ...@@ -1258,7 +1258,7 @@ public class InnerController implements IBaseController {
* @param userId * @param userId
* @return * @return
*/ */
@LogHttpCaller
@ApiOperation(notes = "激活/启用 用户 - 供内部系统免密调用", value = "激活/启用 用户", nickname = "activeUser") @ApiOperation(notes = "激活/启用 用户 - 供内部系统免密调用", value = "激活/启用 用户", nickname = "activeUser")
@RequestMapping(path = "/user/active", method = RequestMethod.POST) @RequestMapping(path = "/user/active", method = RequestMethod.POST)
public JsonResult activeUser(Long userId) { public JsonResult activeUser(Long userId) {
...@@ -1274,7 +1274,7 @@ public class InnerController implements IBaseController { ...@@ -1274,7 +1274,7 @@ public class InnerController implements IBaseController {
* @param userId * @param userId
* @return * @return
*/ */
@LogHttpCaller
@ApiOperation(notes = "注销/禁用 用户 - 供内部系统免密调用", value = "注销/禁用 用户", nickname = "forbiddenUser") @ApiOperation(notes = "注销/禁用 用户 - 供内部系统免密调用", value = "注销/禁用 用户", nickname = "forbiddenUser")
@RequestMapping(path = "/user/disable", method = RequestMethod.POST) @RequestMapping(path = "/user/disable", method = RequestMethod.POST)
public JsonResult forbiddenUser(Long userId) { public JsonResult forbiddenUser(Long userId) {
...@@ -1291,7 +1291,7 @@ public class InnerController implements IBaseController { ...@@ -1291,7 +1291,7 @@ public class InnerController implements IBaseController {
* @param idNo - 身份证号 * @param idNo - 身份证号
* @param name - 姓名 * @param name - 姓名
*/ */
@LogHttpCaller
@ApiOperation(notes = "重置用户实名信息接口 - 供内部系统免密调用", value = "重置用户实名信息", nickname = "resetName") @ApiOperation(notes = "重置用户实名信息接口 - 供内部系统免密调用", value = "重置用户实名信息", nickname = "resetName")
@RequestMapping(path = "/userDetail/reset/{userId}", method = RequestMethod.POST) @RequestMapping(path = "/userDetail/reset/{userId}", method = RequestMethod.POST)
public JsonResult resetName(@PathVariable("userId") Long userId, @RequestParam("name") String name, @RequestParam("idNo") String idNo) { public JsonResult resetName(@PathVariable("userId") Long userId, @RequestParam("name") String name, @RequestParam("idNo") String idNo) {
...@@ -1315,7 +1315,7 @@ public class InnerController implements IBaseController { ...@@ -1315,7 +1315,7 @@ public class InnerController implements IBaseController {
* 重置密码接口 * 重置密码接口
* -- 供内部系统免密调用 * -- 供内部系统免密调用
*/ */
@LogHttpCaller
@ApiOperation(notes = "重置密码接口 - 供内部系统免密调用", value = "重置密码", nickname = "resetPassword") @ApiOperation(notes = "重置密码接口 - 供内部系统免密调用", value = "重置密码", nickname = "resetPassword")
@RequestMapping(path = "/user/password/reset", method = RequestMethod.POST) @RequestMapping(path = "/user/password/reset", method = RequestMethod.POST)
public JsonResult resetPassword(@RequestParam("phone") String phone) { public JsonResult resetPassword(@RequestParam("phone") String phone) {
...@@ -1339,7 +1339,7 @@ public class InnerController implements IBaseController { ...@@ -1339,7 +1339,7 @@ public class InnerController implements IBaseController {
* 修改实名信息接口 * 修改实名信息接口
* -- 供内部人员使用(例如绝影) * -- 供内部人员使用(例如绝影)
*/ */
@LogHttpCaller
@RequestMapping("/updateIdCard") @RequestMapping("/updateIdCard")
public JsonResult updateIdCard(@RequestParam(required = false) String name, @RequestParam(required = false) String idNo, public JsonResult updateIdCard(@RequestParam(required = false) String name, @RequestParam(required = false) String idNo,
@RequestParam String phoneNo, @RequestParam String reason, @RequestParam String content) { @RequestParam String phoneNo, @RequestParam String reason, @RequestParam String content) {
...@@ -1370,7 +1370,7 @@ public class InnerController implements IBaseController { ...@@ -1370,7 +1370,7 @@ public class InnerController implements IBaseController {
* 重置密码接口 * 重置密码接口
* -- 供内部人员使用(例如绝影) * -- 供内部人员使用(例如绝影)
*/ */
@LogHttpCaller
@RequestMapping("/user/password/reset/{key}/{phone}") @RequestMapping("/user/password/reset/{key}/{phone}")
public JsonResult resetPasswordByKey(@PathVariable("key") String key, @PathVariable("phone") String phone) { public JsonResult resetPasswordByKey(@PathVariable("key") String key, @PathVariable("phone") String phone) {
log.info("密码重置请求,phone:[{}]", phone); log.info("密码重置请求,phone:[{}]", phone);
...@@ -1391,7 +1391,7 @@ public class InnerController implements IBaseController { ...@@ -1391,7 +1391,7 @@ public class InnerController implements IBaseController {
* @param content * @param content
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/forbiddenUserOrNot") @RequestMapping("/forbiddenUserOrNot")
public JsonResult forbiddenUserOrNot(@RequestParam String phoneNo, @RequestParam Boolean enable, public JsonResult forbiddenUserOrNot(@RequestParam String phoneNo, @RequestParam Boolean enable,
@RequestParam String reason, @RequestParam String content) { @RequestParam String reason, @RequestParam String content) {
...@@ -1425,7 +1425,7 @@ public class InnerController implements IBaseController { ...@@ -1425,7 +1425,7 @@ public class InnerController implements IBaseController {
* @param content * @param content
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/forbiddenUserWeChat") @RequestMapping("/forbiddenUserWeChat")
public JsonResult forbiddenUserWeChat(@RequestParam Long userId, @RequestParam String reason, @RequestParam String content) { public JsonResult forbiddenUserWeChat(@RequestParam Long userId, @RequestParam String reason, @RequestParam String content) {
if (StringUtils.isBlank(reason) || null == userId || userId <= 0) { if (StringUtils.isBlank(reason) || null == userId || userId <= 0) {
......
...@@ -83,7 +83,7 @@ public class UserApiController { ...@@ -83,7 +83,7 @@ public class UserApiController {
* @return * @return
*/ */
@ApiOperation(notes = "检查token是否有效,如果有效,可选择是否延续生命期(延续后有效期24Hour)", value = "Check token and then prolong session", nickname = "checkToken") @ApiOperation(notes = "检查token是否有效,如果有效,可选择是否延续生命期(延续后有效期24Hour)", value = "Check token and then prolong session", nickname = "checkToken")
@LogHttpCaller
@IpValidator @IpValidator
@RequestMapping(value = "/valid/{token}", method = RequestMethod.POST) @RequestMapping(value = "/valid/{token}", method = RequestMethod.POST)
public JsonResult checkToken(@ApiParam(value = "sid,session的id", required = true) @PathVariable("token") String token, public JsonResult checkToken(@ApiParam(value = "sid,session的id", required = true) @PathVariable("token") String token,
......
...@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
public class AuthInfoController implements IBaseController { public class AuthInfoController implements IBaseController {
@LogHttpCaller
@RequestMapping("/info/login") @RequestMapping("/info/login")
public JsonResult loginInfo(HttpServletRequest request) { public JsonResult loginInfo(HttpServletRequest request) {
SessionStruct sessionStruct = getCurrentSessionFromRedis(); SessionStruct sessionStruct = getCurrentSessionFromRedis();
......
...@@ -24,7 +24,7 @@ public class UserAuthorizedController { ...@@ -24,7 +24,7 @@ public class UserAuthorizedController {
@Resource @Resource
private IUserAuthorizedService userAuthorizedService; private IUserAuthorizedService userAuthorizedService;
@LogHttpCaller
@RequestMapping(value = "/hasUserAuthorized") @RequestMapping(value = "/hasUserAuthorized")
public JsonResult hasUserAuthorized(String idNo) { public JsonResult hasUserAuthorized(String idNo) {
LOGGER.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}", idNo); LOGGER.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}", idNo);
...@@ -35,7 +35,7 @@ public class UserAuthorizedController { ...@@ -35,7 +35,7 @@ public class UserAuthorizedController {
} }
} }
@LogHttpCaller
@RequestMapping(value = "/createUserAuthorized") @RequestMapping(value = "/createUserAuthorized")
public JsonResult createUserAuthorized(UserAuthorizedParam userAuthorizedParam) { public JsonResult createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
LOGGER.info("[createUserAuthorized]创建实名账户,userAuthorizedParam:{},", userAuthorizedParam); LOGGER.info("[createUserAuthorized]创建实名账户,userAuthorizedParam:{},", userAuthorizedParam);
...@@ -55,7 +55,7 @@ public class UserAuthorizedController { ...@@ -55,7 +55,7 @@ public class UserAuthorizedController {
} }
} }
@LogHttpCaller
@RequestMapping(value = "/getUserAuthorizedId") @RequestMapping(value = "/getUserAuthorizedId")
public JsonResult getUserAuthorizedId(String userUuid) { public JsonResult getUserAuthorizedId(String userUuid) {
LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userUuid:{}", userUuid); LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userUuid:{}", userUuid);
......
...@@ -113,7 +113,7 @@ public class UserController implements IBaseController { ...@@ -113,7 +113,7 @@ public class UserController implements IBaseController {
return login(channelId, appChannel, createdFrom, userId, key, dimension, request); return login(channelId, appChannel, createdFrom, userId, key, dimension, request);
} }
@LogHttpCaller
@PasswordErrorFiniteValidator @PasswordErrorFiniteValidator
@RequestMapping("/login") @RequestMapping("/login")
public JsonResult login( public JsonResult login(
...@@ -328,7 +328,7 @@ public class UserController implements IBaseController { ...@@ -328,7 +328,7 @@ public class UserController implements IBaseController {
* @param verificationCode * @param verificationCode
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/reset_password") @RequestMapping("/reset_password")
public JsonResult resetPassword(@RequestParam String phoneNo, public JsonResult resetPassword(@RequestParam String phoneNo,
@RequestParam String password, @RequestParam String password,
...@@ -364,7 +364,7 @@ public class UserController implements IBaseController { ...@@ -364,7 +364,7 @@ public class UserController implements IBaseController {
* @param token - sid,session的id * @param token - sid,session的id
* @return * @return
*/ */
@LogHttpCaller
@RequestMapping("/exists_token") @RequestMapping("/exists_token")
public JsonResult checkToken(@RequestParam String token) { public JsonResult checkToken(@RequestParam String token) {
if (StringUtils.isEmpty(token)) { if (StringUtils.isEmpty(token)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment