From 49b4b8fd2c6a4f4070a201b71826f7a98d06a76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Mon, 22 Jan 2024 17:15:53 +0800 Subject: [PATCH] 123 --- .../ruoyi/cai/controller/app/AnchorAppController.java | 10 +++++----- .../ruoyi/cai/controller/app/AuthAppController.java | 2 +- .../ruoyi/cai/controller/app/ConsumeController.java | 8 ++++---- .../com/ruoyi/cai/controller/app/PayController.java | 4 ++-- .../com/ruoyi/cai/controller/app/RoomController.java | 4 ++-- .../ruoyi/cai/controller/app/UserAppController.java | 10 +++++----- .../cai/controller/app/UserBlackAppController.java | 2 +- .../cai/controller/app/UserDynamicAppController.java | 4 ++-- .../cai/controller/app/UserGreetAppController.java | 6 +++--- .../cai/controller/app/UserStartAppController.java | 4 ++-- .../com/ruoyi/cai/controller/app/WalletController.java | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java index f2e7def7..f45117e5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java @@ -46,7 +46,7 @@ public class AnchorAppController { @PostMapping("/update") @Operation(summary = "修改当前用户的主播信息") - @Log(title = "修改当前用户的主播信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "修改当前用户的主播信息", businessType = BusinessType.OTHER, isSaveDb = true) public R anchorUpdate(@RequestBody AnchorUpdateReq anchorUpdate){ return R.ok(currentUserManager.anchorUpdate(anchorUpdate)); } @@ -61,7 +61,7 @@ public class AnchorAppController { @PostMapping("/uploadCameraAudit") @Operation(summary = "上传自拍认证") - @Log(title = "上传自拍认证", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "上传自拍认证", businessType = BusinessType.OTHER, isSaveDb = true) public R uploadCameraAudit(@RequestBody CameraAuditVo vo){ Long userId = LoginHelper.getUserId(); vo.setUserId(userId); @@ -70,7 +70,7 @@ public class AnchorAppController { @Operation(summary = "同意主播服务协议") @PostMapping("/agreeProtocol") - @Log(title = "同意主播服务协议", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "同意主播服务协议", businessType = BusinessType.OTHER, isSaveDb = true) public R agreeProtocol(){ boolean b = userService.agreeProtocol(LoginHelper.getUserId()); return R.ok(b); @@ -78,7 +78,7 @@ public class AnchorAppController { @Operation(summary = "加入主播页面") @GetMapping("/joinHome") - @Log(title = "加入主播页面", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "加入主播页面", businessType = BusinessType.OTHER, isSaveDb = true) public R joinHome(){ AnchorJoinHomeVo vo = anchorApplyService.joinHome(LoginHelper.getUserId()); return R.ok(vo); @@ -86,7 +86,7 @@ public class AnchorAppController { @Operation(summary = "申请加入主播") @GetMapping("/joinAnchor") - @Log(title = "申请加入主播", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "申请加入主播", businessType = BusinessType.OTHER, isSaveDb = true) public R joinAnchor(){ return R.ok(anchorApplyService.joinAnchor(LoginHelper.getUserId())); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java index 1071f758..bddb8d20 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java @@ -43,7 +43,7 @@ public class AuthAppController { @PostMapping("/register") @Operation(summary = "注册") - @Log(title = "注册", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "注册", businessType = BusinessType.OTHER, isSaveDb = true) public R register(@Validated @RequestBody CaiRegisterUser caiUser){ boolean mobile = PhoneUtil.isMobile(caiUser.getUsername()); if(!mobile){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java index db5961b5..d494e279 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java @@ -36,7 +36,7 @@ public class ConsumeController { @PostMapping("/give/guard") @Operation(summary = "赠送主播守护") - @Log(title = "赠送主播守护", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "赠送主播守护", businessType = BusinessType.OTHER, isSaveDb = true) public R giveGuard(@RequestBody GiveGuardReq query){ ConsumeResp resp = consumerManager.sendGuard(query); return R.ok(resp.isSuccess()); @@ -44,7 +44,7 @@ public class ConsumeController { @PostMapping("/give/gift") @Operation(summary = "赠送主播礼物") - @Log(title = "赠送主播礼物", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "赠送主播礼物", businessType = BusinessType.OTHER, isSaveDb = true) public R giveGift(@RequestBody GiveGiftRes query){ ConsumeResp resp = consumerManager.sendGift(query); return R.ok(resp.isSuccess()); @@ -52,7 +52,7 @@ public class ConsumeController { @PostMapping("/order/vip/create") @Operation(summary = "创建VIP订单") - @Log(title = "创建VIP订单", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "创建VIP订单", businessType = BusinessType.OTHER, isSaveDb = true) public R vipOrderCreate(@RequestBody AddRechargeOrderDto dto){ RechargeOrder order = rechargeOrderService.addRechargeOrder(dto); OrderCreateVo vo = new OrderCreateVo(); @@ -65,7 +65,7 @@ public class ConsumeController { @PostMapping("/order/recharge/create") @Operation(summary = "创建充值订单") - @Log(title = "创建充值订单", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "创建充值订单", businessType = BusinessType.OTHER, isSaveDb = true) public R giveGift(@RequestBody AddVipOrderDto dto){ VipOrder order = vipOrderService.addVipOrder(dto); OrderCreateVo vo = new OrderCreateVo(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/PayController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/PayController.java index eda9da3f..b6dcfec0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/PayController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/PayController.java @@ -46,7 +46,7 @@ public class PayController { @PostMapping(value = "/wx") @Operation(summary = "微信支付") - @Log(title = "微信支付", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "微信支付", businessType = BusinessType.OTHER, isSaveDb = true) public R appPay(@RequestBody PayControllerDTO dto) { PayConfig payConfig = payConfigManager.getWxConfig(); String ip = ServletUtils.getClientIP(); @@ -90,7 +90,7 @@ public class PayController { @PostMapping(value = "/ali") @Operation(summary = "支付宝支付") - @Log(title = "支付宝支付", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "支付宝支付", businessType = BusinessType.OTHER, isSaveDb = true) public R aliPay(@RequestBody PayControllerDTO dto) { try { boolean b = payConfigManager.initAliPay(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RoomController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RoomController.java index 0c4fe3d9..04b22c15 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RoomController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RoomController.java @@ -26,7 +26,7 @@ public class RoomController { @PostMapping("/call") @Operation(summary = "发起直播") - @Log(title = "发起直播", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "发起直播", businessType = BusinessType.OTHER, isSaveDb = true) public R call(@RequestBody CallReq req){ CallResp call = chatManager.call(req); return R.ok(call); @@ -34,7 +34,7 @@ public class RoomController { @GetMapping("/getRoom") @Operation(summary = "获取房间信息") - @Log(title = "获取房间信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "获取房间信息", businessType = BusinessType.OTHER, isSaveDb = true) public R getRoom(@NotEmpty(message = "房间不存在") String roomId){ GetRoomResp room = chatManager.getRoom(roomId); return R.ok(room); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java index d068bcc1..12e6668d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java @@ -86,7 +86,7 @@ public class UserAppController { @PostMapping("/update") @Operation(summary = "修改当前用户信息") - @Log(title = "修改当前用户信息", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "修改当前用户信息", businessType = BusinessType.OTHER, isSaveDb = true) public R userUpdate(@Validated @RequestBody UserUpdateReq res){ currentUserManager.userUpdate(res); return R.ok(); @@ -94,24 +94,24 @@ public class UserAppController { @PostMapping("/album/del") @Operation(summary = "删除相册") - @Log(title = "删除相册", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "删除相册", businessType = BusinessType.OTHER, isSaveDb = true) public R userAlbumDel(@RequestBody IdRes res){ return R.ok(userAlbumService.removeAlbum(res.getId())); } @PostMapping("/album/add") @Operation(summary = "新增相册") - @Log(title = "新增相册", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "新增相册", businessType = BusinessType.OTHER, isSaveDb = true) public R userAlbumAdd(@RequestBody AlbumAddReq res){ res.setUserId(LoginHelper.getUserId()); return R.ok(userAlbumService.addAlbum(res)); } - @PostMapping("/album/reset") + /*@PostMapping("/album/reset") @Operation(summary = "重排序相册",hidden = true) @Log(title = "重排序相册", businessType = BusinessType.OTHER, isSaveDb = false) public R userAlbumAdd(@RequestBody List res){ return R.ok(userAlbumService.resetAlbum(res,LoginHelper.getUserId())); } - +*/ } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java index f775abf2..d8a59b9e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java @@ -35,7 +35,7 @@ public class UserBlackAppController { @PostMapping("black") @Operation(summary = "拉黑操作") - @Log(title = "拉黑操作", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "拉黑操作", businessType = BusinessType.OTHER, isSaveDb = true) public R black(@RequestBody BlackQuery query){ Long userId = LoginHelper.getUserId(); boolean b = userBlacklistService.black(userId,query.getBlackUserId(),query.getActionType()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java index 7eb99fbc..e4db4110 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java @@ -37,7 +37,7 @@ public class UserDynamicAppController { @PostMapping("/push") @Operation(summary = "发布动态") - @Log(title = "发布动态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "发布动态", businessType = BusinessType.OTHER, isSaveDb = true) public R push(@RequestBody DynamicAddReq res){ res.setUserId(LoginHelper.getUserId()); dynamicService.saveDynamic(res); @@ -46,7 +46,7 @@ public class UserDynamicAppController { @PostMapping("/delete") @Operation(summary = "删除动态") - @Log(title = "删除动态", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "删除动态", businessType = BusinessType.OTHER, isSaveDb = true) public R delete(@RequestBody IdRes res){ dynamicService.deleteDynamic(res.getId()); return R.ok(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java index 2322f51b..0fa6a164 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java @@ -51,7 +51,7 @@ public class UserGreetAppController { @PostMapping("/add") @Operation(summary = "新增群打招呼") - @Log(title = "新增群打招呼", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "新增群打招呼", businessType = BusinessType.OTHER, isSaveDb = true) public R add(@Validated @RequestBody UserGreetAddReq req){ req.setUserId(LoginHelper.getUserId()); userGreetService.addUserGreet(req); @@ -61,7 +61,7 @@ public class UserGreetAppController { @PostMapping("/delete") @Operation(summary = "删除群打招呼") - @Log(title = "删除群打招呼", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "删除群打招呼", businessType = BusinessType.OTHER, isSaveDb = true) public R add(@RequestBody IdRes req){ userGreetService.removeById(req.getId()); return R.ok(); @@ -69,7 +69,7 @@ public class UserGreetAppController { @PostMapping("/send") @Operation(summary = "群打招呼") - @Log(title = "群打招呼", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "群打招呼", businessType = BusinessType.OTHER, isSaveDb = true) public R send(@RequestBody IdRes req){ userGreetService.batchSend(req.getId(),LoginHelper.getUserId()); return R.ok(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java index 0457d043..ef0ef375 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java @@ -27,7 +27,7 @@ public class UserStartAppController { @PostMapping("/star") @Operation(summary = "关注用户") - @Log(title = "关注用户", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "关注用户", businessType = BusinessType.OTHER, isSaveDb = true) public R star(@RequestBody StarOrVisitorReq starOrVisitorReq){ boolean bool = userFollowService.star(starOrVisitorReq); return R.ok(bool); @@ -35,7 +35,7 @@ public class UserStartAppController { @PostMapping("/unstar") @Operation(summary = "取消关注用户") - @Log(title = "取消关注用户", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "取消关注用户", businessType = BusinessType.OTHER, isSaveDb = true) public R unStar(@RequestBody StarOrVisitorReq starOrVisitorReq){ boolean bool = userFollowService.unStar(starOrVisitorReq); return R.ok(bool); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java index 175ff4b3..8821411b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java @@ -71,7 +71,7 @@ public class WalletController { @PostMapping("/save-or-update/ali") @Operation(summary = "支付宝信息的新增和修改") - @Log(title = "支付宝信息的新增和修改", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "支付宝信息的新增和修改", businessType = BusinessType.OTHER, isSaveDb = true) public R updateAli(@RequestBody AccountAliBankCardRes res){ currentUserManager.saveOrUpdateAliInfo(res); return R.ok(true); @@ -79,7 +79,7 @@ public class WalletController { @PostMapping("/withdraw/ali") @Operation(summary = "支付宝提现接口") - @Log(title = "支付宝提现接口", businessType = BusinessType.OTHER, isSaveDb = false) + @Log(title = "支付宝提现接口", businessType = BusinessType.OTHER, isSaveDb = true) public R withdraw(@RequestBody WithdrawReq res){ res.setUserId(LoginHelper.getUserId()); accountCashService.withdraw(res);