This commit is contained in:
77
2024-04-27 16:48:51 +08:00
parent ee2b25ea43
commit f643d4a8df
19 changed files with 60 additions and 69 deletions

View File

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

View File

@@ -90,6 +90,7 @@ public class LogAspect {
operLog.setOperName(loginUser.getUsername()); operLog.setOperName(loginUser.getUsername());
operLog.setUserType(loginUser.getUserType()); operLog.setUserType(loginUser.getUserType());
operLog.setDeptName(loginUser.getDeptName()); operLog.setDeptName(loginUser.getDeptName());
logString.append(String.format("currentUserId=%s;", loginUser.getUserId()));
} }
}catch (Exception ex){ }catch (Exception ex){
// not do // not do
@@ -132,10 +133,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));
} }
} }

View File

@@ -54,7 +54,7 @@ public class AccountAppController {
@GetMapping("/detail/page") @GetMapping("/detail/page")
@Operation(summary = "查询账户明细") @Operation(summary = "查询账户明细")
@Log(title = "查询账户明细", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "查询账户明细", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<PageModel<AccountDetailVo>> detail(PageQuery pageQuery){ public R<PageModel<AccountDetailVo>> detail(PageQuery pageQuery){
Page<AccountDetailVo> page = accountChangeLogService.pageApp(pageQuery,LoginHelper.getUserId()); Page<AccountDetailVo> page = accountChangeLogService.pageApp(pageQuery,LoginHelper.getUserId());
return R.ok(PageModel.build(page)); return R.ok(PageModel.build(page));
@@ -72,7 +72,7 @@ public class AccountAppController {
@PostMapping("/wxTrans/order/create") @PostMapping("/wxTrans/order/create")
@Operation(summary = "生成微信交换订单") @Operation(summary = "生成微信交换订单")
@Log(title = "生成微信交换订单", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "生成微信交换订单", businessType = BusinessType.OTHER, isSaveDb = true)
public R<OrderCreateVo> createWxTransOrder(@RequestBody GenWxTransOrderReq req){ public R<OrderCreateVo> createWxTransOrder(@RequestBody GenWxTransOrderReq req){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
WxTransOrder vipOrder = wxTransOrderService.createWxTransOrder(userId, req.getWxTransNum()); WxTransOrder vipOrder = wxTransOrderService.createWxTransOrder(userId, req.getWxTransNum());
@@ -85,7 +85,7 @@ public class AccountAppController {
@PostMapping("/wxTrans/apply") @PostMapping("/wxTrans/apply")
@Operation(summary = "处理交换微信") @Operation(summary = "处理交换微信")
@Log(title = "处理交换微信", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "处理交换微信", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> applyWxTrans(@RequestBody WxTransDataApplyReq req){ public R<Void> applyWxTrans(@RequestBody WxTransDataApplyReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
wxTransDataService.apply(req); wxTransDataService.apply(req);
@@ -94,7 +94,7 @@ public class AccountAppController {
@PostMapping("/wxTrans/star") @PostMapping("/wxTrans/star")
@Operation(summary = "发起交换微信") @Operation(summary = "发起交换微信")
@Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> starWxTrans(@RequestBody StarWxTransReq starWxTransReq){ public R<Void> starWxTrans(@RequestBody StarWxTransReq starWxTransReq){
starWxTransReq.setSponsorUserId(LoginHelper.getUserId()); starWxTransReq.setSponsorUserId(LoginHelper.getUserId());
wxTransDataService.start(starWxTransReq); wxTransDataService.start(starWxTransReq);
@@ -104,7 +104,7 @@ public class AccountAppController {
@GetMapping("/wxTrans/data/page") @GetMapping("/wxTrans/data/page")
@Operation(summary = "查询交换微信数据") @Operation(summary = "查询交换微信数据")
@Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "发起交换微信", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<PageModel<WxTransDataListAppVo>> wxTransDataPage(PageQuery pageQuery, WxTransDataQuery wxTransDataQuery){ public R<PageModel<WxTransDataListAppVo>> wxTransDataPage(PageQuery pageQuery, WxTransDataQuery wxTransDataQuery){
wxTransDataQuery.setUserId(LoginHelper.getUserId()); wxTransDataQuery.setUserId(LoginHelper.getUserId());
Page<WxTransDataListAppVo> page = wxTransDataService.pageApp(pageQuery, wxTransDataQuery); Page<WxTransDataListAppVo> page = wxTransDataService.pageApp(pageQuery, wxTransDataQuery);
@@ -113,7 +113,7 @@ public class AccountAppController {
@GetMapping("/wxTrans/log/page") @GetMapping("/wxTrans/log/page")
@Operation(summary = "查询交换微信账户明细") @Operation(summary = "查询交换微信账户明细")
@Log(title = "查询交换微信账户明细", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "查询交换微信账户明细", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<PageModel<WxTransLogListVo>> wxTransLogPage(PageQuery pageQuery, WxTransLogQuery query){ public R<PageModel<WxTransLogListVo>> wxTransLogPage(PageQuery pageQuery, WxTransLogQuery query){
query.setUserId(LoginHelper.getUserId()); query.setUserId(LoginHelper.getUserId());
Page<WxTransLogListVo> page = wxTransLogService.pageApp(pageQuery, query); Page<WxTransLogListVo> page = wxTransLogService.pageApp(pageQuery, query);

View File

@@ -44,7 +44,7 @@ public class AuthAppController {
@PostMapping("/sms/code") @PostMapping("/sms/code")
@Operation(summary = "获取验证码") @Operation(summary = "获取验证码")
@SaIgnore @SaIgnore
@Log(title = "获取验证码", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取验证码", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Map<String,String>> registerCode(@Validated @RequestBody SmsCodeReq code){ public R<Map<String,String>> registerCode(@Validated @RequestBody SmsCodeReq code){
boolean mobile = PhoneUtil.isMobile(code.getMobile()); boolean mobile = PhoneUtil.isMobile(code.getMobile());
if(!mobile){ if(!mobile){
@@ -56,7 +56,7 @@ public class AuthAppController {
@PostMapping("/login") @PostMapping("/login")
@Operation(summary = "登陆(选择手机号登陆,会自动注册)") @Operation(summary = "登陆(选择手机号登陆,会自动注册)")
@Log(title = "登陆", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "登陆", businessType = BusinessType.OTHER, isSaveDb = true)
public R<LoginVo> login(@Validated @RequestBody LoginUser loginBody){ public R<LoginVo> login(@Validated @RequestBody LoginUser loginBody){
LoginVo vo = new LoginVo(); LoginVo vo = new LoginVo();
String token; String token;
@@ -74,7 +74,7 @@ public class AuthAppController {
@PostMapping("/loginOut") @PostMapping("/loginOut")
@Operation(summary = "登出") @Operation(summary = "登出")
@Log(title = "登出", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "登出", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> loginOut(){ public R<Void> loginOut(){
loginManager.logout(); loginManager.logout();
return R.ok(); return R.ok();
@@ -83,7 +83,7 @@ public class AuthAppController {
@PostMapping("/resetPassword/code") @PostMapping("/resetPassword/code")
@Operation(summary = "获取重置密码验证码") @Operation(summary = "获取重置密码验证码")
@Log(title = "获取重置密码验证码", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取重置密码验证码", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Map<String,String>> resetPasswordCode(@Validated @RequestBody RegisterCode code){ public R<Map<String,String>> resetPasswordCode(@Validated @RequestBody RegisterCode code){
boolean mobile = PhoneUtil.isMobile(code.getMobile()); boolean mobile = PhoneUtil.isMobile(code.getMobile());
if(!mobile){ if(!mobile){
@@ -96,7 +96,7 @@ public class AuthAppController {
@PostMapping("/resetPassword/checkCode") @PostMapping("/resetPassword/checkCode")
@Operation(summary = "重置密码-验证码校验") @Operation(summary = "重置密码-验证码校验")
@Log(title = "重置密码-验证码校验", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "重置密码-验证码校验", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Map<String,String>> resetPasswordCheck(@RequestBody RegisterCodeCheck code){ public R<Map<String,String>> resetPasswordCheck(@RequestBody RegisterCodeCheck code){
String token = loginManager.resetPasswordCheck(code.getMobile(), code.getCode()); String token = loginManager.resetPasswordCheck(code.getMobile(), code.getCode());
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
@@ -106,7 +106,7 @@ public class AuthAppController {
@PostMapping("/resetPassword") @PostMapping("/resetPassword")
@Operation(summary = "重置密码") @Operation(summary = "重置密码")
@Log(title = "重置密码", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "重置密码", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> resetPassword(@RequestBody ResetPasswordReq code){ public R<Void> resetPassword(@RequestBody ResetPasswordReq code){
loginManager.resetPassword(code.getMobile(),code.getPassword(),code.getToken()); loginManager.resetPassword(code.getMobile(),code.getPassword(),code.getToken());
return R.ok(); return R.ok();

View File

@@ -24,7 +24,7 @@ public class AuthOrderAppController {
@PostMapping("/order/create") @PostMapping("/order/create")
@Operation(summary = "生成VIP订单") @Operation(summary = "生成VIP订单")
@Log(title = "生成VIP订单", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "生成VIP订单", businessType = BusinessType.OTHER, isSaveDb = true)
public R<OrderCreateVo> createAuthOrder(){ public R<OrderCreateVo> createAuthOrder(){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
AuthOrder authOrder = authOrderService.createVipOrder(userId); AuthOrder authOrder = authOrderService.createVipOrder(userId);

View File

@@ -27,7 +27,7 @@ public class DynamicAppController {
@PostMapping("/add") @PostMapping("/add")
@Operation(summary = "新增动态") @Operation(summary = "新增动态")
@Log(title = "新增动态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "新增动态", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> addDynamic(@RequestBody AddDynamicReq req){ public R<Void> addDynamic(@RequestBody AddDynamicReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
dynamicService.push(req); dynamicService.push(req);
@@ -36,7 +36,7 @@ public class DynamicAppController {
@PostMapping("/star") @PostMapping("/star")
@Operation(summary = "点赞动态") @Operation(summary = "点赞动态")
@Log(title = "点赞动态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "点赞动态", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> starDynamic(@RequestBody DynamicStarReq req){ public R<Void> starDynamic(@RequestBody DynamicStarReq req){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
if(req.getStar() == null){ if(req.getStar() == null){
@@ -55,7 +55,7 @@ public class DynamicAppController {
@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<PageModel<DynamicListVo>> page(PageQuery pageQuery, DynamicQuery dynamicQuery){ public R<PageModel<DynamicListVo>> page(PageQuery pageQuery, DynamicQuery dynamicQuery){
dynamicQuery.initBirthdayByAge(); dynamicQuery.initBirthdayByAge();
Page<DynamicListVo> page = dynamicService.pageApp(pageQuery, dynamicQuery); Page<DynamicListVo> page = dynamicService.pageApp(pageQuery, dynamicQuery);
@@ -64,7 +64,7 @@ public class DynamicAppController {
@PostMapping("/delete") @PostMapping("/delete")
@Operation(summary = "删除我的动态") @Operation(summary = "删除我的动态")
@Log(title = "删除我的动态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "删除我的动态", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> delete(@RequestBody IdReq idReq){ public R<Void> delete(@RequestBody IdReq idReq){
dynamicService.removeDynamicOfApp(idReq.getId()); dynamicService.removeDynamicOfApp(idReq.getId());
return R.ok(); return R.ok();
@@ -72,7 +72,7 @@ public class DynamicAppController {
@GetMapping("/current/page") @GetMapping("/current/page")
@Operation(summary = "我发布的动态列表-分页") @Operation(summary = "我发布的动态列表-分页")
@Log(title = "我发布的动态列表-分页", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "我发布的动态列表-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<PageModel<MyDynamicListVo>> currentPage(PageQuery pageQuery){ public R<PageModel<MyDynamicListVo>> currentPage(PageQuery pageQuery){
Page<MyDynamicListVo> page = dynamicService.currentPage(pageQuery); Page<MyDynamicListVo> page = dynamicService.currentPage(pageQuery);
return R.ok(PageModel.build(page)); return R.ok(PageModel.build(page));
@@ -80,7 +80,7 @@ public class DynamicAppController {
@GetMapping("/myStarDynamic") @GetMapping("/myStarDynamic")
@Operation(summary = "我收到的动态点赞-分页") @Operation(summary = "我收到的动态点赞-分页")
@Log(title = "我收到的动态点赞-分页", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "我收到的动态点赞-分页", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<PageModel<MyStarDynamicListVO>> myStarDynamic(PageQuery pageQuery, MyStarDynamicQuery dynamicQuery){ public R<PageModel<MyStarDynamicListVO>> myStarDynamic(PageQuery pageQuery, MyStarDynamicQuery dynamicQuery){
Page<MyStarDynamicListVO> page = dynamicStarService.myStarDynamic(pageQuery, dynamicQuery); Page<MyStarDynamicListVO> page = dynamicStarService.myStarDynamic(pageQuery, dynamicQuery);
return R.ok(PageModel.build(page)); return R.ok(PageModel.build(page));

View File

@@ -33,7 +33,7 @@ public class HomeAppController {
@PostMapping("/user/page") @PostMapping("/user/page")
@Operation(summary = "首页查询用户-分页") @Operation(summary = "首页查询用户-分页")
@Log(title = "首页查询用户-分页", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "首页查询用户-分页", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<PageModel<HomeUserListVo>> userPage(@RequestBody HomePageReq homePageReq){ public R<PageModel<HomeUserListVo>> userPage(@RequestBody HomePageReq homePageReq){
homePageReq.initBirthdayByAge(); homePageReq.initBirthdayByAge();
Page<HomeUserListVo> vo = userService.homePage(homePageReq); Page<HomeUserListVo> vo = userService.homePage(homePageReq);
@@ -42,7 +42,7 @@ public class HomeAppController {
@GetMapping("/vip/page") @GetMapping("/vip/page")
@Operation(summary = "首页查询VIP推荐用户-分页") @Operation(summary = "首页查询VIP推荐用户-分页")
@Log(title = "首页查询VIP推荐用户-分页", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "首页查询VIP推荐用户-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<List<HomeUserListVo>> vipPage(){ public R<List<HomeUserListVo>> vipPage(){
List<HomeUserListVo> vo = userService.vipHomePage(); List<HomeUserListVo> vo = userService.vipHomePage();
return R.ok(vo); return R.ok(vo);
@@ -51,7 +51,7 @@ public class HomeAppController {
@GetMapping("/user/info") @GetMapping("/user/info")
@Operation(summary = "查询用户主页信息") @Operation(summary = "查询用户主页信息")
@Log(title = "查询用户主页信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "查询用户主页信息", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<HomeUserVo> userInfo(Long userId){ public R<HomeUserVo> userInfo(Long userId){
HomeUserVo vo = userService.homeUser(userId); HomeUserVo vo = userService.homeUser(userId);
return R.ok(vo); return R.ok(vo);
@@ -59,7 +59,6 @@ public class HomeAppController {
@GetMapping("/banner") @GetMapping("/banner")
@Operation(summary = "轮播图") @Operation(summary = "轮播图")
@Log(title = "轮播图", businessType = BusinessType.OTHER, isSaveDb = false)
public R<List<Banner>> banner(){ public R<List<Banner>> banner(){
List<Banner> list = bannerService.list(Wrappers.lambdaQuery(Banner.class) List<Banner> list = bannerService.list(Wrappers.lambdaQuery(Banner.class)
.eq(Banner::getEnableStatus, 1) .eq(Banner::getEnableStatus, 1)

View File

@@ -28,7 +28,7 @@ public class ImAppController {
@PostMapping("/send/message") @PostMapping("/send/message")
@Operation(summary = "发送消息") @Operation(summary = "发送消息")
@Log(title = "发送消息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "发送消息", businessType = BusinessType.OTHER, isSaveDb = true)
public R<ImResp> sendMessage(@Validated @RequestBody ImMessageDTO imMessageDTO){ public R<ImResp> sendMessage(@Validated @RequestBody ImMessageDTO imMessageDTO){
imMessageDTO.setFromUserId(LoginHelper.getUserId()); imMessageDTO.setFromUserId(LoginHelper.getUserId());
ImResp resp = imManager.sendMessage(imMessageDTO); ImResp resp = imManager.sendMessage(imMessageDTO);

View File

@@ -31,7 +31,7 @@ public class InviteAppController {
@GetMapping("/logs") @GetMapping("/logs")
@Operation(summary = "邀请人员记录") @Operation(summary = "邀请人员记录")
@Log(title = "邀请人员记录", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "邀请人员记录", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<PageModel<UserInviteListVo>> inviteLogs(PageQuery pageQuery){ public R<PageModel<UserInviteListVo>> inviteLogs(PageQuery pageQuery){
IPage<UserInviteListVo> res = userInviteService.pageApp(pageQuery, LoginHelper.getUserId()); IPage<UserInviteListVo> res = userInviteService.pageApp(pageQuery, LoginHelper.getUserId());
return R.ok(PageModel.build(res)); return R.ok(PageModel.build(res));
@@ -39,7 +39,7 @@ public class InviteAppController {
@GetMapping("/share") @GetMapping("/share")
@Operation(summary = "获取分享图片") @Operation(summary = "获取分享图片")
@Log(title = "获取分享图片", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取分享图片", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Map<String,String>> share(){ public R<Map<String,String>> share(){
String url = userInviteService.share(LoginHelper.getUserId()); String url = userInviteService.share(LoginHelper.getUserId());
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();

View File

@@ -35,7 +35,7 @@ public class OtherController {
@PostMapping("/feedback") @PostMapping("/feedback")
@Operation(summary = "留言反馈") @Operation(summary = "留言反馈")
@Log(title = "留言反馈", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "留言反馈", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> feedback(@RequestBody FeedbackReq req){ public R<Void> feedback(@RequestBody FeedbackReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
feedbackService.feedback(req); feedbackService.feedback(req);
@@ -44,7 +44,7 @@ public class OtherController {
@PostMapping("/pairSuccess") @PostMapping("/pairSuccess")
@Operation(summary = "成功案例") @Operation(summary = "成功案例")
@Log(title = "成功案例", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "成功案例", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<List<PairSuccess>> pairSuccess(){ public R<List<PairSuccess>> pairSuccess(){
List<PairSuccess> list = pairSuccessService.list(Wrappers.lambdaQuery(PairSuccess.class) List<PairSuccess> list = pairSuccessService.list(Wrappers.lambdaQuery(PairSuccess.class)
.eq(PairSuccess::getEnableStatus, 1) .eq(PairSuccess::getEnableStatus, 1)

View File

@@ -27,7 +27,6 @@ public class ReportAppController {
@GetMapping("/cate/list") @GetMapping("/cate/list")
@Operation(summary = "获取举报类型") @Operation(summary = "获取举报类型")
@Log(title = "获取举报类型", businessType = BusinessType.OTHER, isSaveDb = false)
public R<List<ReportCate>> cateList() { public R<List<ReportCate>> cateList() {
List<ReportCate> list = reportCateService.list(); List<ReportCate> list = reportCateService.list();
return R.ok(list); return R.ok(list);
@@ -35,7 +34,7 @@ public class ReportAppController {
@PostMapping("/push") @PostMapping("/push")
@Operation(summary = "举报") @Operation(summary = "举报")
@Log(title = "举报", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "举报", businessType = BusinessType.OTHER, isSaveDb = true)
public R<AgreementDTO> push(@RequestBody ReportPushReq reportPushReq) { public R<AgreementDTO> push(@RequestBody ReportPushReq reportPushReq) {
reportService.push(reportPushReq); reportService.push(reportPushReq);
return R.ok(); return R.ok();

View File

@@ -43,7 +43,6 @@ public class SettingAppController {
@GetMapping("/agreement/user") @GetMapping("/agreement/user")
@Operation(summary = "获取用户协议") @Operation(summary = "获取用户协议")
@Log(title = "获取用户协议", businessType = BusinessType.OTHER, isSaveDb = false)
public R<AgreementDTO> userAgreement() { public R<AgreementDTO> userAgreement() {
String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement(); String userAgreement = agreementSettingService.getAgreementSetting().getUserAgreement();
return R.ok(new AgreementDTO(userAgreement)); return R.ok(new AgreementDTO(userAgreement));
@@ -51,26 +50,16 @@ public class SettingAppController {
@GetMapping("/agreement/privacy") @GetMapping("/agreement/privacy")
@Operation(summary = "获取隐私协议") @Operation(summary = "获取隐私协议")
@Log(title = "获取隐私协议", businessType = BusinessType.OTHER, isSaveDb = false)
public R<AgreementDTO> privacyAgreement() { public R<AgreementDTO> privacyAgreement() {
String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement(); String privacyAgreement = agreementSettingService.getAgreementSetting().getPrivacyAgreement();
return R.ok(new AgreementDTO(privacyAgreement)); return R.ok(new AgreementDTO(privacyAgreement));
} }
@GetMapping("/agreement/anchorJoin")
@Operation(summary = "用户主播入驻协议")
@Log(title = "用户主播入驻协议", businessType = BusinessType.OTHER, isSaveDb = false)
public R<AgreementDTO> anchorJoinAgreement() {
String anchorJoinAgreement = agreementSettingService.getAgreementSetting().getAnchorJoinAgreement();
return R.ok(new AgreementDTO(anchorJoinAgreement));
}
@Resource @Resource
private AreaCodeMapper areaCodeMapper; private AreaCodeMapper areaCodeMapper;
@GetMapping("/areaCode/homeCity") @GetMapping("/areaCode/homeCity")
@Operation(summary = "获取首页城市选择列表") @Operation(summary = "获取首页城市选择列表")
@Log(title = "获取首页城市选择列表", businessType = BusinessType.OTHER, isSaveDb = false)
public R<List<AreaCodeHomeVo>> homeCity(){ public R<List<AreaCodeHomeVo>> homeCity(){
List<AreaCodeHomeVo> vos = areaCodeMapper.homeCity(); List<AreaCodeHomeVo> vos = areaCodeMapper.homeCity();
return R.ok(vos); return R.ok(vos);
@@ -79,7 +68,6 @@ public class SettingAppController {
@GetMapping("/areaCode/list") @GetMapping("/areaCode/list")
@Operation(summary = "获取省市区编码接口") @Operation(summary = "获取省市区编码接口")
@Log(title = "获取省市区编码接口", businessType = BusinessType.OTHER, isSaveDb = false)
public R<List<AreaCode>> listAreaCode(AreaCodeQuery query){ public R<List<AreaCode>> listAreaCode(AreaCodeQuery query){
List<AreaCode> list = areaCodeService.listAreaCode(query); List<AreaCode> list = areaCodeService.listAreaCode(query);
return R.ok(list); return R.ok(list);
@@ -87,7 +75,6 @@ public class SettingAppController {
@GetMapping("/areaCode/tree") @GetMapping("/areaCode/tree")
@Operation(summary = "获取所有省市区编码") @Operation(summary = "获取所有省市区编码")
@Log(title = "获取所有省市区编码", businessType = BusinessType.OTHER, isSaveDb = false)
public R<List<AreaCodeTree>> areaCodeTree(){ public R<List<AreaCodeTree>> areaCodeTree(){
List<AreaCodeTree> node = areaCodeService.tree(); List<AreaCodeTree> node = areaCodeService.tree();
return R.ok(node); return R.ok(node);
@@ -95,7 +82,6 @@ public class SettingAppController {
@GetMapping("/customerService/pic") @GetMapping("/customerService/pic")
@Operation(summary = "获取客服二维码") @Operation(summary = "获取客服二维码")
@Log(title = "获取客服二维码", businessType = BusinessType.OTHER, isSaveDb = false)
@SaIgnore @SaIgnore
public R<Map<String,String>> customerService(){ public R<Map<String,String>> customerService(){
String url = systemConfigManager.getSystemConfig(SystemConfigEnum.CUSTOMER_SERVICE_URL); String url = systemConfigManager.getSystemConfig(SystemConfigEnum.CUSTOMER_SERVICE_URL);

View File

@@ -30,7 +30,7 @@ public class UserAppController {
@GetMapping("/user/query/homeInfo") @GetMapping("/user/query/homeInfo")
@Operation(summary = "当前用户信息") @Operation(summary = "当前用户信息")
@Log(title = "当前用户信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "当前用户信息", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<CurrentUserInfoVo> homeInfo(){ public R<CurrentUserInfoVo> homeInfo(){
CurrentUserInfoVo vo = currentUserManager.currentBaseInfo(); CurrentUserInfoVo vo = currentUserManager.currentBaseInfo();
return R.ok(vo); return R.ok(vo);
@@ -39,7 +39,7 @@ public class UserAppController {
@GetMapping("/user/query/fullInfo") @GetMapping("/user/query/fullInfo")
@Operation(summary = "当前用户的详细信息") @Operation(summary = "当前用户的详细信息")
@Log(title = "当前用户的详细信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "当前用户的详细信息", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<CurrentUserFullInfoVo> fullInfo(){ public R<CurrentUserFullInfoVo> fullInfo(){
CurrentUserFullInfoVo vo = currentUserManager.currentFullInfo(); CurrentUserFullInfoVo vo = currentUserManager.currentFullInfo();
return R.ok(vo); return R.ok(vo);
@@ -47,7 +47,7 @@ public class UserAppController {
@GetMapping("/user/query/authInfo") @GetMapping("/user/query/authInfo")
@Operation(summary = "当前用户的认证信息") @Operation(summary = "当前用户的认证信息")
@Log(title = "当前用户的认证信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "当前用户的认证信息", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<UserAuthInfoVo> authInfo(){ public R<UserAuthInfoVo> authInfo(){
UserAuthInfoVo vo = currentUserManager.currentAuthInfo(); UserAuthInfoVo vo = currentUserManager.currentAuthInfo();
return R.ok(vo); return R.ok(vo);
@@ -55,7 +55,7 @@ public class UserAppController {
@PostMapping("/user/update/base") @PostMapping("/user/update/base")
@Operation(summary = "更新用户基本信息") @Operation(summary = "更新用户基本信息")
@Log(title = "更新用户基本信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "更新用户基本信息", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateBaseInfo(@RequestBody UpdateBaseInfoReq req){ public R<Void> updateBaseInfo(@RequestBody UpdateBaseInfoReq req){
currentUserManager.updateBaseInfo(req); currentUserManager.updateBaseInfo(req);
return R.ok(); return R.ok();
@@ -63,7 +63,7 @@ public class UserAppController {
@PostMapping("/user/update/auth") @PostMapping("/user/update/auth")
@Operation(summary = "更新用户认证信息") @Operation(summary = "更新用户认证信息")
@Log(title = "更新用户认证信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "更新用户认证信息", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateAuth(@RequestBody UpdateUserAuthInfoReq req){ public R<Void> updateAuth(@RequestBody UpdateUserAuthInfoReq req){
currentUserManager.updateInfoAuth(req); currentUserManager.updateInfoAuth(req);
return R.ok(); return R.ok();
@@ -71,7 +71,7 @@ public class UserAppController {
@PostMapping("/user/update/info") @PostMapping("/user/update/info")
@Operation(summary = "更新用户信息") @Operation(summary = "更新用户信息")
@Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateInfo(@RequestBody UpdateUserFullInfoReq req){ public R<Void> updateInfo(@RequestBody UpdateUserFullInfoReq req){
currentUserManager.updateInfo(req); currentUserManager.updateInfo(req);
return R.ok(); return R.ok();
@@ -79,7 +79,7 @@ public class UserAppController {
@PostMapping("/user/update/avatar") @PostMapping("/user/update/avatar")
@Operation(summary = "更新用户头像信息") @Operation(summary = "更新用户头像信息")
@Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "更新用户信息", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateAvatarInfo(@RequestBody UpdateAvatarReq req){ public R<Void> updateAvatarInfo(@RequestBody UpdateAvatarReq req){
currentUserManager.updateAvatar(req.getAvatar()); currentUserManager.updateAvatar(req.getAvatar());
return R.ok(); return R.ok();
@@ -87,7 +87,7 @@ public class UserAppController {
@PostMapping("/user/update/remark") @PostMapping("/user/update/remark")
@Operation(summary = "更新用户备注信息") @Operation(summary = "更新用户备注信息")
@Log(title = "更新用户备注信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "更新用户备注信息", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateRemarkInfo(@RequestBody UpdateRemarkReq req){ public R<Void> updateRemarkInfo(@RequestBody UpdateRemarkReq req){
currentUserManager.updateRemark(req.getRemark()); currentUserManager.updateRemark(req.getRemark());
return R.ok(); return R.ok();
@@ -95,7 +95,7 @@ public class UserAppController {
@PostMapping("/user/add/picture") @PostMapping("/user/add/picture")
@Operation(summary = "新增用户照片") @Operation(summary = "新增用户照片")
@Log(title = "新增用户照片", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "新增用户照片", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> addUserPicture(@RequestBody AddPicturesReq req){ public R<Void> addUserPicture(@RequestBody AddPicturesReq req){
currentUserManager.addUserPicture(req); currentUserManager.addUserPicture(req);
return R.ok(); return R.ok();
@@ -103,7 +103,7 @@ public class UserAppController {
@PostMapping("/user/remove/picture") @PostMapping("/user/remove/picture")
@Operation(summary = "批量删除用户照片") @Operation(summary = "批量删除用户照片")
@Log(title = "批量删除用户照片", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "批量删除用户照片", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> removeUserPicture(@RequestBody IdsReq req){ public R<Void> removeUserPicture(@RequestBody IdsReq req){
List<Long> ids = Arrays.stream(req.getIds().split(",")) List<Long> ids = Arrays.stream(req.getIds().split(","))
.map(Long::valueOf) .map(Long::valueOf)

View File

@@ -26,7 +26,7 @@ public class UserStarAppController {
@PostMapping("/update") @PostMapping("/update")
@Operation(summary = "用户关注和取消关注") @Operation(summary = "用户关注和取消关注")
@Log(title = "用户关注和取消关注", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "用户关注和取消关注", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> starUpdate(@RequestBody UserStarReq req){ public R<Void> starUpdate(@RequestBody UserStarReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
userStarService.starUpdate(req); userStarService.starUpdate(req);
@@ -35,7 +35,7 @@ public class UserStarAppController {
@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<PageModel<UserStarListVo>> page(PageQuery pageQuery, UserStarQuery query){ public R<PageModel<UserStarListVo>> page(PageQuery pageQuery, UserStarQuery query){
query.setUserId(LoginHelper.getUserId()); query.setUserId(LoginHelper.getUserId());
Page<UserStarListVo> app = userStarService.pageApp(pageQuery, query); Page<UserStarListVo> app = userStarService.pageApp(pageQuery, query);

View File

@@ -24,7 +24,7 @@ public class UserStatusAppController {
@GetMapping("/info") @GetMapping("/info")
@Operation(summary = "获取当前用户状态") @Operation(summary = "获取当前用户状态")
@Log(title = "获取当前用户状态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取当前用户状态", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<UserStatusInfoAppVo> info(){ public R<UserStatusInfoAppVo> info(){
UserStatus userStatus = userStatusService.getByUserId(LoginHelper.getUserId()); UserStatus userStatus = userStatusService.getByUserId(LoginHelper.getUserId());
UserStatusInfoAppVo vo = BeanConvertUtil.convertTo(userStatus, UserStatusInfoAppVo::new); UserStatusInfoAppVo vo = BeanConvertUtil.convertTo(userStatus, UserStatusInfoAppVo::new);
@@ -33,7 +33,7 @@ public class UserStatusAppController {
@PostMapping("/updateMaster") @PostMapping("/updateMaster")
@Operation(summary = "修改当前用户主状态") @Operation(summary = "修改当前用户主状态")
@Log(title = "修改当前用户主状态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "修改当前用户主状态", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateMaster(@RequestBody UserStatusUpdateMasterAppReq req){ public R<Void> updateMaster(@RequestBody UserStatusUpdateMasterAppReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
userStatusService.updateStatusMaster(req); userStatusService.updateStatusMaster(req);
@@ -42,7 +42,7 @@ public class UserStatusAppController {
@PostMapping("/update") @PostMapping("/update")
@Operation(summary = "修改当前用户状态") @Operation(summary = "修改当前用户状态")
@Log(title = "修改当前用户状态", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "修改当前用户状态", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> update(@RequestBody UserStatusUpdateAppReq req){ public R<Void> update(@RequestBody UserStatusUpdateAppReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
userStatusService.updateStatus(req); userStatusService.updateStatus(req);

View File

@@ -26,7 +26,6 @@ public class UserVisitorAppController {
@PostMapping("/visitor") @PostMapping("/visitor")
@Operation(summary = "访问用户") @Operation(summary = "访问用户")
@Log(title = "访问用户", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Void> starUpdate(@RequestBody IdReq req){ public R<Void> starUpdate(@RequestBody IdReq req){
userVisitorService.visitor(LoginHelper.getUserId(),req.getId()); userVisitorService.visitor(LoginHelper.getUserId(),req.getId());
return R.ok(); return R.ok();
@@ -34,7 +33,7 @@ public class UserVisitorAppController {
@GetMapping("/me/page") @GetMapping("/me/page")
@Operation(summary = "查询谁看过我-分页") @Operation(summary = "查询谁看过我-分页")
@Log(title = "查询谁看过我-分页", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "查询谁看过我-分页", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<PageModel<UserVisitorListVo>> page(PageQuery pageQuery, UserVisitorQuery query){ public R<PageModel<UserVisitorListVo>> page(PageQuery pageQuery, UserVisitorQuery query){
query.setUserId(LoginHelper.getUserId()); query.setUserId(LoginHelper.getUserId());
Page<UserVisitorListVo> app = userVisitorService.pageApp(pageQuery, query); Page<UserVisitorListVo> app = userVisitorService.pageApp(pageQuery, query);

View File

@@ -39,7 +39,7 @@ public class VipAppController {
@GetMapping("/home") @GetMapping("/home")
@Operation(summary = "获取VIP信息") @Operation(summary = "获取VIP信息")
@Log(title = "获取VIP信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取VIP信息", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<VipHomeVo> vipHome(Integer vipType){ public R<VipHomeVo> vipHome(Integer vipType){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
List<VipPrice> vipPrices = vipPriceService.listByVipType(vipType); List<VipPrice> vipPrices = vipPriceService.listByVipType(vipType);
@@ -78,7 +78,7 @@ public class VipAppController {
} }
@PostMapping("/order/create") @PostMapping("/order/create")
@Operation(summary = "生成VIP订单") @Operation(summary = "生成VIP订单")
@Log(title = "生成VIP订单", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "生成VIP订单", businessType = BusinessType.OTHER, isSaveDb = true)
public R<OrderCreateVo> createVipOrder(@RequestBody GenVipOrderReq req){ public R<OrderCreateVo> createVipOrder(@RequestBody GenVipOrderReq req){
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
VipOrder vipOrder = vipOrderService.createVipOrder(userId, req.getVipPriceSettingId()); VipOrder vipOrder = vipOrderService.createVipOrder(userId, req.getVipPriceSettingId());

View File

@@ -47,7 +47,7 @@ public class WithdrawAppController {
@GetMapping("/setting") @GetMapping("/setting")
@Operation(summary = "获取提现配置") @Operation(summary = "获取提现配置")
@Log(title = "获取提现配置", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "获取提现配置", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false)
public R<WithdrawHomeSettingVo> vipHome(){ public R<WithdrawHomeSettingVo> vipHome(){
WithdrawHomeSettingVo vo = new WithdrawHomeSettingVo(); WithdrawHomeSettingVo vo = new WithdrawHomeSettingVo();
List<WithdrawSetting> list = withdrawSettingService.list(Wrappers.lambdaQuery(WithdrawSetting.class) List<WithdrawSetting> list = withdrawSettingService.list(Wrappers.lambdaQuery(WithdrawSetting.class)
@@ -64,7 +64,7 @@ public class WithdrawAppController {
@PostMapping("/ali/card") @PostMapping("/ali/card")
@Operation(summary = "修改支付宝信息") @Operation(summary = "修改支付宝信息")
@Log(title = "修改支付宝信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "修改支付宝信息", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> updateAliCard(@RequestBody UpdateAliReq req){ public R<Void> updateAliCard(@RequestBody UpdateAliReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
userBankCardService.updateAli(req); userBankCardService.updateAli(req);
@@ -73,7 +73,7 @@ public class WithdrawAppController {
@PostMapping("/card/info") @PostMapping("/card/info")
@Operation(summary = "查询账户信息") @Operation(summary = "查询账户信息")
@Log(title = "查询账户信息", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "查询账户信息", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<UserBankCard> cardInfo(){ public R<UserBankCard> cardInfo(){
UserBankCard userBankCard = userBankCardService.getByUserId(LoginHelper.getUserId()); UserBankCard userBankCard = userBankCardService.getByUserId(LoginHelper.getUserId());
if(userBankCard == null){ if(userBankCard == null){
@@ -84,7 +84,7 @@ public class WithdrawAppController {
@PostMapping("/save") @PostMapping("/save")
@Operation(summary = "申请提现") @Operation(summary = "申请提现")
@Log(title = "申请提现", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "申请提现", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Void> save(@RequestBody WithdrawReq req){ public R<Void> save(@RequestBody WithdrawReq req){
req.setUserId(LoginHelper.getUserId()); req.setUserId(LoginHelper.getUserId());
userWithdrawService.saveWithdraw(req); userWithdrawService.saveWithdraw(req);
@@ -93,7 +93,7 @@ public class WithdrawAppController {
@GetMapping("/logs/page") @GetMapping("/logs/page")
@Operation(summary = "提现记录") @Operation(summary = "提现记录")
@Log(title = "申请记录", businessType = BusinessType.OTHER, isSaveDb = false) @Log(title = "申请记录", businessType = BusinessType.OTHER, isPrintResponseData = false,isSaveDb = false)
public R<PageModel<WithdrawListAppVo>> logsPage(PageQuery pageQuery, WithdrawListPageQuery query){ public R<PageModel<WithdrawListAppVo>> logsPage(PageQuery pageQuery, WithdrawListPageQuery query){
query.setUserId(LoginHelper.getUserId()); query.setUserId(LoginHelper.getUserId());
Page<WithdrawListAppVo> result = userWithdrawService.pageApp(pageQuery,query); Page<WithdrawListAppVo> result = userWithdrawService.pageApp(pageQuery,query);

View File

@@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bo.reportMobile != null and bo.reportMobile != ''"> <if test="bo.reportMobile != null and bo.reportMobile != ''">
and t3.mobile = #{bo.reportMobile} and t3.mobile = #{bo.reportMobile}
</if> </if>
<if test="bo.reportStatus != null ">
and t1.report_status = #{bo.reportStatus}
</if>
</where> </where>
</select> </select>