shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
77
2024-04-14 22:46:01 +08:00
parent bcb40cfc4a
commit 05c9cacf70
25 changed files with 99 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java
View File

@@ -97,7 +97,7 @@ public class DynamicController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/batch/audit") @PostMapping("/batch/audit")
@Log(title = "批量审核通过动态", businessType = BusinessType.UPDATE) @Log(title = "批量审核通过动态", businessType = BusinessType.UPDATE)
public R<Boolean> edit(@RequestBody BatchAuditReq bo) { public R<Boolean> batchAudit(@RequestBody BatchAuditReq bo) {
boolean success = dynamicService.auditSuccess(bo.getIds()); boolean success = dynamicService.auditSuccess(bo.getIds());
return R.ok(success); return R.ok(success);
} }

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.UserAlbum; 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.dto.admin.vo.UserAlbumAdminVo;
import com.ruoyi.cai.service.UserAlbumService; import com.ruoyi.cai.service.UserAlbumService;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
@@ -80,6 +81,16 @@ public class UserAlbumController extends BaseController {
return R.ok(); return R.ok();
} }
@SaCheckPermission("cai:userAlbum:edit")
@RepeatSubmit()
@PostMapping("/batch/audit")
@Log(title = "主播相册批量审核通过", businessType = BusinessType.UPDATE)
public R<Boolean> batchAudit(@RequestBody BatchAuditReq bo) {
boolean success = userAlbumService.batchAuditSuccess(bo.getIds());
return R.ok(success);
}
/** /**
* 删除主播集锦 * 删除主播集锦
* *

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserPictureAuditController.java
View File

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.UserPictureAudit; 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.dto.admin.vo.user.UserPictureAuditAdminVo;
import com.ruoyi.cai.service.UserPictureAuditService; import com.ruoyi.cai.service.UserPictureAuditService;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
@@ -65,6 +66,15 @@ public class UserPictureAuditController extends BaseController {
return R.ok(); return R.ok();
} }
@SaCheckPermission("cai:userPictureAudit:edit")
@RepeatSubmit()
@PostMapping("/batch/audit")
@Log(title = "批量审核通过头像", businessType = BusinessType.UPDATE)
public R<Boolean> batchAudit(@RequestBody BatchAuditReq bo) {
boolean success = userPictureAuditService.batchSuccess(bo.getIds());
return R.ok(success);
}
@SaCheckPermission("cai:userPictureAudit:edit") @SaCheckPermission("cai:userPictureAudit:edit")
@Log(title = "头像审核不通过", businessType = BusinessType.UPDATE) @Log(title = "头像审核不通过", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AdolescentAppController.java
View File

@@ -45,7 +45,7 @@ public class AdolescentAppController {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获取用户青少年模式状态") @Operation(summary = "获取用户青少年模式状态")
@Log(title = "获取用户青少年模式状态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取用户青少年模式状态", businessType = BusinessType.OTHER, isSaveDb = false)
public R<AdolescentVo> get(){ public R<AdolescentVo> get(){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
Adolescent adolescent = adolescentService.getByUserId(userId); Adolescent adolescent = adolescentService.getByUserId(userId);

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java
View File

@@ -55,7 +55,7 @@ public class IndexController {
@GetMapping("/config") @GetMapping("/config")
@Operation(summary = "获取APP系统核心参数") @Operation(summary = "获取APP系统核心参数")
@Log(title = "获取APP系统核心参数", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取APP系统核心参数", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
@SaIgnore @SaIgnore
public R<AppHomeConfig> config(){ public R<AppHomeConfig> config(){
AppHomeConfig appHomeConfig = homeManager.config(); AppHomeConfig appHomeConfig = homeManager.config();
@@ -65,7 +65,7 @@ public class IndexController {
@GetMapping("/recommendFollows") @GetMapping("/recommendFollows")
@Operation(summary = "获取推荐关注列表") @Operation(summary = "获取推荐关注列表")
@Log(title = "获取推荐关注列表", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取推荐关注列表", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<AnchorListVo>> recommendFollows(){ public R<List<AnchorListVo>> recommendFollows(){
Integer recommendFollowsLimit = systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.HOME_RECOMMEND_FOLLOWS_LIMIT); Integer recommendFollowsLimit = systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.HOME_RECOMMEND_FOLLOWS_LIMIT);
List<AnchorListVo> vos = homeManager.recommendFollows(recommendFollowsLimit); List<AnchorListVo> vos = homeManager.recommendFollows(recommendFollowsLimit);
@@ -74,7 +74,7 @@ public class IndexController {
@GetMapping("/banner") @GetMapping("/banner")
@Operation(summary = "获取首页banner图") @Operation(summary = "获取首页banner图")
@Log(title = "获取首页banner图", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取首页banner图", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<IndexBannerVo>> banner(){ public R<List<IndexBannerVo>> banner(){
List<Banner> res = bannerService.index(); List<Banner> res = bannerService.index();
return R.ok(BeanConvertUtil.convertListTo(res, IndexBannerVo::new)); return R.ok(BeanConvertUtil.convertListTo(res, IndexBannerVo::new));
@@ -82,7 +82,7 @@ public class IndexController {
@GetMapping("/anchor/page") @GetMapping("/anchor/page")
@Operation(summary = "首页查询主播接口-分页") @Operation(summary = "首页查询主播接口-分页")
@Log(title = "首页查询主播接口", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "首页查询主播接口", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<AnchorListVo>> anchorPage(PageQuery page, AnchorListQuery query){ public R<List<AnchorListVo>> anchorPage(PageQuery page, AnchorListQuery query){
List<AnchorListVo> home = homeManager.getHomeCache(page, query); List<AnchorListVo> home = homeManager.getHomeCache(page, query);
return R.ok(home); return R.ok(home);
@@ -98,7 +98,7 @@ public class IndexController {
@GetMapping("/user/page") @GetMapping("/user/page")
@Operation(summary = "首页用户搜索接口-分页") @Operation(summary = "首页用户搜索接口-分页")
@Log(title = "首页用户搜索接口-分页", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "首页用户搜索接口-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<UserListVo>> userPage(PageQuery page, UserQuery query){ public R<List<UserListVo>> userPage(PageQuery page, UserQuery query){
if(query.getType() == null){ if(query.getType() == null){
query.setType(1); query.setType(1);
@@ -109,7 +109,7 @@ public class IndexController {
@GetMapping("/user/greet/page") @GetMapping("/user/greet/page")
@Operation(summary = "群打招呼界面-用户搜索接口") @Operation(summary = "群打招呼界面-用户搜索接口")
@Log(title = "群打招呼界面-用户搜索接口", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "群打招呼界面-用户搜索接口", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false)
public R<List<UserListVo>> greetQuery(PageQuery page, GreetQuery query){ public R<List<UserListVo>> greetQuery(PageQuery page, GreetQuery query){
Page<UserListVo> res = userService.greetPageApp(page,query); Page<UserListVo> res = userService.greetPageApp(page,query);
return R.ok(res.getRecords()); return R.ok(res.getRecords());
@@ -137,7 +137,7 @@ public class IndexController {
@GetMapping("/userGuard/page") @GetMapping("/userGuard/page")
@Operation(summary = "获取指定女神守护排行") @Operation(summary = "获取指定女神守护排行")
@Log(title = "获取指定女神守护排行", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取指定女神守护排行", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<GuardListPageVo>> userGuardPage(PageQuery pageQuery,Long userId){ public R<List<GuardListPageVo>> userGuardPage(PageQuery pageQuery,Long userId){
Page<GuardListPageVo> page = guardTotalService.userGuardPage(pageQuery, userId); Page<GuardListPageVo> page = guardTotalService.userGuardPage(pageQuery, userId);
return R.ok(page.getRecords()); return R.ok(page.getRecords());
@@ -145,7 +145,7 @@ public class IndexController {
@GetMapping("/userGift/list") @GetMapping("/userGift/list")
@Operation(summary = "获取指定女神收到的礼物列表") @Operation(summary = "获取指定女神收到的礼物列表")
@Log(title = "获取指定女神收到的礼物列表", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取指定女神收到的礼物列表", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<UserGiftIndexVo>> userGiftList(Long userId){ public R<List<UserGiftIndexVo>> userGiftList(Long userId){
List<UserGiftIndexVo> res = userGiftService.selectGiftList(userId); List<UserGiftIndexVo> res = userGiftService.selectGiftList(userId);
return R.ok(res); return R.ok(res);

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/InviteAppController.java
View File

@@ -30,7 +30,7 @@ public class InviteAppController {
@GetMapping("/home") @GetMapping("/home")
@Operation(summary = "邀请有奖页面") @Operation(summary = "邀请有奖页面")
@Log(title = "邀请有奖页面", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "邀请有奖页面", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<InviteHomeVo> inviteHome(){ public R<InviteHomeVo> inviteHome(){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
InviteHomeVo inviteHome = userInviteService.inviteHome(userId); InviteHomeVo inviteHome = userInviteService.inviteHome(userId);
@@ -39,7 +39,7 @@ public class InviteAppController {
@GetMapping("/user/page") @GetMapping("/user/page")
@Operation(summary = "我邀请的人") @Operation(summary = "我邀请的人")
@Log(title = "我邀请的人", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "我邀请的人", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<UserListVo>> inviteUserPage(PageQuery pageQuery,String usercode){ public R<List<UserListVo>> inviteUserPage(PageQuery pageQuery,String usercode){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
Page<UserListVo> userPage = userInviteService.inviteUserPage(pageQuery,userId,usercode); Page<UserListVo> userPage = userInviteService.inviteUserPage(pageQuery,userId,usercode);

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java
View File

@@ -33,7 +33,7 @@ public class OtherController {
@PostMapping("/report") @PostMapping("/report")
@Operation(summary = "举报") @Operation(summary = "举报")
@Log(title = "举报", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "举报", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<Void> report(@RequestBody UserReportReq reportRes){ public R<Void> report(@RequestBody UserReportReq reportRes){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
reportRes.setUserId(userId); reportRes.setUserId(userId);
@@ -43,7 +43,7 @@ public class OtherController {
@PostMapping("/pushError") @PostMapping("/pushError")
@Operation(summary = "上报异常行为（截屏，录屏）") @Operation(summary = "上报异常行为（截屏，录屏）")
@Log(title = "上报异常行为（截屏，录屏）", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "上报异常行为（截屏，录屏）", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<Void> pushError(@RequestBody PushErrorReq req){ public R<Void> pushError(@RequestBody PushErrorReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
userErrorLogService.pushError(req); userErrorLogService.pushError(req);
@@ -52,7 +52,7 @@ public class OtherController {
@GetMapping("/system/version") @GetMapping("/system/version")
@Operation(summary = "版本号校验") @Operation(summary = "版本号校验")
@Log(title = "版本号校验", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "版本号校验", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false)
public R<VersionSystemInfo> systemVersion(){ public R<VersionSystemInfo> systemVersion(){
VersionSystemInfo info = versionService.systemInfo(VersionUtil.getAppVersion(), VersionUtil.getVersionPlatform()); VersionSystemInfo info = versionService.systemInfo(VersionUtil.getAppVersion(), VersionUtil.getVersionPlatform());
return R.ok(info); return R.ok(info);

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java
View File

@@ -68,6 +68,7 @@ public class RankAppController {
@PostMapping("/giveRank") @PostMapping("/giveRank")
@Operation(summary = "领取榜单") @Operation(summary = "领取榜单")
@Log(title = "魅力榜榜单说明", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> inviteRank(@RequestBody RankIdReq rankIdReq){ public R<Void> inviteRank(@RequestBody RankIdReq rankIdReq){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
awardManager.giveRank(rankIdReq.getRankId(),userId); awardManager.giveRank(rankIdReq.getRankId(),userId);
@@ -76,7 +77,7 @@ public class RankAppController {
@GetMapping("/love") @GetMapping("/love")
@Operation(summary = "魅力榜") @Operation(summary = "魅力榜")
@Log(title = "魅力榜单查询", businessType = BusinessType.OTHER, isSaveDb = true) @Log(title = "魅力榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false)
public R<List<RankNodeLove>> loveRank( public R<List<RankNodeLove>> loveRank(
@Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){ @Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){
if(type == null){ if(type == null){
@@ -134,7 +135,7 @@ public class RankAppController {
@GetMapping("/invite") @GetMapping("/invite")
@Operation(summary = "邀请榜") @Operation(summary = "邀请榜")
@Log(title = "邀请榜单查询", businessType = BusinessType.OTHER, isSaveDb = true) @Log(title = "魅力榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false)
public R<List<RankNodeInvite>> inviteRank( public R<List<RankNodeInvite>> inviteRank(
@Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){ @Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){
if(type == null){ if(type == null){

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RoomController.java
View File

@@ -61,7 +61,7 @@ public class RoomController {
@GetMapping("/chatTip") @GetMapping("/chatTip")
@Operation(summary = "进入聊天界面提示语") @Operation(summary = "进入聊天界面提示语")
@Log(title = "进入聊天界面提示语", businessType = BusinessType.OTHER, isSaveDb = true) @Log(title = "进入聊天界面提示语", businessType = BusinessType.OTHER, isSaveDb = false)
public R<ChatTipResp> chatTip(){ public R<ChatTipResp> chatTip(){
ChatTipResp resp = new ChatTipResp(); ChatTipResp resp = new ChatTipResp();
resp.setTip("以色情为由加微信/索取礼物多为诈骗,请举报"); resp.setTip("以色情为由加微信/索取礼物多为诈骗,请举报");

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java
View File

@@ -49,7 +49,7 @@ public class SettingAppController {
@GetMapping("/goods") @GetMapping("/goods")
@Operation(summary = "充值配置") @Operation(summary = "充值配置")
@Log(title = "充值配置", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "充值配置", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<SettingGoodsVo> goods(){ public R<SettingGoodsVo> goods(){
SettingGoodsVo vo = new SettingGoodsVo(); SettingGoodsVo vo = new SettingGoodsVo();
vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY)); vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY));
@@ -64,7 +64,7 @@ public class SettingAppController {
@GetMapping("/withdraw") @GetMapping("/withdraw")
@Operation(summary = "提现配置") @Operation(summary = "提现配置")
@Log(title = "提现配置", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "提现配置", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false)
public R<WithdrawExchangeVo> withdraw(){ public R<WithdrawExchangeVo> withdraw(){
WithdrawExchangeVo vo = new WithdrawExchangeVo(); WithdrawExchangeVo vo = new WithdrawExchangeVo();
List<WithdrawExchange> list = withdrawExchangeService.list(Wrappers.lambdaQuery(WithdrawExchange.class) List<WithdrawExchange> list = withdrawExchangeService.list(Wrappers.lambdaQuery(WithdrawExchange.class)
@@ -78,7 +78,7 @@ public class SettingAppController {
@GetMapping("/report") @GetMapping("/report")
@Operation(summary = "举报分类配置") @Operation(summary = "举报分类配置")
@Log(title = "举报分类配置", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "举报分类配置", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<ReportCate>> report(){ public R<List<ReportCate>> report(){
List<ReportCate> list = reportCateService.list(Wrappers.lambdaQuery(ReportCate.class)); List<ReportCate> list = reportCateService.list(Wrappers.lambdaQuery(ReportCate.class));
return R.ok(list); return R.ok(list);
@@ -87,7 +87,7 @@ public class SettingAppController {
@GetMapping("/accountDetail/type") @GetMapping("/accountDetail/type")
@Operation(summary = "账户明细类型") @Operation(summary = "账户明细类型")
@Log(title = "账户明细类型", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "账户明细类型", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<CateSelectVo>> accountDetailType(){ public R<List<CateSelectVo>> accountDetailType(){
List<CateSelectVo> vo = new ArrayList<>(); List<CateSelectVo> vo = new ArrayList<>();
AccountCateEnum[] values = AccountCateEnum.values(); AccountCateEnum[] values = AccountCateEnum.values();
@@ -100,7 +100,7 @@ public class SettingAppController {
@GetMapping("/gift") @GetMapping("/gift")
@Operation(summary = "礼物配置") @Operation(summary = "礼物配置")
@Log(title = "礼物配置", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "礼物配置", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<GiftVo>> gift(){ public R<List<GiftVo>> gift(){
List<Gift> res = giftService.all(); List<Gift> res = giftService.all();
return R.ok(BeanConvertUtil.convertListTo(res, GiftVo::new)); return R.ok(BeanConvertUtil.convertListTo(res, GiftVo::new));
@@ -108,7 +108,7 @@ public class SettingAppController {
@GetMapping("/agreement/user") @GetMapping("/agreement/user")
@Operation(summary = "获取用户协议") @Operation(summary = "获取用户协议")
@Log(title = "获取用户协议", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取用户协议", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
@SaIgnore @SaIgnore
public R<AgreementDTO> userAgreement() { public R<AgreementDTO> userAgreement() {
// String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement(); // String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement();
@@ -118,7 +118,7 @@ public class SettingAppController {
@GetMapping("/agreement/privacy") @GetMapping("/agreement/privacy")
@Operation(summary = "获取隐私协议") @Operation(summary = "获取隐私协议")
@Log(title = "获取隐私协议", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取隐私协议", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
@SaIgnore @SaIgnore
public R<AgreementDTO> privacyAgreement() { public R<AgreementDTO> privacyAgreement() {
// String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement(); // String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement();
@@ -128,7 +128,7 @@ public class SettingAppController {
@GetMapping("/agreement/anchorJoin") @GetMapping("/agreement/anchorJoin")
@Operation(summary = "用户主播入驻协议") @Operation(summary = "用户主播入驻协议")
@Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<AgreementDTO> anchorJoinAgreement() { public R<AgreementDTO> anchorJoinAgreement() {
// String anchorJoinAgreement = agreementSettingService.getAgreementSetting().getAnchorJoinAgreement(); // String anchorJoinAgreement = agreementSettingService.getAgreementSetting().getAnchorJoinAgreement();
String anchorJoinAgreement = systemConfigManager.getSystemConfig(SystemConfigEnum.ANCHOR_JOIN_AGREEMENT); String anchorJoinAgreement = systemConfigManager.getSystemConfig(SystemConfigEnum.ANCHOR_JOIN_AGREEMENT);

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java
View File

@@ -89,7 +89,7 @@ public class UserAppController {
@PostMapping("/updateRankHide") @PostMapping("/updateRankHide")
@Operation(summary = "修改排行榜隐藏状态") @Operation(summary = "修改排行榜隐藏状态")
@Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateRankHide(@RequestBody UpdateRankHideReq updateRankHideReq){ public R<Void> updateRankHide(@RequestBody UpdateRankHideReq updateRankHideReq){
updateRankHideReq.setUserId(LoginHelper.getUserId()); updateRankHideReq.setUserId(LoginHelper.getUserId());
userMemberService.updateRankHide(updateRankHideReq); userMemberService.updateRankHide(updateRankHideReq);
@@ -98,7 +98,7 @@ public class UserAppController {
@PostMapping("/updateNoGreet") @PostMapping("/updateNoGreet")
@Operation(summary = "修改隐藏模式状态") @Operation(summary = "修改隐藏模式状态")
@Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateNoGreet(@RequestBody UpdateNoGreet updateNoGreet){ public R<Void> updateNoGreet(@RequestBody UpdateNoGreet updateNoGreet){
updateNoGreet.setUserId(LoginHelper.getUserId()); updateNoGreet.setUserId(LoginHelper.getUserId());
userMemberService.updateNoGreet(updateNoGreet); userMemberService.updateNoGreet(updateNoGreet);
@@ -155,7 +155,7 @@ public class UserAppController {
@GetMapping("/callLog/page") @GetMapping("/callLog/page")
@Operation(summary = "通话记录查询-分页") @Operation(summary = "通话记录查询-分页")
@Log(title = "通话记录查询", businessType = BusinessType.OTHER, isSaveDb = true) @Log(title = "通话记录查询", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false)
public R<List<UserCallAppVo>> callLog(PageQuery pageQuery, public R<List<UserCallAppVo>> callLog(PageQuery pageQuery,
@Parameter(description = "当前用户在通话中的类型 0=全部 1=主叫方 2=接收方") Integer type){ @Parameter(description = "当前用户在通话中的类型 0=全部 1=主叫方 2=接收方") Integer type){
IPage<UserCallAppVo> page = userCallService.pageApp(pageQuery, type, LoginHelper.getUserId()); IPage<UserCallAppVo> page = userCallService.pageApp(pageQuery, type, LoginHelper.getUserId());

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserBlackAppController.java
View File

@@ -27,7 +27,7 @@ public class UserBlackAppController {
@GetMapping("page") @GetMapping("page")
@Operation(summary = "用户黑名单查询") @Operation(summary = "用户黑名单查询")
@Log(title = "用户黑名单查询", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "用户黑名单查询", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<UserListVo>> page(PageQuery pageQuery){ public R<List<UserListVo>> page(PageQuery pageQuery){
Page<UserListVo> page = userBlacklistService.pageApp(pageQuery, LoginHelper.getUserId()); Page<UserListVo> page = userBlacklistService.pageApp(pageQuery, LoginHelper.getUserId());
return R.ok(page.getRecords()); return R.ok(page.getRecords());

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java
View File

@@ -30,7 +30,7 @@ public class UserDynamicAppController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "动态查询动态") @Operation(summary = "动态查询动态")
@Log(title = "动态查询动态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "动态查询动态", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false)
public R<List<DynamicListVo>> page(PageQuery pageQuery, DynamicQuery query){ public R<List<DynamicListVo>> page(PageQuery pageQuery, DynamicQuery query){
query.setCurrentUserId(LoginHelper.getUserId()); query.setCurrentUserId(LoginHelper.getUserId());
Page<DynamicListVo> resp = dynamicService.pageApp(pageQuery,query); Page<DynamicListVo> resp = dynamicService.pageApp(pageQuery,query);

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java
View File

@@ -33,7 +33,7 @@ public class UserGreetAppController {
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获取当前用户打招呼列表") @Operation(summary = "获取当前用户打招呼列表")
@Log(title = "获取当前用户打招呼列表", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取当前用户打招呼列表", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false)
public R<UserGreetVo> list(){ public R<UserGreetVo> list(){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
User user = userService.getById(userId); User user = userService.getById(userId);

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserStartAppController.java
View File

@@ -53,7 +53,7 @@ public class UserStartAppController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "关注、粉丝列表查询") @Operation(summary = "关注、粉丝列表查询")
@Log(title = "粉丝列表查询", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "粉丝列表查询", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<UserStarOrVisitorList>> page(StarQuery query, PageQuery pageQuery){ public R<List<UserStarOrVisitorList>> page(StarQuery query, PageQuery pageQuery){
Page<UserStarOrVisitorList> res = userFollowService.pageApp(pageQuery,query); Page<UserStarOrVisitorList> res = userFollowService.pageApp(pageQuery,query);
return R.ok(res.getRecords()); return R.ok(res.getRecords());

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserVisitorAppController.java
View File

@@ -30,7 +30,7 @@ public class UserVisitorAppController {
// 除网络问题不返回异常。避免影响业务 // 除网络问题不返回异常。避免影响业务
@PostMapping("/visitor") @PostMapping("/visitor")
@Operation(summary = "新增浏览记录") @Operation(summary = "新增浏览记录")
@Log(title = "新增浏览记录", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "新增浏览记录", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<Boolean> visitor(@RequestBody StarOrVisitorReq starOrVisitorReq){ public R<Boolean> visitor(@RequestBody StarOrVisitorReq starOrVisitorReq){
try { try {
boolean bool = userVisitorService.visitor(starOrVisitorReq); boolean bool = userVisitorService.visitor(starOrVisitorReq);
@@ -42,7 +42,7 @@ public class UserVisitorAppController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "我的浏览记录、访客查询-分页") @Operation(summary = "我的浏览记录、访客查询-分页")
@Log(title = "我的浏览记录、访客查询-分页", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "我的浏览记录、访客查询-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<UserStarOrVisitorList>> page(VisitorQuery query, PageQuery pageQuery){ public R<List<UserStarOrVisitorList>> page(VisitorQuery query, PageQuery pageQuery){
Page<UserStarOrVisitorList> res = userVisitorService.pageApp(pageQuery,query); Page<UserStarOrVisitorList> res = userVisitorService.pageApp(pageQuery,query);
return R.ok(res.getRecords()); return R.ok(res.getRecords());

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/WalletController.java
View File

@@ -53,7 +53,7 @@ public class WalletController {
@GetMapping("/accountDetail/page") @GetMapping("/accountDetail/page")
@Operation(summary = "账户明细-分页") @Operation(summary = "账户明细-分页")
@Log(title = "账户明细", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "账户明细", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<AccountDetailsAppVo>> accountDetail(PageQuery query, public R<List<AccountDetailsAppVo>> accountDetail(PageQuery query,
@Parameter(description = "类型(接口在 设置相关接口-账户明细类型)") Integer cateId){ @Parameter(description = "类型(接口在 设置相关接口-账户明细类型)") Integer cateId){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
@@ -63,7 +63,7 @@ public class WalletController {
@GetMapping("/aliInfo") @GetMapping("/aliInfo")
@Operation(summary = "获取绑定支付宝信息") @Operation(summary = "获取绑定支付宝信息")
@Log(title = "获取绑定支付宝信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取绑定支付宝信息", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<AccountBankcard> aliInfo(){ public R<AccountBankcard> aliInfo(){
AccountBankcard accountBankcard = currentUserManager.aliInfo(); AccountBankcard accountBankcard = currentUserManager.aliInfo();
return R.ok(accountBankcard); return R.ok(accountBankcard);
@@ -88,7 +88,7 @@ public class WalletController {
@GetMapping("/recharge/log") @GetMapping("/recharge/log")
@Operation(summary = "充值记录-分页") @Operation(summary = "充值记录-分页")
@Log(title = "充值记录", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "充值记录", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<RechargeOrderVo>> rechargeLog(PageQuery query){ public R<List<RechargeOrderVo>> rechargeLog(PageQuery query){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
Page<RechargeOrder> page = rechargeOrderService.page(query.build(), Wrappers.lambdaQuery(RechargeOrder.class) Page<RechargeOrder> page = rechargeOrderService.page(query.build(), Wrappers.lambdaQuery(RechargeOrder.class)
@@ -101,7 +101,7 @@ public class WalletController {
@GetMapping("/cash/log") @GetMapping("/cash/log")
@Operation(summary = "提现记录-分页") @Operation(summary = "提现记录-分页")
@Log(title = "提现记录", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "提现记录", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<AccountCashVo>> cashLog(PageQuery query){ public R<List<AccountCashVo>> cashLog(PageQuery query){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
Page<AccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(AccountCash.class) Page<AccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(AccountCash.class)

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java
View File

@@ -45,9 +45,7 @@ public class YxNotifyController {
String curTime = request.getHeader("CurTime"); String curTime = request.getHeader("CurTime");
String md5 = request.getHeader("MD5"); String md5 = request.getHeader("MD5");
String checkSum = request.getHeader("CheckSum"); String checkSum = request.getHeader("CheckSum");
log.info("request headers: AppKey = {}, CurTime = {},MD5 = {}, CheckSum = {}", appKey, curTime, md5, checkSum);
String requestBody = readBody(request); String requestBody = readBody(request);
log.info("request body = {}", requestBody);
boolean check = yunxinManager.checkNotify(requestBody, curTime, checkSum,md5); boolean check = yunxinManager.checkNotify(requestBody, curTime, checkSum,md5);
if(!check){ if(!check){
log.info("检验失败！"); log.info("检验失败！");
@@ -59,6 +57,7 @@ public class YxNotifyController {
} }
String eventType = body.getString("eventType"); String eventType = body.getString("eventType");
if("2".equals(eventType) || "3".equals(eventType)){ // 登陆登出事件 if("2".equals(eventType) || "3".equals(eventType)){ // 登陆登出事件
log.info("request yx notify login body = {}", requestBody);
String accid = body.getString("accid"); String accid = body.getString("accid");
String timestamp = body.getString("timestamp"); String timestamp = body.getString("timestamp");
onlineService.updateOnlineByYunxin(eventType,Long.valueOf(accid),Long.valueOf(timestamp)); onlineService.updateOnlineByYunxin(eventType,Long.valueOf(accid),Long.valueOf(timestamp));
@@ -69,6 +68,7 @@ public class YxNotifyController {
String ext = body.getString("ext"); String ext = body.getString("ext");
ExecutorConstant.SYNC_EXECUTOR.execute(() -> { ExecutorConstant.SYNC_EXECUTOR.execute(() -> {
try { try {
log.info("request yx notify chat body = {}", requestBody);
JSONObject extJson = JSON.parseObject(ext); JSONObject extJson = JSON.parseObject(ext);
String recordId = extJson.getString("recordId"); String recordId = extJson.getString("recordId");
if(StringUtils.isEmpty(recordId)){ if(StringUtils.isEmpty(recordId)){

8
ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java
View File

@@ -269,8 +269,16 @@ public class CurrentUserManager {
.set(User::getAvatarState, 1)); .set(User::getAvatarState, 1));
vo.setAuditStatus(AuditStatusEnum.SUCCESS.getCode()); vo.setAuditStatus(AuditStatusEnum.SUCCESS.getCode());
imManager.updateImInfo(res.getUserId(),res.getAvatar(),null,null); imManager.updateImInfo(res.getUserId(),res.getAvatar(),null,null);
try {
anchorApplyService.checkAnchorAuto(user.getId());
}catch (Exception e){
log.error("检查是否自动主播失败!",e);
}
} }
return vo; return vo;
} }
@Autowired
private AnchorApplyService anchorApplyService;
} }

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java
View File

@@ -37,4 +37,6 @@ public interface UserAlbumService extends IService<UserAlbum> {
void auditSuccess(Long id); void auditSuccess(Long id);
void auditFail(Long id); void auditFail(Long id);
boolean batchAuditSuccess(List<Long> ids);
} }

4
ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java
View File

@@ -6,6 +6,8 @@ import com.ruoyi.cai.domain.UserPictureAudit;
import com.ruoyi.cai.dto.admin.vo.user.UserPictureAuditAdminVo; import com.ruoyi.cai.dto.admin.vo.user.UserPictureAuditAdminVo;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import java.util.List;
/** /**
* 头像审核Service接口 * 头像审核Service接口
* *
@@ -20,4 +22,6 @@ public interface UserPictureAuditService extends IService<UserPictureAudit> {
void auditSuccess(Long id); void auditSuccess(Long id);
void auditFail(Long id); void auditFail(Long id);
boolean batchSuccess(List<Long> ids);
} }

9
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java
View File

@@ -130,4 +130,13 @@ public class UserAlbumServiceImpl extends ServiceImpl<UserAlbumMapper, UserAlbum
.set(UserAlbum::getAuditTime, LocalDateTime.now())); .set(UserAlbum::getAuditTime, LocalDateTime.now()));
} }
@Override
public boolean batchAuditSuccess(List<Long> 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()));
}
} }

9
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java
View File

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* 头像审核Service业务层处理 * 头像审核Service业务层处理
@@ -82,4 +83,12 @@ public class UserPictureAuditServiceImpl extends ServiceImpl<UserPictureAuditMap
.set(UserPictureAudit::getAuditStatus, AuditStatusEnum.FAIL.getCode()) .set(UserPictureAudit::getAuditStatus, AuditStatusEnum.FAIL.getCode())
.set(UserPictureAudit::getAuditTime, LocalDateTime.now())); .set(UserPictureAudit::getAuditTime, LocalDateTime.now()));
} }
@Override
public boolean batchSuccess(List<Long> ids) {
for (Long id : ids) {
this.auditSuccess(id);
}
return true;
}
} }

1
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
View File

@@ -46,4 +46,5 @@ public @interface Log {
boolean isSaveDb() default true; boolean isSaveDb() default true;
boolean isPrintResponseData() default true;
} }

4
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View File

@@ -134,10 +134,12 @@ public class LogAspect {
// 获取参数的信息，传入到数据库中。 // 获取参数的信息，传入到数据库中。
setRequestValue(joinPoint, operLog, log.excludeParamNames(),logString); setRequestValue(joinPoint, operLog, log.excludeParamNames(),logString);
} }
String jsonResultString = JsonUtils.toJsonString(jsonResult);
// 是否需要保存response，参数和值 // 是否需要保存response，参数和值
if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) { if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) {
String jsonResultString = JsonUtils.toJsonString(jsonResult);
operLog.setJsonResult(StringUtils.substring(jsonResultString, 0, 2000)); operLog.setJsonResult(StringUtils.substring(jsonResultString, 0, 2000));
}
if(log.isPrintResponseData()){
logString.append(String.format("result=%s;",jsonResultString)); logString.append(String.format("result=%s;",jsonResultString));
} }
} }