Merge remote-tracking branch 'origin/feature-migration-20230628' into feature-migration-20230628

src/main/java/cn/quantgroup/xyqb/aspect/logcaller/LogCallHttpAspect.java

@@ -3,6 +3,10 @@ package cn.quantgroup.xyqb.aspect.logcaller;
 import cn.quantgroup.xyqb.util.IpUtil;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Stopwatch;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -51,8 +55,10 @@ public class LogCallHttpAspect {
 			long elapsed = stopwatch.stop().elapsed(TimeUnit.MILLISECONDS);
 			String resultStr = result == null ? "" : JSON.toJSONString(result);
 			resultStr = resultStr.length() < 500 ? resultStr : resultStr.substring(0, 500);
-			log.info("[httpRequestLog],url:[{}],duration:[{}],[耗时区间]{},remoteIP:[{}],exception:[{}],result:[{}]",
-					request.getRequestURL(), elapsed, slowlyTag(elapsed), remoteIP, hasException, resultStr);
+			List<Object> argList = Arrays.stream(args).filter(arg -> arg instanceof Serializable)
+					.collect(Collectors.toList());
+			log.info("[httpRequestLog],url:[{}],duration:[{}],[耗时区间]{},remoteIP:[{}],args:[{}],exception:[{}],result:[{}]",
+					request.getRequestURL(), elapsed, slowlyTag(elapsed), remoteIP, JSON.toJSONString(argList), hasException, resultStr);
 		}
 		return result;
 	}

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

@@ -125,6 +125,9 @@ public class InnerController implements IBaseController {
      */
     @RequestMapping("/user/search/phoneNo")
     public JsonResult findByPhoneNo(String phoneNo, Integer tenantId) {
+        if (tenantId == null) {
+            tenantId = getTenantId();
+        }
         User user = userService.findByPhoneInDb(phoneNo,tenantId);
         if (user == null) {
             return JsonResult.buildErrorStateResult("查无此人", null, 4L);
@@ -347,6 +350,9 @@ public class InnerController implements IBaseController {
      */
     @RequestMapping("/user/search/userId")
     public JsonResult findUserByUserId(Long userId, Integer tenantId) {
+        if (tenantId == null) {
+            tenantId = getTenantId();
+        }
         User user = userService.findById(userId,tenantId);
         if (user != null) {
             return JsonResult.buildSuccessResult(null, new UserRet(user));
@@ -361,6 +367,9 @@ public class InnerController implements IBaseController {
     @AccessForbiddenValidator
     @RequestMapping("/user_detail/search/phone")
     public JsonResult findUserDetailByPhone(String phoneNo, Integer tenantId) {
+        if (tenantId == null) {
+            tenantId = getTenantId();
+        }
         UserInfoEntity userDetail = userInfoRepository.findByPhoneNoAndTenantId(phoneNo,tenantId);
         if (userDetail != null) {
             return JsonResult.buildSuccessResult(null, UserInfoRet.getUserDetail(userDetail));

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

@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator;
 import cn.quantgroup.xyqb.aspect.limit.PasswordFreeAccessValidator;
 import cn.quantgroup.xyqb.constant.UserConstant;
+import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserInfoEntity;
 import cn.quantgroup.xyqb.model.JsonResult;
@@ -27,7 +28,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/user/center")
-public class UserCenterController {
+public class UserCenterController implements IBaseController {
 
     @Autowired
     private IUserInfoRepository userInfoRepository;
@@ -55,6 +56,9 @@ public class UserCenterController {
     @PostMapping("/attach/list")
     public JsonResult queryUserAttachList(@RequestBody List<Long> userIds, @RequestParam(required = false) Integer tenantId) {
         //默认羊小咩租户
+        if (tenantId == null) {
+            tenantId = getTenantId();
+        }
         if (CollectionUtils.isEmpty(userIds)) {
             return JsonResult.buildErrorStateResult("用户 ID 不能为空", null);
         }