From 05c9cacf70265f1f367bd2714bedff402b7ead80 Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Sun, 14 Apr 2024 22:46:01 +0800 Subject: [PATCH] 123 --- .../controller/cai/admin/DynamicController.java | 2 +- .../cai/admin/UserAlbumController.java | 11 +++++++++++ .../cai/admin/UserPictureAuditController.java | 10 ++++++++++ .../cai/app/AdolescentAppController.java | 2 +- .../web/controller/cai/app/IndexController.java | 16 ++++++++-------- .../controller/cai/app/InviteAppController.java | 4 ++-- .../web/controller/cai/app/OtherController.java | 6 +++--- .../controller/cai/app/RankAppController.java | 5 +++-- .../web/controller/cai/app/RoomController.java | 2 +- .../controller/cai/app/SettingAppController.java | 16 ++++++++-------- .../controller/cai/app/UserAppController.java | 6 +++--- .../cai/app/UserBlackAppController.java | 2 +- .../cai/app/UserDynamicAppController.java | 2 +- .../cai/app/UserGreetAppController.java | 2 +- .../cai/app/UserStartAppController.java | 2 +- .../cai/app/UserVisitorAppController.java | 4 ++-- .../web/controller/cai/app/WalletController.java | 8 ++++---- .../controller/cai/app/YxNotifyController.java | 4 ++-- .../ruoyi/cai/manager/CurrentUserManager.java | 8 ++++++++ .../com/ruoyi/cai/service/UserAlbumService.java | 2 ++ .../cai/service/UserPictureAuditService.java | 4 ++++ .../cai/service/impl/UserAlbumServiceImpl.java | 9 +++++++++ .../impl/UserPictureAuditServiceImpl.java | 9 +++++++++ .../java/com/ruoyi/common/annotation/Log.java | 1 + .../com/ruoyi/framework/aspectj/LogAspect.java | 4 +++- 25 files changed, 99 insertions(+), 42 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java index 20bb30a3..4f633133 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java @@ -97,7 +97,7 @@ public class DynamicController extends BaseController { @RepeatSubmit() @PostMapping("/batch/audit") @Log(title = "批量审核通过动态", businessType = BusinessType.UPDATE) - public R edit(@RequestBody BatchAuditReq bo) { + public R batchAudit(@RequestBody BatchAuditReq bo) { boolean success = dynamicService.auditSuccess(bo.getIds()); return R.ok(success); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java index e5d59bba..c8691d9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.UserAlbum; +import com.ruoyi.cai.dto.admin.query.BatchAuditReq; import com.ruoyi.cai.dto.admin.vo.UserAlbumAdminVo; import com.ruoyi.cai.service.UserAlbumService; import com.ruoyi.common.annotation.Log; @@ -80,6 +81,16 @@ public class UserAlbumController extends BaseController { return R.ok(); } + @SaCheckPermission("cai:userAlbum:edit") + @RepeatSubmit() + @PostMapping("/batch/audit") + @Log(title = "主播相册批量审核通过", businessType = BusinessType.UPDATE) + public R batchAudit(@RequestBody BatchAuditReq bo) { + boolean success = userAlbumService.batchAuditSuccess(bo.getIds()); + return R.ok(success); + } + + /** * 删除主播集锦 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserPictureAuditController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserPictureAuditController.java index cb97e13b..7dc08cca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserPictureAuditController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserPictureAuditController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.UserPictureAudit; +import com.ruoyi.cai.dto.admin.query.BatchAuditReq; import com.ruoyi.cai.dto.admin.vo.user.UserPictureAuditAdminVo; import com.ruoyi.cai.service.UserPictureAuditService; import com.ruoyi.common.annotation.Log; @@ -65,6 +66,15 @@ public class UserPictureAuditController extends BaseController { return R.ok(); } + @SaCheckPermission("cai:userPictureAudit:edit") + @RepeatSubmit() + @PostMapping("/batch/audit") + @Log(title = "批量审核通过头像", businessType = BusinessType.UPDATE) + public R batchAudit(@RequestBody BatchAuditReq bo) { + boolean success = userPictureAuditService.batchSuccess(bo.getIds()); + return R.ok(success); + } + @SaCheckPermission("cai:userPictureAudit:edit") @Log(title = "头像审核不通过", businessType = BusinessType.UPDATE) @RepeatSubmit() diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AdolescentAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AdolescentAppController.java index 75a3759a..88e49d53 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AdolescentAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AdolescentAppController.java @@ -45,7 +45,7 @@ public class AdolescentAppController { @GetMapping("/get") @Operation(summary = "获取用户青少年模式状态") - @Log(title = "获取用户青少年模式状态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取用户青少年模式状态", businessType = BusinessType.OTHER, isSaveDb = false) public R get(){ Long userId = LoginHelper.getUserId(); Adolescent adolescent = adolescentService.getByUserId(userId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java index 0b63beaf..1afe66e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java @@ -55,7 +55,7 @@ public class IndexController { @GetMapping("/config") @Operation(summary = "获取APP系统核心参数") - @Log(title = "获取APP系统核心参数", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取APP系统核心参数", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) @SaIgnore public R config(){ AppHomeConfig appHomeConfig = homeManager.config(); @@ -65,7 +65,7 @@ public class IndexController { @GetMapping("/recommendFollows") @Operation(summary = "获取推荐关注列表") - @Log(title = "获取推荐关注列表", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取推荐关注列表", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> recommendFollows(){ Integer recommendFollowsLimit = systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.HOME_RECOMMEND_FOLLOWS_LIMIT); List vos = homeManager.recommendFollows(recommendFollowsLimit); @@ -74,7 +74,7 @@ public class IndexController { @GetMapping("/banner") @Operation(summary = "获取首页banner图") - @Log(title = "获取首页banner图", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取首页banner图", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> banner(){ List res = bannerService.index(); return R.ok(BeanConvertUtil.convertListTo(res, IndexBannerVo::new)); @@ -82,7 +82,7 @@ public class IndexController { @GetMapping("/anchor/page") @Operation(summary = "首页查询主播接口-分页") - @Log(title = "首页查询主播接口", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "首页查询主播接口", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> anchorPage(PageQuery page, AnchorListQuery query){ List home = homeManager.getHomeCache(page, query); return R.ok(home); @@ -98,7 +98,7 @@ public class IndexController { @GetMapping("/user/page") @Operation(summary = "首页用户搜索接口-分页") - @Log(title = "首页用户搜索接口-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "首页用户搜索接口-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> userPage(PageQuery page, UserQuery query){ if(query.getType() == null){ query.setType(1); @@ -109,7 +109,7 @@ public class IndexController { @GetMapping("/user/greet/page") @Operation(summary = "群打招呼界面-用户搜索接口") - @Log(title = "群打招呼界面-用户搜索接口", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "群打招呼界面-用户搜索接口", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false) public R> greetQuery(PageQuery page, GreetQuery query){ Page res = userService.greetPageApp(page,query); return R.ok(res.getRecords()); @@ -137,7 +137,7 @@ public class IndexController { @GetMapping("/userGuard/page") @Operation(summary = "获取指定女神守护排行") - @Log(title = "获取指定女神守护排行", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取指定女神守护排行", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> userGuardPage(PageQuery pageQuery,Long userId){ Page page = guardTotalService.userGuardPage(pageQuery, userId); return R.ok(page.getRecords()); @@ -145,7 +145,7 @@ public class IndexController { @GetMapping("/userGift/list") @Operation(summary = "获取指定女神收到的礼物列表") - @Log(title = "获取指定女神收到的礼物列表", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取指定女神收到的礼物列表", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> userGiftList(Long userId){ List res = userGiftService.selectGiftList(userId); return R.ok(res); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/InviteAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/InviteAppController.java index f5cbf7eb..378a1db9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/InviteAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/InviteAppController.java @@ -30,7 +30,7 @@ public class InviteAppController { @GetMapping("/home") @Operation(summary = "邀请有奖页面") - @Log(title = "邀请有奖页面", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "邀请有奖页面", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R inviteHome(){ Long userId = LoginHelper.getUserId(); InviteHomeVo inviteHome = userInviteService.inviteHome(userId); @@ -39,7 +39,7 @@ public class InviteAppController { @GetMapping("/user/page") @Operation(summary = "我邀请的人") - @Log(title = "我邀请的人", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "我邀请的人", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> inviteUserPage(PageQuery pageQuery,String usercode){ Long userId = LoginHelper.getUserId(); Page userPage = userInviteService.inviteUserPage(pageQuery,userId,usercode); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java index da778601..bda5c4f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java @@ -33,7 +33,7 @@ public class OtherController { @PostMapping("/report") @Operation(summary = "举报") - @Log(title = "举报", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "举报", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R report(@RequestBody UserReportReq reportRes){ Long userId = LoginHelper.getUserId(); reportRes.setUserId(userId); @@ -43,7 +43,7 @@ public class OtherController { @PostMapping("/pushError") @Operation(summary = "上报异常行为（截屏，录屏）") - @Log(title = "上报异常行为（截屏，录屏）", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "上报异常行为（截屏，录屏）", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) public R pushError(@RequestBody PushErrorReq req){ req.setUserId(LoginHelper.getUserId()); userErrorLogService.pushError(req); @@ -52,7 +52,7 @@ public class OtherController { @GetMapping("/system/version") @Operation(summary = "版本号校验") - @Log(title = "版本号校验", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "版本号校验", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false) public R systemVersion(){ VersionSystemInfo info = versionService.systemInfo(VersionUtil.getAppVersion(), VersionUtil.getVersionPlatform()); return R.ok(info); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java index 11349c16..251aea9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java @@ -68,6 +68,7 @@ public class RankAppController { @PostMapping("/giveRank") @Operation(summary = "领取榜单") + @Log(title = "魅力榜榜单说明", businessType = BusinessType.OTHER, isSaveDb = true) public R inviteRank(@RequestBody RankIdReq rankIdReq){ Long userId = LoginHelper.getUserId(); awardManager.giveRank(rankIdReq.getRankId(),userId); @@ -76,7 +77,7 @@ public class RankAppController { @GetMapping("/love") @Operation(summary = "魅力榜") - @Log(title = "魅力榜单查询", businessType = BusinessType.OTHER, isSaveDb = true) + @Log(title = "魅力榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false) public R> loveRank( @Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){ if(type == null){ @@ -134,7 +135,7 @@ public class RankAppController { @GetMapping("/invite") @Operation(summary = "邀请榜") - @Log(title = "邀请榜单查询", businessType = BusinessType.OTHER, isSaveDb = true) + @Log(title = "魅力榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false) public R> inviteRank( @Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){ if(type == null){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RoomController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RoomController.java index 9afac095..248380fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RoomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RoomController.java @@ -61,7 +61,7 @@ public class RoomController { @GetMapping("/chatTip") @Operation(summary = "进入聊天界面提示语") - @Log(title = "进入聊天界面提示语", businessType = BusinessType.OTHER, isSaveDb = true) + @Log(title = "进入聊天界面提示语", businessType = BusinessType.OTHER, isSaveDb = false) public R chatTip(){ ChatTipResp resp = new ChatTipResp(); resp.setTip("以色情为由加微信/索取礼物多为诈骗,请举报"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java index 0e11857a..71387348 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java @@ -49,7 +49,7 @@ public class SettingAppController { @GetMapping("/goods") @Operation(summary = "充值配置") - @Log(title = "充值配置", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "充值配置", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R goods(){ SettingGoodsVo vo = new SettingGoodsVo(); vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY)); @@ -64,7 +64,7 @@ public class SettingAppController { @GetMapping("/withdraw") @Operation(summary = "提现配置") - @Log(title = "提现配置", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "提现配置", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false) public R withdraw(){ WithdrawExchangeVo vo = new WithdrawExchangeVo(); List list = withdrawExchangeService.list(Wrappers.lambdaQuery(WithdrawExchange.class) @@ -78,7 +78,7 @@ public class SettingAppController { @GetMapping("/report") @Operation(summary = "举报分类配置") - @Log(title = "举报分类配置", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "举报分类配置", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> report(){ List list = reportCateService.list(Wrappers.lambdaQuery(ReportCate.class)); return R.ok(list); @@ -87,7 +87,7 @@ public class SettingAppController { @GetMapping("/accountDetail/type") @Operation(summary = "账户明细类型") - @Log(title = "账户明细类型", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "账户明细类型", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> accountDetailType(){ List vo = new ArrayList<>(); AccountCateEnum[] values = AccountCateEnum.values(); @@ -100,7 +100,7 @@ public class SettingAppController { @GetMapping("/gift") @Operation(summary = "礼物配置") - @Log(title = "礼物配置", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "礼物配置", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> gift(){ List res = giftService.all(); return R.ok(BeanConvertUtil.convertListTo(res, GiftVo::new)); @@ -108,7 +108,7 @@ public class SettingAppController { @GetMapping("/agreement/user") @Operation(summary = "获取用户协议") - @Log(title = "获取用户协议", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取用户协议", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false) @SaIgnore public R userAgreement() { // String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement(); @@ -118,7 +118,7 @@ public class SettingAppController { @GetMapping("/agreement/privacy") @Operation(summary = "获取隐私协议") - @Log(title = "获取隐私协议", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取隐私协议", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) @SaIgnore public R privacyAgreement() { // String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement(); @@ -128,7 +128,7 @@ public class SettingAppController { @GetMapping("/agreement/anchorJoin") @Operation(summary = "用户主播入驻协议") - @Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R anchorJoinAgreement() { // String anchorJoinAgreement = agreementSettingService.getAgreementSetting().getAnchorJoinAgreement(); String anchorJoinAgreement = systemConfigManager.getSystemConfig(SystemConfigEnum.ANCHOR_JOIN_AGREEMENT); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java index c7292022..d97fbd2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java @@ -89,7 +89,7 @@ public class UserAppController { @PostMapping("/updateRankHide") @Operation(summary = "修改排行榜隐藏状态") - @Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = true) public R updateRankHide(@RequestBody UpdateRankHideReq updateRankHideReq){ updateRankHideReq.setUserId(LoginHelper.getUserId()); userMemberService.updateRankHide(updateRankHideReq); @@ -98,7 +98,7 @@ public class UserAppController { @PostMapping("/updateNoGreet") @Operation(summary = "修改隐藏模式状态") - @Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = true) public R updateNoGreet(@RequestBody UpdateNoGreet updateNoGreet){ updateNoGreet.setUserId(LoginHelper.getUserId()); userMemberService.updateNoGreet(updateNoGreet); @@ -155,7 +155,7 @@ public class UserAppController { @GetMapping("/callLog/page") @Operation(summary = "通话记录查询-分页") - @Log(title = "通话记录查询", businessType = BusinessType.OTHER, isSaveDb = true) + @Log(title = "通话记录查询", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false) public R> callLog(PageQuery pageQuery, @Parameter(description = "当前用户在通话中的类型 0=全部 1=主叫方 2=接收方") Integer type){ IPage page = userCallService.pageApp(pageQuery, type, LoginHelper.getUserId()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserBlackAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserBlackAppController.java index a4870381..31a45936 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserBlackAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserBlackAppController.java @@ -27,7 +27,7 @@ public class UserBlackAppController { @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){ Page page = userBlacklistService.pageApp(pageQuery, LoginHelper.getUserId()); return R.ok(page.getRecords()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java index f6ec43ee..a6c5a78c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java @@ -30,7 +30,7 @@ public class UserDynamicAppController { @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 query){ query.setCurrentUserId(LoginHelper.getUserId()); Page resp = dynamicService.pageApp(pageQuery,query); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java index 1b17128f..a7dd5b8a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java @@ -33,7 +33,7 @@ public class UserGreetAppController { @GetMapping("/list") @Operation(summary = "获取当前用户打招呼列表") - @Log(title = "获取当前用户打招呼列表", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取当前用户打招呼列表", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false) public R list(){ Long userId = LoginHelper.getUserId(); User user = userService.getById(userId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserStartAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserStartAppController.java index edc6c40a..bb41b741 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserStartAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserStartAppController.java @@ -53,7 +53,7 @@ public class UserStartAppController { @GetMapping("/page") @Operation(summary = "关注、粉丝列表查询") - @Log(title = "粉丝列表查询", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "粉丝列表查询", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> page(StarQuery query, PageQuery pageQuery){ Page res = userFollowService.pageApp(pageQuery,query); return R.ok(res.getRecords()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserVisitorAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserVisitorAppController.java index e4b71312..2fdb25aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserVisitorAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserVisitorAppController.java @@ -30,7 +30,7 @@ public class UserVisitorAppController { // 除网络问题不返回异常。避免影响业务 @PostMapping("/visitor") @Operation(summary = "新增浏览记录") - @Log(title = "新增浏览记录", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "新增浏览记录", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R visitor(@RequestBody StarOrVisitorReq starOrVisitorReq){ try { boolean bool = userVisitorService.visitor(starOrVisitorReq); @@ -42,7 +42,7 @@ public class UserVisitorAppController { @GetMapping("/page") @Operation(summary = "我的浏览记录、访客查询-分页") - @Log(title = "我的浏览记录、访客查询-分页", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "我的浏览记录、访客查询-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> page(VisitorQuery query, PageQuery pageQuery){ Page res = userVisitorService.pageApp(pageQuery,query); return R.ok(res.getRecords()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/WalletController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/WalletController.java index 1b40885f..94591278 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/WalletController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/WalletController.java @@ -53,7 +53,7 @@ public class WalletController { @GetMapping("/accountDetail/page") @Operation(summary = "账户明细-分页") - @Log(title = "账户明细", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "账户明细", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> accountDetail(PageQuery query, @Parameter(description = "类型(接口在 设置相关接口-账户明细类型)") Integer cateId){ Long userId = LoginHelper.getUserId(); @@ -63,7 +63,7 @@ public class WalletController { @GetMapping("/aliInfo") @Operation(summary = "获取绑定支付宝信息") - @Log(title = "获取绑定支付宝信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取绑定支付宝信息", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R aliInfo(){ AccountBankcard accountBankcard = currentUserManager.aliInfo(); return R.ok(accountBankcard); @@ -88,7 +88,7 @@ public class WalletController { @GetMapping("/recharge/log") @Operation(summary = "充值记录-分页") - @Log(title = "充值记录", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "充值记录", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> rechargeLog(PageQuery query){ Long userId = LoginHelper.getUserId(); Page page = rechargeOrderService.page(query.build(), Wrappers.lambdaQuery(RechargeOrder.class) @@ -101,7 +101,7 @@ public class WalletController { @GetMapping("/cash/log") @Operation(summary = "提现记录-分页") - @Log(title = "提现记录", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "提现记录", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> cashLog(PageQuery query){ Long userId = LoginHelper.getUserId(); Page page = accountCashService.page(query.build(), Wrappers.lambdaQuery(AccountCash.class) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java index 1a4b5ea5..c94cb5e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java @@ -45,9 +45,7 @@ public class YxNotifyController { String curTime = request.getHeader("CurTime"); String md5 = request.getHeader("MD5"); String checkSum = request.getHeader("CheckSum"); - log.info("request headers: AppKey = {}, CurTime = {},MD5 = {}, CheckSum = {}", appKey, curTime, md5, checkSum); String requestBody = readBody(request); - log.info("request body = {}", requestBody); boolean check = yunxinManager.checkNotify(requestBody, curTime, checkSum,md5); if(!check){ log.info("检验失败！"); @@ -59,6 +57,7 @@ public class YxNotifyController { } String eventType = body.getString("eventType"); if("2".equals(eventType) || "3".equals(eventType)){ // 登陆登出事件 + log.info("request yx notify login body = {}", requestBody); String accid = body.getString("accid"); String timestamp = body.getString("timestamp"); onlineService.updateOnlineByYunxin(eventType,Long.valueOf(accid),Long.valueOf(timestamp)); @@ -69,6 +68,7 @@ public class YxNotifyController { String ext = body.getString("ext"); ExecutorConstant.SYNC_EXECUTOR.execute(() -> { try { + log.info("request yx notify chat body = {}", requestBody); JSONObject extJson = JSON.parseObject(ext); String recordId = extJson.getString("recordId"); if(StringUtils.isEmpty(recordId)){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index 3a1a490f..273b0b2c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -269,8 +269,16 @@ public class CurrentUserManager { .set(User::getAvatarState, 1)); vo.setAuditStatus(AuditStatusEnum.SUCCESS.getCode()); imManager.updateImInfo(res.getUserId(),res.getAvatar(),null,null); + try { + anchorApplyService.checkAnchorAuto(user.getId()); + }catch (Exception e){ + log.error("检查是否自动主播失败!",e); + } } return vo; } + @Autowired + private AnchorApplyService anchorApplyService; + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java index e9e06b24..6e8c1631 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java @@ -37,4 +37,6 @@ public interface UserAlbumService extends IService { void auditSuccess(Long id); void auditFail(Long id); + + boolean batchAuditSuccess(List ids); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java index 48b8bf10..b3b54289 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java @@ -6,6 +6,8 @@ import com.ruoyi.cai.domain.UserPictureAudit; import com.ruoyi.cai.dto.admin.vo.user.UserPictureAuditAdminVo; import com.ruoyi.common.core.domain.PageQuery; +import java.util.List; + /** * 头像审核Service接口 * @@ -20,4 +22,6 @@ public interface UserPictureAuditService extends IService { void auditSuccess(Long id); void auditFail(Long id); + + boolean batchSuccess(List ids); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java index 603d80b4..50a179a4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java @@ -130,4 +130,13 @@ public class UserAlbumServiceImpl extends ServiceImpl ids) { + return this.update(Wrappers.lambdaUpdate(UserAlbum.class) + .in(UserAlbum::getId, ids) + .eq(UserAlbum::getAuditStatus, AuditStatusEnum.AUDITING.getCode()) + .set(UserAlbum::getAuditStatus, AuditStatusEnum.SUCCESS.getCode()) + .set(UserAlbum::getAuditTime, LocalDateTime.now())); + } + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java index 7d3871d8..854d8105 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.List; /** * 头像审核Service业务层处理 @@ -82,4 +83,12 @@ public class UserPictureAuditServiceImpl extends ServiceImpl ids) { + for (Long id : ids) { + this.auditSuccess(id); + } + return true; + } } 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 95d107de..f818cc68 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,5 @@ 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 43901c82..300ef0bd 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 @@ -134,10 +134,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)); } }