diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 67a0f4ef..06bcc3ed 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -171,5 +171,8 @@ spring: virtual-host: /cai agora: app-id: app - key: key - secret: secret + key: 627b8e17b0c616c1346cba2d87e10251 + secret: c47628fe2538 +yunxin: + app-key: 627b8e17b0c616c1346cba2d87e10251 + app-secret: c47628fe2538 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 0ae140ab..01c879bf 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -176,3 +176,6 @@ agora: app-id: app key: key secret: secret +yunxin: + app-key: 627b8e17b0c616c1346cba2d87e10251 + app-secret: c47628fe2538 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 4a402006..53f6f3c1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -135,7 +135,9 @@ security: # swagger 文档配置 - /*/api-docs - /*/api-docs/** + - /v3/api-docs/swagger-config - /doc.html + - /doc.html#/ - /swagger-resources/** - /webjars/** # actuator 监控配置 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java index 9be19ed2..b184b764 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java @@ -140,7 +140,7 @@ public class CaiLoginManager { } String key = LockManager.getDealInviteLockKey(inviteId); RLock lock = redissonClient.getLock(key); - if(!lock.isLocked()){ + if(lock.isLocked()){ log.warn("点击太快了，等一等，dealInviteId"); return; } @@ -191,7 +191,7 @@ public class CaiLoginManager { UserInfo userInfo = userInfoService.getById(user.getId()); UserInfo update = new UserInfo(); update.setUserId(user.getId()); - update.setLoginCount(userInfo.getLoginCount()+1); + update.setLoginCount(userInfo.getLoginCount()==null?0:userInfo.getLoginCount()+1); update.setLastLoginIp(ip); update.setLastLoginTime(LocalDateTime.now()); update.setLastLocation(address); @@ -239,7 +239,7 @@ public class CaiLoginManager { String usercode = userCodeGenService.getCodeGen(); User add = new User(); add.setUsercode(usercode); - add.setNickname("蜜瓜"+usercode); + add.setNickname("用户"+usercode); add.setType(0); add.setPassword(BCrypt.hashpw(user.getPassword())); add.setMobile(user.getUsername()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiRegisterUser.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiRegisterUser.java index 0ca033c8..4ddef17b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiRegisterUser.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiRegisterUser.java @@ -3,19 +3,25 @@ package com.ruoyi.cai.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotEmpty; + @Data @Schema(description = "注册模型") public class CaiRegisterUser { @Schema(description = "手机号登录名") + @NotEmpty(message = "手机号不能为空") private String username; @Schema(description = "密码") + @NotEmpty(message = "密码不能为空") private String password; @Schema(description = "密码确认") + @NotEmpty(message = "密码确认不能为空") private String passwordCheck; @Schema(description = "验证码") + @NotEmpty(message = "验证码不能为空") private String code; @Schema(description = "邀请人ID") private Long inviteId; @Schema(description = "性别") - private Integer gender; + private Integer gender = 0; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/LoginCaiUser.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/LoginCaiUser.java index 30a75b4a..7d63dd25 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/LoginCaiUser.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/LoginCaiUser.java @@ -3,11 +3,15 @@ package com.ruoyi.cai.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotEmpty; + @Data @Schema(description = "登陆入参模型") public class LoginCaiUser { @Schema(description = "用户") + @NotEmpty(message = "登录名不能为空") private String username; @Schema(description = "密码") + @NotEmpty(message = "密码不能为空") private String password; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/RegisterCode.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/RegisterCode.java index ede4ccb9..d49842bf 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/RegisterCode.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/RegisterCode.java @@ -2,7 +2,10 @@ package com.ruoyi.cai.auth; import lombok.Data; +import javax.validation.constraints.NotEmpty; + @Data public class RegisterCode { + @NotEmpty(message = "手机号不能为空") private String mobile; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/constant/RedisConstant.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/constant/RedisConstant.java index 99e90315..3e26ce79 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/constant/RedisConstant.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/constant/RedisConstant.java @@ -8,6 +8,7 @@ public class RedisConstant { public static final String DYNAMIC_TOTAL_CACHE_REDIS = REDIS_P + "synamicTotal:%s:%s"; public static final String CODE_REDIS = REDIS_P + "code:%s:%s"; public static final String USER_GREET_TOTAL_REDIS = REDIS_P + "userGreetTotal:%s:%s"; - + public static final String USER_GREET_SEND_TIME_REDIS = REDIS_P + "userGreetSendTime:%s"; public static final String BLACK_REDIS = REDIS_P + "black:%s"; } + diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java index c2638374..0e47b7cc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java @@ -42,7 +42,7 @@ public class SmsVerifyController extends BaseController { @SaCheckPermission("cai:smsVerify:list") @GetMapping("/list") public TableDataInfo list(SmsVerify bo, PageQuery pageQuery) { - Page page = smsVerifyService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = smsVerifyService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(SmsVerify::getCreateTime)); return TableDataInfo.build(page); } 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 aeff5eae..6edebcd5 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 @@ -2,13 +2,17 @@ package com.ruoyi.cai.controller.app; import cn.dev33.satoken.annotation.SaIgnore; import com.ruoyi.cai.auth.*; +import com.ruoyi.cai.domain.User; import com.ruoyi.cai.enums.CodeEnum; import com.ruoyi.cai.manager.CodeManager; import com.ruoyi.cai.service.SmsVerifyService; +import com.ruoyi.cai.service.UserService; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.exception.ServiceException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,16 +25,19 @@ import java.util.Map; @RequestMapping("/api/auth") @SaIgnore @Tag(name = "权限相关接口，免鉴权") +@Validated public class AuthAppController { @Autowired private CaiLoginManager caiLoginManager; @Autowired private SmsVerifyService smsVerifyService; + @Autowired + private UserService userService; @PostMapping("/register") @Operation(summary = "注册") - public R> register(@RequestBody CaiRegisterUser caiUser){ + public R> register(@Validated @RequestBody CaiRegisterUser caiUser){ String token = caiLoginManager.register(caiUser); Map ajax = new HashMap<>(); ajax.put("token",token); @@ -39,21 +46,25 @@ public class AuthAppController { @PostMapping("/register/code") @Operation(summary = "获取注册验证码") - public R> registerCode(@RequestBody RegisterCode code){ + public R> registerCode(@Validated @RequestBody RegisterCode code){ smsVerifyService.put(CodeEnum.REGISTER,code.getMobile()); return R.ok("发送成功"); } @PostMapping("/resetPassword/code") @Operation(summary = "获取重置密码验证码") - public R> resetPasswordCode(@RequestBody RegisterCode code){ + public R> resetPasswordCode(@Validated @RequestBody RegisterCode code){ + User user = userService.getByUsername(code.getMobile()); + if(user == null){ + throw new ServiceException("用户不存在"); + } smsVerifyService.put(CodeEnum.RESET_PASSWORD,code.getMobile()); return R.ok("发送成功"); } @PostMapping("/login") @Operation(summary = "登陆") - public R> login(@RequestBody LoginCaiUser loginBody){ + public R> login(@Validated @RequestBody LoginCaiUser loginBody){ Map ajax = new HashMap<>(); String token = caiLoginManager.login(loginBody.getUsername(), loginBody.getPassword()); ajax.put("token",token); @@ -61,10 +72,10 @@ public class AuthAppController { } @PostMapping("/resetPassword") - @Operation(summary = "获取充值密码验证码") + @Operation(summary = "重置密码") public R resetPassword(@RequestBody ResetPasswordReq code){ caiLoginManager.resetPassword(code); - return R.ok("发送成功"); + return R.ok(true); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java index 218d2714..29595869 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java @@ -28,8 +28,6 @@ public class SettingAppController { @Autowired private ReportCateService reportCateService; @Autowired - private CitysService citysService; - @Autowired private GiftService giftService; @GetMapping("/goods") @@ -57,12 +55,6 @@ public class SettingAppController { } - @GetMapping("/city") - @Operation(summary = "城市") - public R> city(){ - return R.ok(citysService.all()); - } - @GetMapping("/gift") @Operation(summary = "礼物配置") public R> gift(){ 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 74b27359..06025daf 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 @@ -12,6 +12,7 @@ import com.ruoyi.common.helper.LoginHelper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -33,7 +34,7 @@ public class UserAppController { @PostMapping("/update") @Operation(summary = "修改当前用户信息") - public R userUpdate(@RequestBody UserUpdateReq res){ + public R userUpdate(@Validated @RequestBody UserUpdateReq res){ return R.ok(currentUserManager.userUpdate(res)); } 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 d7cc59a4..b8f68b49 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 @@ -29,7 +29,7 @@ public class UserBlackAppController { } @PostMapping("black") - @Operation(summary = "拉黑操作 如果已经给拉黑则放开") + @Operation(summary = "拉黑操作") 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/UserGreetAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java index d5316665..ee1627cb 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 @@ -13,6 +13,7 @@ import com.ruoyi.common.utils.BeanConvertUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -39,9 +40,10 @@ public class UserGreetAppController { return R.ok(BeanConvertUtil.convertListTo(userGreet,UserGreetVo::new)); } - @GetMapping("/add") + @PostMapping("/add") @Operation(summary = "新增群打招呼") - public R add(@RequestBody UserGreetAddReq req){ + public R add(@Validated @RequestBody UserGreetAddReq req){ + req.setUserId(LoginHelper.getUserId()); userGreetService.addUserGreet(req); return R.ok(); } 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 49b2e662..c77c66b8 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 @@ -5,14 +5,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.AccountBankcard; import com.ruoyi.cai.domain.AccountCash; import com.ruoyi.cai.domain.AccountRecharge; +import com.ruoyi.cai.domain.RechargeOrder; import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes; import com.ruoyi.cai.dto.app.query.WithdrawReq; import com.ruoyi.cai.dto.app.vo.AccountCashVo; -import com.ruoyi.cai.dto.app.vo.AccountRechargeVo; +import com.ruoyi.cai.dto.app.vo.RechargeOrderVo; import com.ruoyi.cai.dto.app.vo.user.UserAccountVo; import com.ruoyi.cai.manager.CurrentUserManager; +import com.ruoyi.cai.pay.PayStatusEnum; import com.ruoyi.cai.service.AccountCashService; -import com.ruoyi.cai.service.AccountRechargeService; +import com.ruoyi.cai.service.RechargeOrderService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; @@ -32,7 +34,7 @@ public class WalletController { @Autowired private AccountCashService accountCashService; @Autowired - private AccountRechargeService accountRechargeService; + private RechargeOrderService rechargeOrderService; @GetMapping("/account") @Operation(summary = "快速获取当前用户账号余额信息") @@ -64,12 +66,14 @@ public class WalletController { @GetMapping("/recharge/log") @Operation(summary = "充值记录-分页") - public TableDataInfo rechargeLog(PageQuery query){ + public TableDataInfo rechargeLog(PageQuery query){ Long userId = LoginHelper.getUserId(); - Page page = accountRechargeService.page(query.build(), Wrappers.lambdaQuery(AccountRecharge.class) - .eq(AccountRecharge::getUserId, userId) - .orderByDesc(AccountRecharge::getCreateTime)); - return TableDataInfo.build(page,AccountRechargeVo::new); + Page page = rechargeOrderService.page(query.build(), Wrappers.lambdaQuery(RechargeOrder.class) + .eq(RechargeOrder::getUserId, userId) + .eq(RechargeOrder::getAdmin,false) + .eq(RechargeOrder::getPayStatus, PayStatusEnum.PAY.getCode()) + .orderByDesc(RechargeOrder::getCreateTime)); + return TableDataInfo.build(page, RechargeOrderVo::new); } @GetMapping("/cash/log") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java index d58b9530..89dd2d00 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java @@ -1,6 +1,7 @@ package com.ruoyi.cai.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -51,14 +52,17 @@ public class Gift implements Serializable { /** * 礼物描述 */ + @TableField("`desc`") private String desc; /** * 是否隐藏 0 不隐藏，可见 1 隐藏 */ + @TableField("`hide`") private Integer hide; /** * 排序 */ + @TableField("`sort`") private Integer sort; /** * 状态 0 可用 1 不可用 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardReq.java index f5263e1d..7a513539 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardReq.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/GiveGuardReq.java @@ -3,6 +3,8 @@ package com.ruoyi.cai.dto.app.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data @Schema(description = "赠送守护入参") public class GiveGuardReq { diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdRes.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdRes.java index 45c2dde0..c300f8c0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdRes.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/IdRes.java @@ -3,8 +3,11 @@ package com.ruoyi.cai.dto.app.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class IdRes { @Schema(description = "id") + @NotNull(message = "参数异常") private Long id; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java index 134cc9eb..fd86fd17 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java @@ -3,6 +3,7 @@ package com.ruoyi.cai.dto.app.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDate; import java.time.LocalDateTime; @Data @@ -14,7 +15,7 @@ public class UserUpdateReq { @Schema(description = "昵称") private String nickname; @Schema(description = "生日") - private LocalDateTime birthday; + private LocalDate birthday; @Schema(description = "性别") private Integer gender; @Schema(description = "头像") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/user/UserGreetAddReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/user/UserGreetAddReq.java index 84d872f8..9cd8ab22 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/user/UserGreetAddReq.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/user/UserGreetAddReq.java @@ -3,11 +3,15 @@ package com.ruoyi.cai.dto.app.query.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + @Data @Schema(description = "新增群达招呼") public class UserGreetAddReq { @Schema(accessMode = Schema.AccessMode.READ_ONLY) private Long userId; @Schema(description = "内容") + @NotEmpty(message = "打招呼内容不能为空") private String title; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AccountCashVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AccountCashVo.java index e62ad136..df0d4954 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AccountCashVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AccountCashVo.java @@ -14,7 +14,7 @@ public class AccountCashVo { * */ @Schema(description = "ID") - private Integer id; + private Long id; /** * */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AccountRechargeVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AccountRechargeVo.java deleted file mode 100644 index 12eb1c21..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AccountRechargeVo.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.ruoyi.cai.dto.app.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -@Data -@Schema(description = "充值记录") -public class AccountRechargeVo { - @Schema(description = "ID") - private Long id; - /** - * - */ - @Schema(description = "用户Id") - private Long userId; - /** - * - */ - @Schema(description = "充值ID") - private Long goodsId; - /** - * - */ - @Schema(description = "订单编号") - private String orderNo; - /** - * 订单名 - */ - @Schema(description = "订单名称") - private String orderName; - /** - * 充值类型 0 手工充值 1 线上充值 - */ - @Schema(description = "充值类型") - private Integer rechargeType; - /** - * 充值金额 - */ - @Schema(description = "充值金额") - private BigDecimal rechargeMoney; - /** - * 充值的紫贝 - */ - @Schema(description = "紫贝数量") - private Integer coinNum; - /** - * 充值平台类型 - */ - @Schema(description = "平台") - private Long platformType; - /** - * 充值平台名称 - */ - @Schema(description = "平台名称") - private String platformName; - /** - * - */ - private String payNo; - /** - * - */ - private String operateIp; - /** - * 类型: 0积分(默认)，1会员 - */ - @Schema(description = "0-充值 1-会员") - private Integer type; - @Schema(description = "充值时间") - private LocalDateTime createTime; -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AnchorListVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AnchorListVo.java index 8820d11c..57e5844a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AnchorListVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AnchorListVo.java @@ -8,6 +8,9 @@ import java.math.BigDecimal; @Data @Schema(description = "主播列表信息") public class AnchorListVo { + + @Schema(description = "用户ID") + private String userId; /** * 头像 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java index 273159d4..14dc9dfd 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java @@ -37,16 +37,9 @@ public class DynamicVo { */ @Schema(description = "是否有附件 0 没有 1 有") private Integer isAttach; - /** - * 状态 0 审核中 1可用 2 不可用 - */ - @Schema(description = "状态 0 审核中 1可用 2 不可用") - private Integer status; - /** - * 排序字段 - */ - @Schema(description = "排序字段") - private Long sort; + + @Schema(description = "审核状态") + private Integer auditStatus; @Schema(description = "创建时间") private LocalDateTime createTime; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/GiftVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/GiftVo.java index d57e0d87..674b7a5e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/GiftVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/GiftVo.java @@ -1,30 +1,38 @@ package com.ruoyi.cai.dto.app.vo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.print.attribute.standard.Media; import java.io.Serializable; @Data public class GiftVo implements Serializable { - private Integer id; + @Schema(description = "礼物ID") + private Long id; /** * 类型 0 普通礼物 1svga礼物 */ + @Schema(hidden = true) private Integer type; /** * 礼物名称 */ + @Schema(description = "礼物名称") private String name; /** * 礼物价格 */ + @Schema(description = "礼物价格") private Long price; /** * 礼物图片地址 */ + @Schema(description = "图片") private String img; /** * svga地址 */ + @Schema(description = "礼物SVGA") private String svga; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/RechargeOrderVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/RechargeOrderVo.java new file mode 100644 index 00000000..697cb0c0 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/RechargeOrderVo.java @@ -0,0 +1,50 @@ +package com.ruoyi.cai.dto.app.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +@Schema(description = "充值记录") +public class RechargeOrderVo { + + /** + * 用户ID + */ + private Long userId; + /** + * 商品ID + */ + @Schema(description = "商品ID") + private Long rechargeId; + /** + * 商品名称 + */ + @Schema(description = "商品名称") + private String rechargeName; + /** + * 充值紫贝 + */ + @Schema(description = "充值紫贝") + private Long rechargeCoin; + /** + * 价格 + */ + @Schema(description = "价格") + private BigDecimal price; + /** + * 订单号 + */ + @Schema(description = "订单号") + private String orderNo; + @Schema(description = "状态 0-待支付 1-已支付 2-已退款 10-无需支付") + private Integer payStatus; + + @Schema(description = "充值时间") + private LocalDateTime createTime; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/UserGiftIndexVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/UserGiftIndexVo.java index 0729c9a1..6a174e63 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/UserGiftIndexVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/index/UserGiftIndexVo.java @@ -19,6 +19,6 @@ public class UserGiftIndexVo { @Schema(description = "礼物价格") private String price; @Schema(description = "礼物数量") - private Long count; + private Long giftCount; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAccountVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAccountVo.java index 13ce3bfc..f49b7ca5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAccountVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAccountVo.java @@ -22,6 +22,4 @@ public class UserAccountVo { @Schema(description = "收益的紫贝") private Long incomeCoin; - @Schema(description = "总数量") - private Long totalCoin; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserBaseVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserBaseVo.java index be426bb4..478c34ab 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserBaseVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserBaseVo.java @@ -7,6 +7,8 @@ import lombok.Data; @Data public class UserBaseVo { + @Schema(description = "用户Id") + private Long userId; /** * 头像 */ @@ -24,7 +26,7 @@ public class UserBaseVo { @Schema(description = "城市ID") private Integer cityId; @Schema(description = "城市") - private Integer city; + private String city; /** * 昵称 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserGreetVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserGreetVo.java index 26e5624a..fddddd3f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserGreetVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserGreetVo.java @@ -17,12 +17,12 @@ public class UserGreetVo { /** * 标题 */ - @Schema(description = "标题") + @Schema(description = "内容") private String title; /** * 审核状态 */ @Schema(description = "审核状态 1 审核中, 2 审核通过, 3 审核不通过") - private Integer status; + private Integer auditStatus; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java index af41f15e..5f31814e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java @@ -9,6 +9,6 @@ import java.time.LocalDateTime; @Data @Schema(description = "用户列表返回") public class UserListVo extends UserBaseVo { - @Schema(description = "绑定时间") + @Schema(description = "最后活跃时间") private LocalDateTime bindTime; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserStarOrVisitorList.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserStarOrVisitorList.java index 628d69e3..5809df9f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserStarOrVisitorList.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserStarOrVisitorList.java @@ -5,7 +5,7 @@ import lombok.Data; import java.time.LocalDateTime; @Data -public class UserStarOrVisitorList { +public class UserStarOrVisitorList extends UserBaseVo { private LocalDateTime happenTime; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index 83eeb51c..a760d770 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -52,8 +52,9 @@ public class CurrentUserManager { Long userId = LoginHelper.getUserId(); User user = userService.getById(userId); CurrentUserInfoVo res = BeanConvertUtil.convertTo(user, CurrentUserInfoVo::new); + res.setUserId(userId); Anchor anchor = anchorService.getByUserId(userId); - res.setOpenVideoStatus(anchor.getOpenVideoStatus()); + res.setOpenVideoStatus(anchor == null ? 1 : anchor.getOpenVideoStatus()); UserCount userCount = userCountService.getByUserId(userId); res.setUserCount(BeanConvertUtil.convertTo(userCount, UserCountVo::new)); Account account = accountService.getByUserId(userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java index eb141bb7..a77479b8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java @@ -14,12 +14,12 @@ import org.apache.ibatis.annotations.Param; */ public interface AccountMapper extends BaseMapper { - long decrCoin(@Param("userId") Long userId, @Param("coin") Long coin); + boolean decrCoin(@Param("userId") Long userId, @Param("coin") Long coin); - long incsCoin(@Param("userId") Long userId, @Param("coin") Long coin); + boolean incsCoin(@Param("userId") Long userId, @Param("coin") Long coin); - void incsIncomeCoin(@Param("userId") Long userId, @Param("incomeCoin") Long incomeCoin); - long decrIncomeCoin(@Param("userId") Long userId, @Param("incomeCoin") Long incomeCoin); + boolean incsIncomeCoin(@Param("userId") Long userId, @Param("incomeCoin") Long incomeCoin); + boolean decrIncomeCoin(@Param("userId") Long userId, @Param("incomeCoin") Long incomeCoin); Page pageAdmin(@Param("build") Page build, @Param("bo") AccountAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java index c0b315aa..5c5b2abc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java @@ -15,6 +15,7 @@ import com.ruoyi.cai.util.NumCaUtil; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -55,18 +56,18 @@ public class AccountServiceImpl extends ServiceImpl impl throw new ServiceException("余额不足"); } boolean flag = false; - long coin = account.getCoin(); - long incomeCoin = 0; + long coin = -amount; // 消费余额 + long incomeCoin = 0; // 消费收益 long diff = account.getCoin() - amount; // 充值币够用 if(diff > 0){ - long l = baseMapper.decrCoin(userId, coin); - flag = l > 0; + flag = baseMapper.decrCoin(userId, -coin); } else { // 充值币不够用 + coin = -account.getCoin(); incomeCoin = diff; - long decrCoin = baseMapper.decrCoin(userId, account.getCoin()); - long decrIncomeCoin = baseMapper.decrIncomeCoin(userId, -diff); - if(decrCoin > 0 && decrIncomeCoin > 0){ + boolean decrCoin = baseMapper.decrCoin(userId, -coin); + boolean decrIncomeCoin = baseMapper.decrIncomeCoin(userId, -diff); + if(decrCoin && decrIncomeCoin){ flag = true; } } @@ -88,8 +89,9 @@ public class AccountServiceImpl extends ServiceImpl impl if(incomeCoin != 0){ accountChangeLogService.saveLogNoAdmin(userId,consumeLog.getSourceUsercode(), RechargeTypeEnum.COIN_INCOME,businessEnum.getSourceEnum(),incomeCoin,consumeLog.getTraceId()); } + // 记录接收方的流水 if(targetUserId != null){ - accountChangeLogService.saveLogNoAdmin(targetUserId,consumeLog.getTargetUsercode(), RechargeTypeEnum.COIN_INCOME,businessEnum.getTargetEnum(),incomeCoin,consumeLog.getTraceId()); + accountChangeLogService.saveLogNoAdmin(targetUserId,consumeLog.getTargetUsercode(), RechargeTypeEnum.COIN_INCOME,businessEnum.getTargetEnum(),consumeLog.getAnchorAmount(),consumeLog.getTraceId()); } // 获取分销的比例和用户 consumeLogService.calculateInitFenxiao(consumeLog); @@ -108,8 +110,8 @@ public class AccountServiceImpl extends ServiceImpl impl if(account.getIncomeCoin() < incomeCoin){ throw new ServiceException("需"+incomeCoin+"紫贝才可提现"); } - long incs = baseMapper.decrIncomeCoin(userId, incomeCoin); - if(incs <= 0){ + boolean incs = baseMapper.decrIncomeCoin(userId, incomeCoin); + if(!incs){ throw new ServiceException("需"+incomeCoin+"紫贝才可提现"); } accountChangeLogService.saveLogNoAdmin(user.getId(),user.getUsercode(), RechargeTypeEnum.COIN_INCOME,AccountBusinessEnum.WITHDRAW.getSourceEnum(),incomeCoin,traceId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java index b992fa5f..1b556c6f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java @@ -114,6 +114,7 @@ public class ConsumeLogServiceImpl extends ServiceImpl 0){ @@ -167,11 +167,11 @@ public class RechargeOrderServiceImpl extends ServiceImpl if(userGreet == null || !userGreet.getUserId().equals(userId)){ throw new ServiceException("请选择打招呼内容"); } - if(userGreet.getAuditStatus() != 1){ + if(AuditStatusEnum.SUCCESS.getCode().equals(userGreet.getAuditStatus())){ throw new ServiceException("内容未通过审核"); } String lockKey = LockManager.getSendGreetLock(userId); RLock lock = redissonClient.getLock(lockKey); - if(!lock.isLocked()){ + if(lock.isLocked()){ throw new ServiceException("操作太频繁"); } try { @@ -118,8 +119,8 @@ public class UserGreetServiceImpl extends ServiceImpl if(val != null && Long.parseLong(val) > max){ throw new ServiceException("您今天打招呼的次数已经用完了"); } - String sendGreetLock = LockManager.getSendGreetLock(userId); - String lastTime = stringRedisTemplate.opsForValue().getAndExpire(sendGreetLock, 1, TimeUnit.DAYS); + String sendGreetCount = String.format(RedisConstant.USER_GREET_SEND_TIME_REDIS,userId); + String lastTime = stringRedisTemplate.opsForValue().get(sendGreetCount); if(StringUtils.isNotBlank(lastTime)){ Integer inter = systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.GREET_INTERVAL_MIN); long jiange = Long.parseLong(lastTime) - DateUtil.currentSeconds(); @@ -140,7 +141,7 @@ public class UserGreetServiceImpl extends ServiceImpl if(!r.isSuccess()){ throw new ServiceException("发送失败"); } - stringRedisTemplate.opsForValue().set(sendGreetLock,DateUtil.currentSeconds()+"",1,TimeUnit.DAYS); + stringRedisTemplate.opsForValue().set(sendGreetCount,DateUtil.currentSeconds()+"",1,TimeUnit.DAYS); stringRedisTemplate.opsForValue().increment(numKey); stringRedisTemplate.expire(numKey,1,TimeUnit.DAYS); }finally { diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java index 06146c7a..42168d41 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java @@ -44,7 +44,7 @@ public class UserInviteServiceImpl extends ServiceImpl implements UserVisitorService { @Autowired private UserCountService userCountService; + @Autowired + private UserService userService; @Override public boolean visitor(StarOrVisitorReq starOrVisitorReq) { + User user = userService.getById(starOrVisitorReq.getToUserId()); + if(user == null){ + log.error("用户不存在"); + return false; + } Long fromUserId = LoginHelper.getUserId(); UserVisitor userVisitor = this.getOne(Wrappers.lambdaQuery(UserVisitor.class) .eq(UserVisitor::getVisitorId, fromUserId) @@ -49,6 +59,9 @@ public class UserVisitorServiceImpl extends ServiceImpl pageApp(PageQuery pageQuery, VisitorQuery query) { + if(query.getType() == null || (query.getType() != 1 && query.getType() != 2)){ + throw new ServiceException("参数异常"); + } query.setUserId(LoginHelper.getUserId()); return baseMapper.pageApp(pageQuery.build(),query); } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml index a8c3fd47..cc5a1b15 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml @@ -22,13 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update cai_account set coin = coin - #{coin} - where user_id = #{userId} and (coin - #{coin}) > 0 + where user_id = #{userId} and (coin - #{coin}) >= 0 update cai_account set income_coin = income_coin - #{incomeCoin} - where user_id = #{userId} and (income_coin - #{incomeCoin}) > 0 + where user_id = #{userId} and (income_coin - #{incomeCoin}) >= 0 diff --git a/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml index 8d3b8525..724c1af3 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by t1.create_time desc diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserBlacklistMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserBlacklistMapper.xml index 9a047664..946bb8bd 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserBlacklistMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserBlacklistMapper.xml @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t1.create_time as happen_time,t1.is_watch, - t2.avatar,t2.gender,t2.city,t2.nickname,t2.usercode,t2.age + t2.id as user_id, + t2.avatar,t2.gender,t2.city_id,t2.city,t2.nickname,t2.usercode,t2.age from cai_user_visitor t1 join cai_user t2 on t1.user_id = t2.id @@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.user_id = #{query.userId} - order by create_time desc + order by t1.create_time desc diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 6c28ec4b..1b9e576a 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -151,7 +151,7 @@ com.github.xiaoymin knife4j-openapi3-spring-boot-starter - 4.1.0 + 4.2.0 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java index 1cf75ad0..303ef31b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java @@ -30,7 +30,7 @@ public class PageQuery implements Serializable { * 分页大小 */ @Schema(description = "分页大小") - private Integer pageSize; + private Integer pageSize = 20; /** * 当前页数 @@ -58,7 +58,8 @@ public class PageQuery implements Serializable { /** * 每页显示记录数 默认值 默认查全部 */ - public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; +// public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; + public static final int DEFAULT_PAGE_SIZE = 20; public Page build() { Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java index e44ce90c..93dc387a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java @@ -62,7 +62,7 @@ public class GlobalExceptionHandler { public R handleNotLoginException(NotLoginException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI, e.getMessage()); - return R.fail(HttpStatus.HTTP_UNAUTHORIZED, "认证失败，无法访问系统资源"); + return R.fail(HttpStatus.HTTP_UNAUTHORIZED, "认证失败,请登录"); } /** @@ -147,7 +147,7 @@ public class GlobalExceptionHandler { public R handleRuntimeException(RuntimeException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生未知异常.", requestURI, e); - return R.fail(e.getMessage()); + return R.fail("系统异常"); } /** @@ -157,7 +157,7 @@ public class GlobalExceptionHandler { public R handleException(Exception e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生系统异常.", requestURI, e); - return R.fail(e.getMessage()); + return R.fail("系统异常"); } /** diff --git a/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/config/YunxinProperties.java b/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/config/YunxinProperties.java index 3c3e4ca2..93db0e66 100644 --- a/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/config/YunxinProperties.java +++ b/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/config/YunxinProperties.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties(prefix = "yunxin") public class YunxinProperties { - private String baseUrl = "https://api.netease.im/nimserver"; + private String baseUrl = "https://api.netease.im"; private String appKey; private String appSecret; diff --git a/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/interceptor/GlodonTokenInterceptor.java b/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/interceptor/GlodonTokenInterceptor.java index 788d7b56..0f878b61 100644 --- a/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/interceptor/GlodonTokenInterceptor.java +++ b/ruoyi-yunxin/src/main/java/com/ruoyi/yunxin/interceptor/GlodonTokenInterceptor.java @@ -13,6 +13,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.security.MessageDigest; + @Slf4j @Component public class GlodonTokenInterceptor implements Interceptor { @@ -27,7 +29,7 @@ public class GlodonTokenInterceptor implements Interceptor { request.addHeader("AppKey",yunxinProperties.getAppKey()); request.addHeader("Nonce", nonce); request.addHeader("CurTime", curTime); - request.addHeader("CheckSum", yunxinProperties.getAppSecret()+nonce+curTime); + request.addHeader("CheckSum", getCheckSum(yunxinProperties.getAppSecret(),nonce,curTime)); return true; } @@ -53,4 +55,36 @@ public class GlodonTokenInterceptor implements Interceptor { response.getContent()); } + // 计算并获取CheckSum + public static String getCheckSum(String appSecret, String nonce, String curTime) { + return encode("sha1", appSecret + nonce + curTime); + } + + private static String encode(String algorithm, String value) { + if (value == null) { + return null; + } + try { + MessageDigest messageDigest + = MessageDigest.getInstance(algorithm); + messageDigest.update(value.getBytes()); + return getFormattedText(messageDigest.digest()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private static String getFormattedText(byte[] bytes) { + int len = bytes.length; + StringBuilder buf = new StringBuilder(len * 2); + for (int j = 0; j < len; j++) { + buf.append(HEX_DIGITS[(bytes[j] >> 4) & 0x0f]); + buf.append(HEX_DIGITS[bytes[j] & 0x0f]); + } + return buf.toString(); + } + + private static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; + }