This commit is contained in:
duteliang
2024-01-31 00:07:11 +08:00
parent bc1d9a3e60
commit 377e343ee7
93 changed files with 81 additions and 81 deletions

View File

@@ -336,7 +336,7 @@
<module>ruoyi-sms</module>
<module>ruoyi-cai</module>
<module>ruoyi-yunxin</module>
<module>ruoyi-ad-websocket</module>
<module>ruoyi-websocket-boot</module>
</modules>
<packaging>pom</packaging>

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.cai.domain.AgreementSetting;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.metadata.IPage;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.cai.dto.admin.SystemConfigResponse;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import com.ruoyi.cai.dto.admin.vo.unread.UnreadData;
import com.ruoyi.cai.manager.UnreadManager;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.net.Ipv4Util;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin;
package com.ruoyi.web.controller.cai.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.back;
package com.ruoyi.web.controller.cai.admin.back;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.back;
package com.ruoyi.web.controller.cai.admin.back;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.back;
package com.ruoyi.web.controller.cai.admin.back;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.back;
package com.ruoyi.web.controller.cai.admin.back;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.back;
package com.ruoyi.web.controller.cai.admin.back;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.back;
package com.ruoyi.web.controller.cai.admin.back;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.back;
package com.ruoyi.web.controller.cai.admin.back;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.init;
package com.ruoyi.web.controller.cai.admin.init;
import com.ruoyi.cai.service.CitysService;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.init;
package com.ruoyi.web.controller.cai.admin.init;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.admin.init;
package com.ruoyi.web.controller.cai.admin.init;
import com.ruoyi.cai.mq.AmqpProducer;
import lombok.RequiredArgsConstructor;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import cn.hutool.core.util.PhoneUtil;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.ruoyi.cai.dto.app.query.AnchorUpdateReq;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.PhoneUtil;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.ruoyi.cai.domain.RechargeOrder;
import com.ruoyi.cai.domain.VipOrder;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.cai.dto.FileResp;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.ruoyi.cai.dto.app.dto.ImMessageDTO;
import com.ruoyi.cai.dto.app.vo.ImResp;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import cn.dev33.satoken.annotation.SaIgnore;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.ruoyi.cai.dto.app.query.UserReportReq;
import com.ruoyi.cai.dto.app.query.push.PushErrorReq;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.alibaba.fastjson2.JSON;
import com.alipay.api.AlipayApiException;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.dto.app.RankIdReq;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.ruoyi.cai.chat.ChatManager;
import com.ruoyi.cai.dto.app.query.CallReq;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.cai.domain.Gift;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.ruoyi.cai.dto.app.query.AlbumAddReq;
import com.ruoyi.cai.dto.app.query.AlbumResetReq;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.dto.app.query.BlackQuery;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.dto.app.query.DynamicAddReq;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.domain.UserGreet;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.app;
package com.ruoyi.web.controller.cai.app;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.controller.test;
package com.ruoyi.web.controller.cai.test;
import com.ruoyi.cai.domain.RechargeOrder;
import com.ruoyi.cai.domain.VipOrder;

View File

@@ -16,7 +16,7 @@ import com.ruoyi.cai.ws.bean.Room;
import com.ruoyi.cai.ws.constant.RedisConstant;
import com.ruoyi.cai.ws.dto.WsToken;
import com.ruoyi.cai.ws.manager.WebSocketManager;
import com.ruoyi.cai.ws.util.MapGetUtil;
import com.ruoyi.common.utils.MapGetUtil;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import org.redisson.api.RMap;

View File

@@ -3,7 +3,7 @@ package com.ruoyi.cai.manager;
import com.ruoyi.cai.constant.RedisHttpConstant;
import com.ruoyi.cai.domain.UserForbid;
import com.ruoyi.cai.enums.ForbidTypeEnum;
import com.ruoyi.cai.ws.util.MapGetUtil;
import com.ruoyi.common.utils.MapGetUtil;
import org.redisson.api.RMap;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -13,7 +13,7 @@ import com.ruoyi.cai.ws.bean.UserData;
import com.ruoyi.cai.ws.cache.*;
import com.ruoyi.cai.ws.constant.HangUpEnums;
import com.ruoyi.cai.ws.constant.RoomStatusEnums;
import com.ruoyi.cai.ws.util.MapGetUtil;
import com.ruoyi.common.utils.MapGetUtil;
import com.ruoyi.cai.ws.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,4 +1,4 @@
package com.ruoyi.cai.ws.util;
package com.ruoyi.common.utils;
import java.math.BigDecimal;

View File

@@ -9,7 +9,7 @@
<version>4.8.2</version>
</parent>
<artifactId>ruoyi-ad-websocket</artifactId>
<artifactId>ruoyi-websocket-boot</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>