diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java index 95d107d..52bca8a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java @@ -46,4 +46,6 @@ public @interface Log { boolean isSaveDb() default true; + boolean isPrintResponseData() default true; + } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 053bfcb..8fa200f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -90,6 +90,7 @@ public class LogAspect { operLog.setOperName(loginUser.getUsername()); operLog.setUserType(loginUser.getUserType()); operLog.setDeptName(loginUser.getDeptName()); + logString.append(String.format("currentUserId=%s;", loginUser.getUserId())); } }catch (Exception ex){ // not do @@ -132,10 +133,12 @@ public class LogAspect { // 获取参数的信息,传入到数据库中。 setRequestValue(joinPoint, operLog, log.excludeParamNames(),logString); } + String jsonResultString = JsonUtils.toJsonString(jsonResult); // 是否需要保存response,参数和值 if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) { - String jsonResultString = JsonUtils.toJsonString(jsonResult); operLog.setJsonResult(StringUtils.substring(jsonResultString, 0, 2000)); + } + if(log.isPrintResponseData()){ logString.append(String.format("result=%s;",jsonResultString)); } } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java index 5f280bd..cf39b6b 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java @@ -54,7 +54,7 @@ public class AccountAppController { @GetMapping("/detail/page") @Operation(summary = "查询账户明细") - @Log(title = "查询账户明细", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "查询账户明细", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R> detail(PageQuery pageQuery){ Page page = accountChangeLogService.pageApp(pageQuery,LoginHelper.getUserId()); return R.ok(PageModel.build(page)); @@ -72,7 +72,7 @@ public class AccountAppController { @PostMapping("/wxTrans/order/create") @Operation(summary = "生成微信交换订单") - @Log(title = "生成微信交换订单", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "生成微信交换订单", businessType = BusinessType.OTHER, isSaveDb = true) public R createWxTransOrder(@RequestBody GenWxTransOrderReq req){ Long userId = LoginHelper.getUserId(); WxTransOrder vipOrder = wxTransOrderService.createWxTransOrder(userId, req.getWxTransNum()); @@ -85,7 +85,7 @@ public class AccountAppController { @PostMapping("/wxTrans/apply") @Operation(summary = "处理交换微信") - @Log(title = "处理交换微信", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "处理交换微信", businessType = BusinessType.OTHER, isSaveDb = true) public R applyWxTrans(@RequestBody WxTransDataApplyReq req){ req.setUserId(LoginHelper.getUserId()); wxTransDataService.apply(req); @@ -94,7 +94,7 @@ public class AccountAppController { @PostMapping("/wxTrans/star") @Operation(summary = "发起交换微信") - @Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = true) public R starWxTrans(@RequestBody StarWxTransReq starWxTransReq){ starWxTransReq.setSponsorUserId(LoginHelper.getUserId()); wxTransDataService.start(starWxTransReq); @@ -104,7 +104,7 @@ public class AccountAppController { @GetMapping("/wxTrans/data/page") @Operation(summary = "查询交换微信数据") - @Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "发起交换微信", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R> wxTransDataPage(PageQuery pageQuery, WxTransDataQuery wxTransDataQuery){ wxTransDataQuery.setUserId(LoginHelper.getUserId()); Page page = wxTransDataService.pageApp(pageQuery, wxTransDataQuery); @@ -113,7 +113,7 @@ public class AccountAppController { @GetMapping("/wxTrans/log/page") @Operation(summary = "查询交换微信账户明细") - @Log(title = "查询交换微信账户明细", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "查询交换微信账户明细", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> wxTransLogPage(PageQuery pageQuery, WxTransLogQuery query){ query.setUserId(LoginHelper.getUserId()); Page page = wxTransLogService.pageApp(pageQuery, query); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java index 1f62f03..7931b17 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java @@ -44,7 +44,7 @@ public class AuthAppController { @PostMapping("/sms/code") @Operation(summary = "获取验证码") @SaIgnore - @Log(title = "获取验证码", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取验证码", businessType = BusinessType.OTHER, isSaveDb = true) public R> registerCode(@Validated @RequestBody SmsCodeReq code){ boolean mobile = PhoneUtil.isMobile(code.getMobile()); if(!mobile){ @@ -56,7 +56,7 @@ public class AuthAppController { @PostMapping("/login") @Operation(summary = "登陆(选择手机号登陆,会自动注册)") - @Log(title = "登陆", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "登陆", businessType = BusinessType.OTHER, isSaveDb = true) public R login(@Validated @RequestBody LoginUser loginBody){ LoginVo vo = new LoginVo(); String token; @@ -74,7 +74,7 @@ public class AuthAppController { @PostMapping("/loginOut") @Operation(summary = "登出") - @Log(title = "登出", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "登出", businessType = BusinessType.OTHER, isSaveDb = true) public R loginOut(){ loginManager.logout(); return R.ok(); @@ -83,7 +83,7 @@ public class AuthAppController { @PostMapping("/resetPassword/code") @Operation(summary = "获取重置密码验证码") - @Log(title = "获取重置密码验证码", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取重置密码验证码", businessType = BusinessType.OTHER, isSaveDb = true) public R> resetPasswordCode(@Validated @RequestBody RegisterCode code){ boolean mobile = PhoneUtil.isMobile(code.getMobile()); if(!mobile){ @@ -96,7 +96,7 @@ public class AuthAppController { @PostMapping("/resetPassword/checkCode") @Operation(summary = "重置密码-验证码校验") - @Log(title = "重置密码-验证码校验", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "重置密码-验证码校验", businessType = BusinessType.OTHER, isSaveDb = true) public R> resetPasswordCheck(@RequestBody RegisterCodeCheck code){ String token = loginManager.resetPasswordCheck(code.getMobile(), code.getCode()); Map map = new HashMap<>(); @@ -106,7 +106,7 @@ public class AuthAppController { @PostMapping("/resetPassword") @Operation(summary = "重置密码") - @Log(title = "重置密码", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "重置密码", businessType = BusinessType.OTHER, isSaveDb = true) public R resetPassword(@RequestBody ResetPasswordReq code){ loginManager.resetPassword(code.getMobile(),code.getPassword(),code.getToken()); return R.ok(); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthOrderAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthOrderAppController.java index 03dc34e..853cf4b 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthOrderAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthOrderAppController.java @@ -24,7 +24,7 @@ public class AuthOrderAppController { @PostMapping("/order/create") @Operation(summary = "生成VIP订单") - @Log(title = "生成VIP订单", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "生成VIP订单", businessType = BusinessType.OTHER, isSaveDb = true) public R createAuthOrder(){ Long userId = LoginHelper.getUserId(); AuthOrder authOrder = authOrderService.createVipOrder(userId); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/DynamicAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/DynamicAppController.java index 77f7517..9b1aab1 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/DynamicAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/DynamicAppController.java @@ -27,7 +27,7 @@ public class DynamicAppController { @PostMapping("/add") @Operation(summary = "新增动态") - @Log(title = "新增动态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "新增动态", businessType = BusinessType.OTHER, isSaveDb = true) public R addDynamic(@RequestBody AddDynamicReq req){ req.setUserId(LoginHelper.getUserId()); dynamicService.push(req); @@ -36,7 +36,7 @@ public class DynamicAppController { @PostMapping("/star") @Operation(summary = "点赞动态") - @Log(title = "点赞动态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "点赞动态", businessType = BusinessType.OTHER, isSaveDb = true) public R starDynamic(@RequestBody DynamicStarReq req){ Long userId = LoginHelper.getUserId(); if(req.getStar() == null){ @@ -55,7 +55,7 @@ public class DynamicAppController { @GetMapping("/page") @Operation(summary = "动态列表-分页") - @Log(title = "动态列表-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "动态列表-分页", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R> page(PageQuery pageQuery, DynamicQuery dynamicQuery){ dynamicQuery.initBirthdayByAge(); Page page = dynamicService.pageApp(pageQuery, dynamicQuery); @@ -64,7 +64,7 @@ public class DynamicAppController { @PostMapping("/delete") @Operation(summary = "删除我的动态") - @Log(title = "删除我的动态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "删除我的动态", businessType = BusinessType.OTHER, isSaveDb = true) public R delete(@RequestBody IdReq idReq){ dynamicService.removeDynamicOfApp(idReq.getId()); return R.ok(); @@ -72,7 +72,7 @@ public class DynamicAppController { @GetMapping("/current/page") @Operation(summary = "我发布的动态列表-分页") - @Log(title = "我发布的动态列表-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "我发布的动态列表-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> currentPage(PageQuery pageQuery){ Page page = dynamicService.currentPage(pageQuery); return R.ok(PageModel.build(page)); @@ -80,7 +80,7 @@ public class DynamicAppController { @GetMapping("/myStarDynamic") @Operation(summary = "我收到的动态点赞-分页") - @Log(title = "我收到的动态点赞-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "我收到的动态点赞-分页", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R> myStarDynamic(PageQuery pageQuery, MyStarDynamicQuery dynamicQuery){ Page page = dynamicStarService.myStarDynamic(pageQuery, dynamicQuery); return R.ok(PageModel.build(page)); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java index 76c3db7..11eaf11 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/HomeAppController.java @@ -33,7 +33,7 @@ public class HomeAppController { @PostMapping("/user/page") @Operation(summary = "首页查询用户-分页") - @Log(title = "首页查询用户-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "首页查询用户-分页", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R> userPage(@RequestBody HomePageReq homePageReq){ homePageReq.initBirthdayByAge(); Page vo = userService.homePage(homePageReq); @@ -42,7 +42,7 @@ public class HomeAppController { @GetMapping("/vip/page") @Operation(summary = "首页查询VIP推荐用户-分页") - @Log(title = "首页查询VIP推荐用户-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "首页查询VIP推荐用户-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> vipPage(){ List vo = userService.vipHomePage(); return R.ok(vo); @@ -51,7 +51,7 @@ public class HomeAppController { @GetMapping("/user/info") @Operation(summary = "查询用户主页信息") - @Log(title = "查询用户主页信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "查询用户主页信息", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R userInfo(Long userId){ HomeUserVo vo = userService.homeUser(userId); return R.ok(vo); @@ -59,7 +59,6 @@ public class HomeAppController { @GetMapping("/banner") @Operation(summary = "轮播图") - @Log(title = "轮播图", businessType = BusinessType.OTHER, isSaveDb = false) public R> banner(){ List list = bannerService.list(Wrappers.lambdaQuery(Banner.class) .eq(Banner::getEnableStatus, 1) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/ImAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/ImAppController.java index f753ece..5bd332e 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/ImAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/ImAppController.java @@ -28,7 +28,7 @@ public class ImAppController { @PostMapping("/send/message") @Operation(summary = "发送消息") - @Log(title = "发送消息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "发送消息", businessType = BusinessType.OTHER, isSaveDb = true) public R sendMessage(@Validated @RequestBody ImMessageDTO imMessageDTO){ imMessageDTO.setFromUserId(LoginHelper.getUserId()); ImResp resp = imManager.sendMessage(imMessageDTO); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/InviteAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/InviteAppController.java index 1663ab1..dc44896 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/InviteAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/InviteAppController.java @@ -31,7 +31,7 @@ public class InviteAppController { @GetMapping("/logs") @Operation(summary = "邀请人员记录") - @Log(title = "邀请人员记录", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "邀请人员记录", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R> inviteLogs(PageQuery pageQuery){ IPage res = userInviteService.pageApp(pageQuery, LoginHelper.getUserId()); return R.ok(PageModel.build(res)); @@ -39,7 +39,7 @@ public class InviteAppController { @GetMapping("/share") @Operation(summary = "获取分享图片") - @Log(title = "获取分享图片", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取分享图片", businessType = BusinessType.OTHER, isSaveDb = true) public R> share(){ String url = userInviteService.share(LoginHelper.getUserId()); Map map = new HashMap<>(); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/OtherController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/OtherController.java index 14432e3..fd4ae57 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/OtherController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/OtherController.java @@ -35,7 +35,7 @@ public class OtherController { @PostMapping("/feedback") @Operation(summary = "留言反馈") - @Log(title = "留言反馈", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "留言反馈", businessType = BusinessType.OTHER, isSaveDb = true) public R feedback(@RequestBody FeedbackReq req){ req.setUserId(LoginHelper.getUserId()); feedbackService.feedback(req); @@ -44,7 +44,7 @@ public class OtherController { @PostMapping("/pairSuccess") @Operation(summary = "成功案例") - @Log(title = "成功案例", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "成功案例", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R> pairSuccess(){ List list = pairSuccessService.list(Wrappers.lambdaQuery(PairSuccess.class) .eq(PairSuccess::getEnableStatus, 1) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/ReportAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/ReportAppController.java index 9458568..be3951f 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/ReportAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/ReportAppController.java @@ -27,7 +27,6 @@ public class ReportAppController { @GetMapping("/cate/list") @Operation(summary = "获取举报类型") - @Log(title = "获取举报类型", businessType = BusinessType.OTHER, isSaveDb = false) public R> cateList() { List list = reportCateService.list(); return R.ok(list); @@ -35,7 +34,7 @@ public class ReportAppController { @PostMapping("/push") @Operation(summary = "举报") - @Log(title = "举报", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "举报", businessType = BusinessType.OTHER, isSaveDb = true) public R push(@RequestBody ReportPushReq reportPushReq) { reportService.push(reportPushReq); return R.ok(); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java index eb3958f..1214f44 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java @@ -43,7 +43,6 @@ public class SettingAppController { @GetMapping("/agreement/user") @Operation(summary = "获取用户协议") - @Log(title = "获取用户协议", businessType = BusinessType.OTHER, isSaveDb = false) public R userAgreement() { String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement(); return R.ok(new AgreementDTO(userAgreement)); @@ -51,26 +50,16 @@ public class SettingAppController { @GetMapping("/agreement/privacy") @Operation(summary = "获取隐私协议") - @Log(title = "获取隐私协议", businessType = BusinessType.OTHER, isSaveDb = false) public R privacyAgreement() { String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement(); return R.ok(new AgreementDTO(privacyAgreement)); } - @GetMapping("/agreement/anchorJoin") - @Operation(summary = "用户主播入驻协议") - @Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false) - public R anchorJoinAgreement() { - String anchorJoinAgreement = agreementSettingService.getAgreementSetting().getAnchorJoinAgreement(); - return R.ok(new AgreementDTO(anchorJoinAgreement)); - } - @Resource private AreaCodeMapper areaCodeMapper; @GetMapping("/areaCode/homeCity") @Operation(summary = "获取首页城市选择列表") - @Log(title = "获取首页城市选择列表", businessType = BusinessType.OTHER, isSaveDb = false) public R> homeCity(){ List vos = areaCodeMapper.homeCity(); return R.ok(vos); @@ -79,7 +68,6 @@ public class SettingAppController { @GetMapping("/areaCode/list") @Operation(summary = "获取省市区编码接口") - @Log(title = "获取省市区编码接口", businessType = BusinessType.OTHER, isSaveDb = false) public R> listAreaCode(AreaCodeQuery query){ List list = areaCodeService.listAreaCode(query); return R.ok(list); @@ -87,7 +75,6 @@ public class SettingAppController { @GetMapping("/areaCode/tree") @Operation(summary = "获取所有省市区编码") - @Log(title = "获取所有省市区编码", businessType = BusinessType.OTHER, isSaveDb = false) public R> areaCodeTree(){ List node = areaCodeService.tree(); return R.ok(node); @@ -95,7 +82,6 @@ public class SettingAppController { @GetMapping("/customerService/pic") @Operation(summary = "获取客服二维码") - @Log(title = "获取客服二维码", businessType = BusinessType.OTHER, isSaveDb = false) @SaIgnore public R> customerService(){ String url = systemConfigManager.getSystemConfig(SystemConfigEnum.CUSTOMER_SERVICE_URL); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java index c06d059..fa6d902 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java @@ -30,7 +30,7 @@ public class UserAppController { @GetMapping("/user/query/homeInfo") @Operation(summary = "当前用户信息") - @Log(title = "当前用户信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "当前用户信息", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R homeInfo(){ CurrentUserInfoVo vo = currentUserManager.currentBaseInfo(); return R.ok(vo); @@ -39,7 +39,7 @@ public class UserAppController { @GetMapping("/user/query/fullInfo") @Operation(summary = "当前用户的详细信息") - @Log(title = "当前用户的详细信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "当前用户的详细信息", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R fullInfo(){ CurrentUserFullInfoVo vo = currentUserManager.currentFullInfo(); return R.ok(vo); @@ -47,7 +47,7 @@ public class UserAppController { @GetMapping("/user/query/authInfo") @Operation(summary = "当前用户的认证信息") - @Log(title = "当前用户的认证信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "当前用户的认证信息", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R authInfo(){ UserAuthInfoVo vo = currentUserManager.currentAuthInfo(); return R.ok(vo); @@ -55,7 +55,7 @@ public class UserAppController { @PostMapping("/user/update/base") @Operation(summary = "更新用户基本信息") - @Log(title = "更新用户基本信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "更新用户基本信息", businessType = BusinessType.OTHER, isSaveDb = true) public R updateBaseInfo(@RequestBody UpdateBaseInfoReq req){ currentUserManager.updateBaseInfo(req); return R.ok(); @@ -63,7 +63,7 @@ public class UserAppController { @PostMapping("/user/update/auth") @Operation(summary = "更新用户认证信息") - @Log(title = "更新用户认证信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "更新用户认证信息", businessType = BusinessType.OTHER, isSaveDb = true) public R updateAuth(@RequestBody UpdateUserAuthInfoReq req){ currentUserManager.updateInfoAuth(req); return R.ok(); @@ -71,7 +71,7 @@ public class UserAppController { @PostMapping("/user/update/info") @Operation(summary = "更新用户信息") - @Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = true) public R updateInfo(@RequestBody UpdateUserFullInfoReq req){ currentUserManager.updateInfo(req); return R.ok(); @@ -79,7 +79,7 @@ public class UserAppController { @PostMapping("/user/update/avatar") @Operation(summary = "更新用户头像信息") - @Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = true) public R updateAvatarInfo(@RequestBody UpdateAvatarReq req){ currentUserManager.updateAvatar(req.getAvatar()); return R.ok(); @@ -87,7 +87,7 @@ public class UserAppController { @PostMapping("/user/update/remark") @Operation(summary = "更新用户备注信息") - @Log(title = "更新用户备注信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "更新用户备注信息", businessType = BusinessType.OTHER, isSaveDb = true) public R updateRemarkInfo(@RequestBody UpdateRemarkReq req){ currentUserManager.updateRemark(req.getRemark()); return R.ok(); @@ -95,7 +95,7 @@ public class UserAppController { @PostMapping("/user/add/picture") @Operation(summary = "新增用户照片") - @Log(title = "新增用户照片", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "新增用户照片", businessType = BusinessType.OTHER, isSaveDb = true) public R addUserPicture(@RequestBody AddPicturesReq req){ currentUserManager.addUserPicture(req); return R.ok(); @@ -103,7 +103,7 @@ public class UserAppController { @PostMapping("/user/remove/picture") @Operation(summary = "批量删除用户照片") - @Log(title = "批量删除用户照片", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "批量删除用户照片", businessType = BusinessType.OTHER, isSaveDb = true) public R removeUserPicture(@RequestBody IdsReq req){ List ids = Arrays.stream(req.getIds().split(",")) .map(Long::valueOf) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStarAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStarAppController.java index 93acd52..62eccf4 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStarAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStarAppController.java @@ -26,7 +26,7 @@ public class UserStarAppController { @PostMapping("/update") @Operation(summary = "用户关注和取消关注") - @Log(title = "用户关注和取消关注", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "用户关注和取消关注", businessType = BusinessType.OTHER, isSaveDb = true) public R starUpdate(@RequestBody UserStarReq req){ req.setUserId(LoginHelper.getUserId()); userStarService.starUpdate(req); @@ -35,7 +35,7 @@ public class UserStarAppController { @GetMapping("/page") @Operation(summary = "关注查询-分页") - @Log(title = "关注查询-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "关注查询-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> page(PageQuery pageQuery, UserStarQuery query){ query.setUserId(LoginHelper.getUserId()); Page app = userStarService.pageApp(pageQuery, query); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStatusAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStatusAppController.java index 6abc59f..c7bb8d7 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStatusAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserStatusAppController.java @@ -24,7 +24,7 @@ public class UserStatusAppController { @GetMapping("/info") @Operation(summary = "获取当前用户状态") - @Log(title = "获取当前用户状态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取当前用户状态", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R info(){ UserStatus userStatus = userStatusService.getByUserId(LoginHelper.getUserId()); UserStatusInfoAppVo vo = BeanConvertUtil.convertTo(userStatus, UserStatusInfoAppVo::new); @@ -33,7 +33,7 @@ public class UserStatusAppController { @PostMapping("/updateMaster") @Operation(summary = "修改当前用户主状态") - @Log(title = "修改当前用户主状态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "修改当前用户主状态", businessType = BusinessType.OTHER, isSaveDb = true) public R updateMaster(@RequestBody UserStatusUpdateMasterAppReq req){ req.setUserId(LoginHelper.getUserId()); userStatusService.updateStatusMaster(req); @@ -42,7 +42,7 @@ public class UserStatusAppController { @PostMapping("/update") @Operation(summary = "修改当前用户状态") - @Log(title = "修改当前用户状态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "修改当前用户状态", businessType = BusinessType.OTHER, isSaveDb = true) public R update(@RequestBody UserStatusUpdateAppReq req){ req.setUserId(LoginHelper.getUserId()); userStatusService.updateStatus(req); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserVisitorAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserVisitorAppController.java index 38532a9..11fb8ee 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserVisitorAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserVisitorAppController.java @@ -26,7 +26,6 @@ public class UserVisitorAppController { @PostMapping("/visitor") @Operation(summary = "访问用户") - @Log(title = "访问用户", businessType = BusinessType.OTHER, isSaveDb = false) public R starUpdate(@RequestBody IdReq req){ userVisitorService.visitor(LoginHelper.getUserId(),req.getId()); return R.ok(); @@ -34,7 +33,7 @@ public class UserVisitorAppController { @GetMapping("/me/page") @Operation(summary = "查询谁看过我-分页") - @Log(title = "查询谁看过我-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "查询谁看过我-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> page(PageQuery pageQuery, UserVisitorQuery query){ query.setUserId(LoginHelper.getUserId()); Page app = userVisitorService.pageApp(pageQuery, query); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/VipAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/VipAppController.java index 98c80ba..7198454 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/VipAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/VipAppController.java @@ -39,7 +39,7 @@ public class VipAppController { @GetMapping("/home") @Operation(summary = "获取VIP信息") - @Log(title = "获取VIP信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取VIP信息", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R vipHome(Integer vipType){ Long userId = LoginHelper.getUserId(); List vipPrices = vipPriceService.listByVipType(vipType); @@ -78,7 +78,7 @@ public class VipAppController { } @PostMapping("/order/create") @Operation(summary = "生成VIP订单") - @Log(title = "生成VIP订单", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "生成VIP订单", businessType = BusinessType.OTHER, isSaveDb = true) public R createVipOrder(@RequestBody GenVipOrderReq req){ Long userId = LoginHelper.getUserId(); VipOrder vipOrder = vipOrderService.createVipOrder(userId, req.getVipPriceSettingId()); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java index bc7bec5..ea10e5d 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java @@ -47,7 +47,7 @@ public class WithdrawAppController { @GetMapping("/setting") @Operation(summary = "获取提现配置") - @Log(title = "获取提现配置", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取提现配置", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R vipHome(){ WithdrawHomeSettingVo vo = new WithdrawHomeSettingVo(); List list = withdrawSettingService.list(Wrappers.lambdaQuery(WithdrawSetting.class) @@ -64,7 +64,7 @@ public class WithdrawAppController { @PostMapping("/ali/card") @Operation(summary = "修改支付宝信息") - @Log(title = "修改支付宝信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "修改支付宝信息", businessType = BusinessType.OTHER, isSaveDb = true) public R updateAliCard(@RequestBody UpdateAliReq req){ req.setUserId(LoginHelper.getUserId()); userBankCardService.updateAli(req); @@ -73,7 +73,7 @@ public class WithdrawAppController { @PostMapping("/card/info") @Operation(summary = "查询账户信息") - @Log(title = "查询账户信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "查询账户信息", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R cardInfo(){ UserBankCard userBankCard = userBankCardService.getByUserId(LoginHelper.getUserId()); if(userBankCard == null){ @@ -84,7 +84,7 @@ public class WithdrawAppController { @PostMapping("/save") @Operation(summary = "申请提现") - @Log(title = "申请提现", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "申请提现", businessType = BusinessType.OTHER, isSaveDb = true) public R save(@RequestBody WithdrawReq req){ req.setUserId(LoginHelper.getUserId()); userWithdrawService.saveWithdraw(req); @@ -93,7 +93,7 @@ public class WithdrawAppController { @GetMapping("/logs/page") @Operation(summary = "提现记录") - @Log(title = "申请记录", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "申请记录", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R> logsPage(PageQuery pageQuery, WithdrawListPageQuery query){ query.setUserId(LoginHelper.getUserId()); Page result = userWithdrawService.pageApp(pageQuery,query); diff --git a/ruoyi-xq/src/main/resources/mapper/xq/ReportMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/ReportMapper.xml index 595e35f..212ff98 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/ReportMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/ReportMapper.xml @@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t3.mobile = #{bo.reportMobile} + + and t1.report_status = #{bo.reportStatus} +