2.0版本

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/cofing/GptConfig.java

@@ -0,0 +1,31 @@
+package org.ruoyi.system.cofing;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * gpt配置
+ *
+ * @author ashinnotfound
+ * @date 2023/03/04
+ */
+@Data
+@Component
+@ConfigurationProperties("gpt")
+public class GptConfig {
+    private String baseUrl;
+    private String model;
+    private Integer maxToken;
+    private Double temperature;
+    private List<String> basicPrompt;
+    private List<String> apiKey;
+    private Long ofSeconds;
+    private String imageQuality;
+    private String imageStyle;
+    private String audioModel;
+    private String audioVoice;
+    private Double audioSpeed;
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/cofing/OkHttpConfig.java

@@ -0,0 +1,48 @@
+package org.ruoyi.system.cofing;
+
+import jakarta.annotation.PostConstruct;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.utils.OkHttpUtil;
+import org.ruoyi.system.domain.bo.SysModelBo;
+import org.ruoyi.system.domain.vo.SysModelVo;
+import org.ruoyi.system.service.ISysModelService;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@RequiredArgsConstructor
+public class OkHttpConfig {
+
+    private final ISysModelService sysModelService;
+    private final Map<String, OkHttpUtil> okHttpUtilMap = new HashMap<>();
+    @Getter
+    private String generate;
+
+    @PostConstruct
+    public void init() {
+        initializeOkHttpUtil("suno");
+        initializeOkHttpUtil("luma");
+    }
+
+    private void initializeOkHttpUtil(String modelName) {
+        SysModelBo sysModelBo = new SysModelBo();
+        sysModelBo.setModelName(modelName);
+        List<SysModelVo> sysModelList = sysModelService.queryList(sysModelBo);
+        if (!sysModelList.isEmpty()) {
+            SysModelVo model = sysModelList.get(0);
+            OkHttpUtil okHttpUtil = new OkHttpUtil();
+            okHttpUtil.setApiHost(model.getApiHost());
+            okHttpUtil.setApiKey(model.getApiKey());
+            generate = String.valueOf(model.getModelPrice());
+            okHttpUtilMap.put(modelName, okHttpUtil);
+        }
+    }
+
+    public OkHttpUtil getOkHttpUtil(String modelName) {
+        return okHttpUtilMap.get(modelName);
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/cofing/QqConfig.java

@@ -0,0 +1,21 @@
+package org.ruoyi.system.cofing;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * qq配置
+ *
+ * @author ashinnotfound
+ * @date 2023/03/04
+ */
+@Data
+@Component
+@ConfigurationProperties("qq")
+public class QqConfig {
+    private Boolean enable;
+    private Long account;
+    private Boolean acceptNewFriend;
+    private Boolean acceptNewGroup;
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/cofing/WxMaConfiguration.java

@@ -0,0 +1,132 @@
+package org.ruoyi.system.cofing;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.bean.WxMaKefuMessage;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
+import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.error.WxRuntimeException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.io.File;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Admin
+ */
+@Slf4j
+@Configuration
+@EnableConfigurationProperties(WxMaProperties.class)
+public class WxMaConfiguration {
+    private final WxMaProperties properties;
+
+    @Autowired
+    public WxMaConfiguration(WxMaProperties properties) {
+        this.properties = properties;
+    }
+
+    @Bean
+    public WxMaService wxMaService() {
+        List<WxMaProperties.Config> configs = this.properties.getConfigs();
+        if (configs == null) {
+            throw new WxRuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！");
+        }
+        WxMaService maService = new WxMaServiceImpl();
+        maService.setMultiConfigs(
+            configs.stream()
+                .map(a -> {
+                    WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+//                WxMaDefaultConfigImpl config = new WxMaRedisConfigImpl(new JedisPool());
+                    // 使用上面的配置时，需要同时引入jedis-lock的依赖，否则会报类无法找到的异常
+                    config.setAppid(a.getAppid());
+                    config.setSecret(a.getSecret());
+                    config.setToken(a.getToken());
+                    config.setAesKey(a.getAesKey());
+                    config.setMsgDataFormat(a.getMsgDataFormat());
+                    return config;
+                }).collect(Collectors.toMap(WxMaDefaultConfigImpl::getAppid, a -> a, (o, n) -> o)));
+        return maService;
+    }
+
+    @Bean
+    public WxMaMessageRouter wxMaMessageRouter(WxMaService wxMaService) {
+        final WxMaMessageRouter router = new WxMaMessageRouter(wxMaService);
+        router
+            .rule().handler(logHandler).next()
+            .rule().async(false).content("订阅消息").handler(subscribeMsgHandler).end()
+            .rule().async(false).content("文本").handler(textHandler).end()
+            .rule().async(false).content("图片").handler(picHandler).end()
+            .rule().async(false).content("二维码").handler(qrcodeHandler).end();
+        return router;
+    }
+
+    private final WxMaMessageHandler subscribeMsgHandler = (wxMessage, context, service, sessionManager) -> {
+        service.getMsgService().sendSubscribeMsg(WxMaSubscribeMessage.builder()
+            .templateId("此处更换为自己的模板id")
+            .data(Lists.newArrayList(
+                new WxMaSubscribeMessage.MsgData("keyword1", "339208499")))
+            .toUser(wxMessage.getFromUser())
+            .build());
+        return null;
+    };
+
+    private final WxMaMessageHandler logHandler = (wxMessage, context, service, sessionManager) -> {
+        log.info("收到消息：" + wxMessage.toString());
+        service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("收到信息为：" + wxMessage.toJson())
+            .toUser(wxMessage.getFromUser()).build());
+        return null;
+    };
+
+    private final WxMaMessageHandler textHandler = (wxMessage, context, service, sessionManager) -> {
+        service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("回复文本消息")
+            .toUser(wxMessage.getFromUser()).build());
+        return null;
+    };
+
+    private final WxMaMessageHandler picHandler = (wxMessage, context, service, sessionManager) -> {
+        try {
+            WxMediaUploadResult uploadResult = service.getMediaService()
+                .uploadMedia("image", "png",
+                    ClassLoader.getSystemResourceAsStream("tmp.png"));
+            service.getMsgService().sendKefuMsg(
+                WxMaKefuMessage
+                    .newImageBuilder()
+                    .mediaId(uploadResult.getMediaId())
+                    .toUser(wxMessage.getFromUser())
+                    .build());
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    };
+
+    private final WxMaMessageHandler qrcodeHandler = (wxMessage, context, service, sessionManager) -> {
+        try {
+            final File file = service.getQrcodeService().createQrcode("123", 430);
+            WxMediaUploadResult uploadResult = service.getMediaService().uploadMedia("image", file);
+            service.getMsgService().sendKefuMsg(
+                WxMaKefuMessage
+                    .newImageBuilder()
+                    .mediaId(uploadResult.getMediaId())
+                    .toUser(wxMessage.getFromUser())
+                    .build());
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    };
+
+}
+

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/cofing/WxMaProperties.java

@@ -0,0 +1,52 @@
+package org.ruoyi.system.cofing;
+
+/**
+ * 微信小程序属性配置类
+ *
+ * @author: wangle
+ * @date: 2023/5/18
+ */
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.List;
+
+/**
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Data
+@ConfigurationProperties(prefix = "wx.miniapp")
+public class WxMaProperties {
+
+    private List<Config> configs;
+
+    @Data
+    public static class Config {
+        /**
+         * 设置微信小程序的appid
+         */
+        private String appid;
+
+        /**
+         * 设置微信小程序的Secret
+         */
+        private String secret;
+
+        /**
+         * 设置微信小程序消息服务器配置的token
+         */
+        private String token;
+
+        /**
+         * 设置微信小程序消息服务器配置的EncodingAESKey
+         */
+        private String aesKey;
+
+        /**
+         * 消息格式，XML或者JSON
+         */
+        private String msgDataFormat;
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/monitor/CacheController.java

@@ -0,0 +1,55 @@
+package org.ruoyi.system.controller.monitor;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.system.domain.vo.CacheListInfoVo;
+import lombok.RequiredArgsConstructor;
+import org.redisson.spring.data.connection.RedissonConnectionFactory;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+/**
+ * 缓存监控
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/cache")
+public class CacheController {
+
+    private final RedissonConnectionFactory connectionFactory;
+
+    /**
+     * 获取缓存监控列表
+     */
+    @SaCheckPermission("monitor:cache:list")
+    @GetMapping()
+    public R<CacheListInfoVo> getInfo() throws Exception {
+        RedisConnection connection = connectionFactory.getConnection();
+        Properties commandStats = connection.commands().info("commandstats");
+
+        List<Map<String, String>> pieList = new ArrayList<>();
+        if (commandStats != null) {
+            commandStats.stringPropertyNames().forEach(key -> {
+                Map<String, String> data = new HashMap<>(2);
+                String property = commandStats.getProperty(key);
+                data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+                data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+                pieList.add(data);
+            });
+        }
+
+        CacheListInfoVo infoVo = new CacheListInfoVo();
+        infoVo.setInfo(connection.commands().info());
+        infoVo.setDbSize(connection.commands().dbSize());
+        infoVo.setCommandStats(pieList);
+        return R.ok(infoVo);
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/monitor/SysLogininforController.java

@@ -0,0 +1,89 @@
+package org.ruoyi.system.controller.monitor;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.ruoyi.common.core.constant.GlobalConstants;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.redis.utils.RedisUtils;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysLogininforBo;
+import org.ruoyi.system.domain.vo.SysLogininforVo;
+import org.ruoyi.system.service.ISysLogininforService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 系统访问记录
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/logininfor")
+public class SysLogininforController extends BaseController {
+
+    private final ISysLogininforService logininforService;
+
+    /**
+     * 获取系统访问记录列表
+     */
+    @SaCheckPermission("monitor:logininfor:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysLogininforVo> list(SysLogininforBo logininfor, PageQuery pageQuery) {
+        return logininforService.selectPageLogininforList(logininfor, pageQuery);
+    }
+
+    /**
+     * 导出系统访问记录列表
+     */
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("monitor:logininfor:export")
+    @PostMapping("/export")
+    public void export(SysLogininforBo logininfor, HttpServletResponse response) {
+        List<SysLogininforVo> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil.exportExcel(list, "登录日志", SysLogininforVo.class, response);
+    }
+
+    /**
+     * 批量删除登录日志
+     * @param infoIds 日志ids
+     */
+    @SaCheckPermission("monitor:logininfor:remove")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{infoIds}")
+    public R<Void> remove(@PathVariable Long[] infoIds) {
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    /**
+     * 清理系统访问记录
+     */
+    @SaCheckPermission("monitor:logininfor:remove")
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public R<Void> clean() {
+        logininforService.cleanLogininfor();
+        return R.ok();
+    }
+
+    @SaCheckPermission("monitor:logininfor:unlock")
+    @Log(title = "账户解锁", businessType = BusinessType.OTHER)
+    @GetMapping("/unlock/{userName}")
+    public R<Void> unlock(@PathVariable("userName") String userName) {
+        String loginName = GlobalConstants.PWD_ERR_CNT_KEY + userName;
+        if (RedisUtils.hasKey(loginName)) {
+            RedisUtils.deleteObject(loginName);
+        }
+        return R.ok();
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/monitor/SysOperlogController.java

@@ -0,0 +1,75 @@
+package org.ruoyi.system.controller.monitor;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysOperLogBo;
+import org.ruoyi.system.domain.vo.SysOperLogVo;
+import org.ruoyi.system.service.ISysOperLogService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 操作日志记录
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/operlog")
+public class SysOperlogController extends BaseController {
+
+    private final ISysOperLogService operLogService;
+
+    /**
+     * 获取操作日志记录列表
+     */
+    @SaCheckPermission("monitor:operlog:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOperLogVo> list(SysOperLogBo operLog, PageQuery pageQuery) {
+        return operLogService.selectPageOperLogList(operLog, pageQuery);
+    }
+
+    /**
+     * 导出操作日志记录列表
+     */
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("monitor:operlog:export")
+    @PostMapping("/export")
+    public void export(SysOperLogBo operLog, HttpServletResponse response) {
+        List<SysOperLogVo> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil.exportExcel(list, "操作日志", SysOperLogVo.class, response);
+    }
+
+    /**
+     * 批量删除操作日志记录
+     * @param operIds 日志ids
+     */
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @SaCheckPermission("monitor:operlog:remove")
+    @DeleteMapping("/{operIds}")
+    public R<Void> remove(@PathVariable Long[] operIds) {
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    /**
+     * 清理操作日志记录
+     */
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @SaCheckPermission("monitor:operlog:remove")
+    @DeleteMapping("/clean")
+    public R<Void> clean() {
+        operLogService.cleanOperLog();
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/monitor/SysUserOnlineController.java

@@ -0,0 +1,90 @@
+package org.ruoyi.system.controller.monitor;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.constant.CacheConstants;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.domain.dto.UserOnlineDTO;
+import org.ruoyi.common.core.utils.StreamUtils;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.redis.utils.RedisUtils;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.SysUserOnline;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 在线用户监控
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/online")
+public class SysUserOnlineController extends BaseController {
+
+    /**
+     * 获取在线用户监控列表
+     *
+     * @param ipaddr   IP地址
+     * @param userName 用户名
+     */
+    @SaCheckPermission("monitor:online:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
+        // 获取所有未过期的 token
+        List<String> keys = StpUtil.searchTokenValue("", 0, -1, false);
+        List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
+        for (String key : keys) {
+            String token = StringUtils.substringAfterLast(key, ":");
+            // 如果已经过期则跳过
+            if (StpUtil.stpLogic.getTokenActivityTimeoutByToken(token) < -1) {
+                continue;
+            }
+            userOnlineDTOList.add(RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token));
+        }
+        if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
+            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
+                StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
+                    StringUtils.equals(userName, userOnline.getUserName())
+            );
+        } else if (StringUtils.isNotEmpty(ipaddr)) {
+            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
+                StringUtils.equals(ipaddr, userOnline.getIpaddr())
+            );
+        } else if (StringUtils.isNotEmpty(userName)) {
+            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
+                StringUtils.equals(userName, userOnline.getUserName())
+            );
+        }
+        Collections.reverse(userOnlineDTOList);
+        userOnlineDTOList.removeAll(Collections.singleton(null));
+        List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
+        return TableDataInfo.build(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     *
+     * @param tokenId token值
+     */
+    @SaCheckPermission("monitor:online:forceLogout")
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @DeleteMapping("/{tokenId}")
+    public R<Void> forceLogout(@PathVariable String tokenId) {
+        try {
+            StpUtil.kickoutByTokenValue(tokenId);
+        } catch (NotLoginException ignored) {
+        }
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatConfigController.java

@@ -0,0 +1,107 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.service.ConfigService;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.ChatConfigBo;
+import org.ruoyi.system.domain.vo.ChatConfigVo;
+import org.ruoyi.system.service.IChatConfigService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 对话配置信息
+ *
+ * @author Lion Li
+ * @date 2024-04-13
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/config")
+public class ChatConfigController extends BaseController {
+
+    private final IChatConfigService chatConfigService;
+
+    private final ConfigService configService;
+
+    /**
+     * 查询配置信息列表
+     */
+    @GetMapping("/list")
+    @SaCheckPermission("system:config:list")
+    public R<List<ChatConfigVo>> list(ChatConfigBo bo) {
+        return R.ok(chatConfigService.queryList(bo));
+    }
+
+    /**
+     * 获取对话配置信详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<ChatConfigVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(chatConfigService.queryById(id));
+    }
+
+    /**
+     * 根据参数键名查询系统参数值
+     *
+     * @param configKey 参数Key
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    public R<String> getConfigKey(@PathVariable String configKey) {
+        return R.ok(configService.getConfigValue("sys",configKey));
+    }
+
+    /**
+     * 查询系统参数
+     *
+     */
+    @GetMapping(value = "/sysConfigKey")
+    public R<List<ChatConfigVo>> getSysConfigKey() {
+        return R.ok(chatConfigService.getSysConfigValue("sys"));
+    }
+
+    /**
+     * 新增对话配置信息
+     */
+    @PostMapping("/add")
+    public R<Void> add(@RequestBody List<ChatConfigBo> boList) {
+        for (ChatConfigBo chatConfigBo : boList) {
+            if(chatConfigBo.getId() == null){
+                chatConfigService.insertByBo(chatConfigBo);
+            }else {
+                chatConfigService.updateByBo(chatConfigBo);
+            }
+        }
+        return toAjax(true);
+    }
+
+    /**
+     * 修改对话配置信息
+     */
+    @PutMapping("/edit")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ChatConfigBo bo) {
+        return toAjax(chatConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除对话配置信息
+     *
+     * @param ids 主键串
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(chatConfigService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatGptsController.java

@@ -0,0 +1,105 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.ChatGptsBo;
+import org.ruoyi.system.domain.vo.ChatGptsVo;
+import org.ruoyi.system.service.IChatGptsService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * gpts管理
+ *
+ * @author Lion Li
+ * @date 2024-07-09
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/gpts")
+public class ChatGptsController extends BaseController {
+
+    private final IChatGptsService chatGptsService;
+
+    /**
+     * 查询gpts管理列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<ChatGptsVo> list(ChatGptsBo bo, PageQuery pageQuery) {
+        return chatGptsService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出gpts管理列表
+     */
+    @SaCheckPermission("system:gpts:export")
+    @Log(title = "gpts管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatGptsBo bo, HttpServletResponse response) {
+        List<ChatGptsVo> list = chatGptsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "gpts管理", ChatGptsVo.class, response);
+    }
+
+    /**
+     * 获取gpts管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:gpts:query")
+    @GetMapping("/{id}")
+    public R<ChatGptsVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(chatGptsService.queryById(id));
+    }
+
+    /**
+     * 新增gpts管理
+     */
+    @SaCheckPermission("system:gpts:add")
+    @Log(title = "gpts管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ChatGptsBo bo) {
+        return toAjax(chatGptsService.insertByBo(bo));
+    }
+
+    /**
+     * 修改gpts管理
+     */
+    @SaCheckPermission("system:gpts:edit")
+    @Log(title = "gpts管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ChatGptsBo bo) {
+        return toAjax(chatGptsService.updateByBo(bo));
+    }
+
+    /**
+     * 删除gpts管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:gpts:remove")
+    @Log(title = "gpts管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(chatGptsService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatMessageController.java

@@ -0,0 +1,120 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.satoken.utils.LoginHelper;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.ChatMessageBo;
+import org.ruoyi.system.domain.vo.ChatMessageVo;
+import org.ruoyi.system.service.IChatMessageService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天消息
+ *
+ * @author Lion Li
+ * @date 2024-04-16
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/message")
+public class ChatMessageController extends BaseController {
+
+    private final IChatMessageService chatMessageService;
+
+    /**
+     * 查询聊天消息列表
+     */
+    @SaCheckPermission("system:message:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatMessageVo> list(ChatMessageBo bo, PageQuery pageQuery) {
+        pageQuery.setOrderByColumn("createTime");
+        pageQuery.setIsAsc("desc");
+        return chatMessageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询我的聊天消息列表
+     */
+    @GetMapping("/listByUser")
+    public R<TableDataInfo<ChatMessageVo>> listByUser(ChatMessageBo bo, PageQuery pageQuery) {
+        bo.setUserId(LoginHelper.getUserId());
+        pageQuery.setOrderByColumn("createTime");
+        pageQuery.setIsAsc("desc");
+        return R.ok(chatMessageService.queryPageList(bo, pageQuery));
+    }
+
+    /**
+     * 导出聊天消息列表
+     */
+    @SaCheckPermission("system:message:export")
+    @Log(title = "聊天消息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatMessageBo bo, HttpServletResponse response) {
+        List<ChatMessageVo> list = chatMessageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天消息", ChatMessageVo.class, response);
+    }
+
+    /**
+     * 获取聊天消息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:message:query")
+    @GetMapping("/{id}")
+    public R<ChatMessageVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(chatMessageService.queryById(id));
+    }
+
+    /**
+     * 新增聊天消息
+     */
+    @SaCheckPermission("system:message:add")
+    @Log(title = "聊天消息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ChatMessageBo bo) {
+        return toAjax(chatMessageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天消息
+     */
+    @SaCheckPermission("system:message:edit")
+    @Log(title = "聊天消息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ChatMessageBo bo) {
+        return toAjax(chatMessageService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天消息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:message:remove")
+    @Log(title = "聊天消息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(chatMessageService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatVisitorUsageController.java

@@ -0,0 +1,106 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.ChatVisitorUsageBo;
+import org.ruoyi.system.domain.vo.ChatVisitorUsageVo;
+import org.ruoyi.system.service.IChatVisitorUsageService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 访客管理
+ *
+ * @author Lion Li
+ * @date 2024-07-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/visitorUsage")
+public class ChatVisitorUsageController extends BaseController {
+
+    private final IChatVisitorUsageService chatVisitorUsageService;
+
+    /**
+     * 查询访客管理列表
+     */
+    @SaCheckPermission("system:visitorUsage:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatVisitorUsageVo> list(ChatVisitorUsageBo bo, PageQuery pageQuery) {
+        return chatVisitorUsageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出访客管理列表
+     */
+    @SaCheckPermission("system:visitorUsage:export")
+    @Log(title = "访客管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatVisitorUsageBo bo, HttpServletResponse response) {
+        List<ChatVisitorUsageVo> list = chatVisitorUsageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "访客管理", ChatVisitorUsageVo.class, response);
+    }
+
+    /**
+     * 获取访客管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:visitorUsage:query")
+    @GetMapping("/{id}")
+    public R<ChatVisitorUsageVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(chatVisitorUsageService.queryById(id));
+    }
+
+    /**
+     * 新增访客管理
+     */
+    @SaCheckPermission("system:visitorUsage:add")
+    @Log(title = "访客管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ChatVisitorUsageBo bo) {
+        return toAjax(chatVisitorUsageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改访客管理
+     */
+    @SaCheckPermission("system:visitorUsage:edit")
+    @Log(title = "访客管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ChatVisitorUsageBo bo) {
+        return toAjax(chatVisitorUsageService.updateByBo(bo));
+    }
+
+    /**
+     * 删除访客管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:visitorUsage:remove")
+    @Log(title = "访客管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(chatVisitorUsageService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatVoucherController.java

@@ -0,0 +1,123 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.ChatVoucherBo;
+import org.ruoyi.system.domain.vo.ChatVoucherVo;
+import org.ruoyi.system.service.IChatVoucherService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * 用户兑换记录
+ *
+ * @author Lion Li
+ * @date 2024-05-03
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/voucher")
+public class ChatVoucherController extends BaseController {
+
+    private final IChatVoucherService chatVoucherService;
+
+    /**
+     * 查询用户兑换记录列表
+     */
+    @SaCheckPermission("system:voucher:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatVoucherVo> list(ChatVoucherBo bo, PageQuery pageQuery) {
+        return chatVoucherService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出用户兑换记录列表
+     */
+    @SaCheckPermission("system:voucher:export")
+    @Log(title = "用户兑换记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatVoucherBo bo, HttpServletResponse response) {
+        List<ChatVoucherVo> list = chatVoucherService.queryList(bo);
+        ExcelUtil.exportExcel(list, "用户兑换记录", ChatVoucherVo.class, response);
+    }
+
+    /**
+     * 获取用户兑换记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:voucher:query")
+    @GetMapping("/{id}")
+    public R<ChatVoucherVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(chatVoucherService.queryById(id));
+    }
+
+    /**
+     * 新增用户兑换记录
+     */
+    @SaCheckPermission("system:voucher:add")
+    @Log(title = "用户兑换记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ChatVoucherBo bo) {
+        bo.setCode(UUID.randomUUID().toString().replace("-", ""));
+        return toAjax(chatVoucherService.insertByBo(bo));
+    }
+
+    /**
+     * 兑换卡密
+     *
+     * @param bo 卡密信息
+     * @return 是否兑换成功
+     */
+    @PostMapping("/redeem")
+    public R<String> redeem(@RequestBody ChatVoucherBo bo) {
+        if(chatVoucherService.redeem(bo)){
+            return R.ok("兑换成功!");
+        }else {
+            return R.fail("兑换失败,请联系管理员!");
+        }
+    }
+
+    /**
+     * 修改用户兑换记录
+     */
+    @SaCheckPermission("system:voucher:edit")
+    @Log(title = "用户兑换记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ChatVoucherBo bo) {
+        return toAjax(chatVoucherService.updateByBo(bo));
+    }
+
+    /**
+     * 删除用户兑换记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:voucher:remove")
+    @Log(title = "用户兑换记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(chatVoucherService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/PayController.java

@@ -0,0 +1,333 @@
+package org.ruoyi.system.controller.system;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
+import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.stripe.Stripe;
+import com.stripe.exception.StripeException;
+import com.stripe.model.Event;
+import com.stripe.model.Price;
+import com.stripe.model.Product;
+import com.stripe.model.checkout.Session;
+import com.stripe.net.Webhook;
+import com.stripe.param.checkout.SessionCreateParams;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.ruoyi.common.config.PayConfig;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.exception.base.BaseException;
+import org.ruoyi.common.core.service.ConfigService;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.common.oss.core.OssClient;
+import org.ruoyi.common.oss.entity.UploadResult;
+import org.ruoyi.common.oss.factory.OssFactory;
+import org.ruoyi.common.response.PayResponse;
+import org.ruoyi.common.service.PayService;
+import org.ruoyi.common.utils.MD5Util;
+import org.ruoyi.system.domain.bo.PaymentOrdersBo;
+import org.ruoyi.system.domain.bo.SysUserBo;
+import org.ruoyi.system.domain.request.OrderRequest;
+import org.ruoyi.system.domain.vo.PaymentOrdersVo;
+import org.ruoyi.system.domain.vo.SysUserVo;
+import org.ruoyi.system.service.IPaymentOrdersService;
+import org.ruoyi.system.service.ISysUserService;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pay")
+@Slf4j
+public class PayController {
+
+    private final PayService payService;
+
+    private final ISysUserService userService;
+
+    private final IPaymentOrdersService paymentOrdersService;
+
+    private final PayConfig payConfig;
+
+    private final WxPayService wxService;
+
+    private final ConfigService configService;
+
+    /**
+     * 获取支付二维码
+     *
+     * @Date 2023/7/3
+     * @return void
+     **/
+    @PostMapping("/payUrl")
+    public R<PaymentOrdersVo> payUrl(@RequestBody OrderRequest orderRequest) {
+        PaymentOrdersBo payOrder = paymentOrdersService.createPayOrder(orderRequest);
+        PaymentOrdersVo paymentOrdersVo = new PaymentOrdersVo();
+        if(!Boolean.parseBoolean(getKey("enabled"))){
+            String payUrl = payService.getPayUrl(payOrder.getOrderNo(), orderRequest.getName(), Double.parseDouble(orderRequest.getMoney()), "192.168.1.6");
+            byte[] bytes = QrCodeUtil.generatePng(payUrl, 300, 300);
+            OssClient storage = OssFactory.instance();
+            UploadResult upload=storage.upload(bytes, storage.getPath("qrCode",".png"), "image/png");
+            BeanUtil.copyProperties(payOrder,paymentOrdersVo);
+            paymentOrdersVo.setUrl(upload.getUrl());
+        }else {
+            WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
+            request.setTradeType("NATIVE");
+            request.setBody(orderRequest.getName());
+            request.setOutTradeNo(payOrder.getOrderNo());
+            request.setTotalFee(BaseWxPayRequest.yuanToFen(orderRequest.getMoney()));
+            request.setSpbillCreateIp("127.0.0.1");
+            request.setNotifyUrl(getKey("notifyUrl"));
+            request.setProductId(payOrder.getId().toString());
+            try {
+                WxPayNativeOrderResult order = wxService.createOrder(request);
+                byte[] bytes = QrCodeUtil.generatePng(order.getCodeUrl(), 300, 300);
+                OssClient storage = OssFactory.instance();
+                UploadResult upload = storage.upload(bytes, storage.getPath("qrCode",".png"), "image/png");
+                BeanUtil.copyProperties(payOrder,paymentOrdersVo);
+                paymentOrdersVo.setUrl(upload.getUrl());
+            } catch (WxPayException e) {
+                throw new BaseException("获取微信支付二维码发生错误：{}"+e.getMessage());
+            }
+        }
+        return R.ok(paymentOrdersVo);
+    }
+
+    /**
+     * 回调通知地址
+     *
+     * @Date 2023/7/3
+     * @param
+     * @return void
+     **/
+    @GetMapping("/notifyUrl")
+    public String notifyUrl(PayResponse payResponse) {
+        // 校验签名
+        String mdString = "money=" + payResponse.getMoney() + "&name=" + payResponse.getName() +
+            "&out_trade_no=" + payResponse.getOut_trade_no() + "&pid=" + payConfig.getPid() +
+            "&trade_no=" + payResponse.getTrade_no() + "&trade_status=" + payResponse.getTrade_status() +
+            "&type=" + payResponse.getType() +  payConfig.getKey();
+        String sign = MD5Util.GetMD5Code(mdString);
+        if(!sign.equals(payResponse.getSign())){
+            throw new BaseException("校验签名失败！");
+        }
+        double money = Double.parseDouble(payResponse.getMoney());
+        log.info("支付订单号{}",payResponse);
+        PaymentOrdersBo paymentOrdersBo = new PaymentOrdersBo();
+        paymentOrdersBo.setOrderNo(payResponse.getOut_trade_no());
+        List<PaymentOrdersVo> paymentOrdersList = paymentOrdersService.queryList(paymentOrdersBo);
+        if (CollectionUtil.isEmpty(paymentOrdersList)){
+            throw new BaseException("订单不存在！");
+        }
+        // 订单状态修改为已支付
+        PaymentOrdersVo paymentOrdersVo = paymentOrdersList.get(0);
+        paymentOrdersVo.setPaymentStatus("2");
+        paymentOrdersVo.setPaymentMethod(payResponse.getType());
+        BeanUtil.copyProperties(paymentOrdersVo,paymentOrdersBo);
+        paymentOrdersService.updateByBo(paymentOrdersBo);
+
+        SysUserVo sysUserVo = userService.selectUserById(paymentOrdersVo.getUserId());
+        sysUserVo.setUserBalance(sysUserVo.getUserBalance() + money);
+        SysUserBo sysUserBo = new SysUserBo();
+        BeanUtil.copyProperties(sysUserVo,sysUserBo);
+        // 设置为付费用户
+        sysUserBo.setUserGrade("1");
+        userService.updateUser(sysUserBo);
+        return "success";
+    }
+
+    /**
+     * 跳转通知地址
+     *
+     * @Date 2023/7/3
+     * @param
+     * @return void
+     **/
+    @GetMapping("/return_url")
+    public void returnUrl() {
+        log.info("return_url===========");
+    }
+
+
+    @PostMapping("/notify/wxOrder")
+    public String parseOrderNotifyResult(@RequestBody String xmlData) throws WxPayException {
+        WxPayOrderNotifyResult notifyResult = this.wxService.parseOrderNotifyResult(xmlData);
+        // TODO 根据自己业务场景需要构造返回对象
+        PaymentOrdersBo paymentOrdersBo = new PaymentOrdersBo();
+        paymentOrdersBo.setOrderNo(notifyResult.getOutTradeNo());
+        List<PaymentOrdersVo> paymentOrdersList = paymentOrdersService.queryList(paymentOrdersBo);
+        PaymentOrdersVo paymentOrdersVo = paymentOrdersList.get(0);
+        paymentOrdersVo.setPaymentStatus("2");
+        paymentOrdersVo.setPaymentMethod("wx");
+        BeanUtil.copyProperties(paymentOrdersVo,paymentOrdersBo);
+        paymentOrdersService.updateByBo(paymentOrdersBo);
+        SysUserVo sysUserVo = userService.selectUserById(paymentOrdersVo.getUserId());
+        sysUserVo.setUserBalance(sysUserVo.getUserBalance() + convertCentsToYuan(notifyResult.getTotalFee()));
+        SysUserBo sysUserBo = new SysUserBo();
+        BeanUtil.copyProperties(sysUserVo,sysUserBo);
+        // 设置为付费用户
+        sysUserBo.setUserGrade("1");
+        userService.updateUser(sysUserBo);
+        return WxPayNotifyResponse.success("success");
+    }
+
+    /**
+     * 将分转换为元，并保留精度。
+     *
+     * @param cents 分的金额，类型为Integer
+     * @return 转换后的元金额，类型为double
+     */
+    public static double convertCentsToYuan(Integer cents) {
+        // 处理空输入
+        if (cents == null) {
+            throw new IllegalArgumentException("输入的分金额不能为空");
+        }
+
+        // 100分 = 1元
+        BigDecimal centsBigDecimal = new BigDecimal(cents);
+        BigDecimal yuan = centsBigDecimal.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+        // 转换为double并返回
+        return yuan.doubleValue();
+    }
+
+    /**
+     * 获取订单信息
+     *
+     */
+    @PostMapping("/orderInfo")
+    public R<PaymentOrdersVo> orderInfo(@RequestBody  OrderRequest orderRequest) {
+        if(StringUtils.isEmpty(orderRequest.getOrderNo())){
+            throw new BaseException("订单号不能为空！");
+        }
+        PaymentOrdersBo paymentOrdersBo = new PaymentOrdersBo();
+        paymentOrdersBo.setOrderNo(orderRequest.getOrderNo());
+        List<PaymentOrdersVo> paymentOrdersList = paymentOrdersService.queryList(paymentOrdersBo);
+        if (CollectionUtil.isEmpty(paymentOrdersList)){
+            throw new BaseException("订单不存在！");
+        }
+        PaymentOrdersVo paymentOrdersVo = paymentOrdersList.get(0);
+        return R.ok(paymentOrdersVo);
+    }
+
+    // 获取支付链接
+//    static {
+//        Stripe.apiKey = "sk_test_51PMMj2KcfX4oNioqXkoKpScTsgmR55xQki2tg8MEZJYc0gjhYV85t2FzDasE06eqZb0sqyYhOp3UXhcGGQLWI4A9008aq8SOnb";
+//    }
+
+    /**
+     *   去支付
+     * 1、创建产品
+     * 2、设置价格
+     * 3、创建支付信息 得到url
+     * @return
+     */
+    @PostMapping("/stripePay")
+    public String pay(@RequestBody OrderRequest orderRequest) throws StripeException {
+
+        String enabled = configService.getConfigValue("stripe", "enabled");
+        if(!Boolean.parseBoolean(enabled)){
+            String prompt = configService.getConfigValue("stripe", "prompt");
+            throw new BaseException(prompt);
+        }
+
+        // 获取支付链接
+        Stripe.apiKey = configService.getConfigValue("stripe", "key");
+
+        // 获取金额字符串并解析为 double
+        double moneyDouble = Double.parseDouble(orderRequest.getMoney());
+
+        // 将金额转换为以分为单位的整数
+        int randMoney = (int) (moneyDouble * 100);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("name", orderRequest.getName());
+        Product product = Product.create(params);
+
+        Map<String, Object> recurring = new HashMap<>();
+        recurring.put("interval", "month");
+        Map<String, Object> params2 = new HashMap<>();
+        params2.put("unit_amount", randMoney);
+        params2.put("currency", "usd");
+        params2.put("recurring", recurring);
+        params2.put("product", product.getId());
+        Price price = Price.create(params2);
+
+        // 创建支付订单
+        PaymentOrdersBo payOrder = paymentOrdersService.createPayOrder(orderRequest);
+
+        //创建支付信息 得到url
+        SessionCreateParams params3 = SessionCreateParams.builder()
+            .setMode(SessionCreateParams.Mode.SUBSCRIPTION)
+            .setSuccessUrl(configService.getConfigValue("stripe", "success"))
+            .setCancelUrl(configService.getConfigValue("stripe", "cancel"))
+            .addLineItem(
+                SessionCreateParams.LineItem.builder()
+                    .setQuantity(1L)
+                    .setPrice(price.getId())
+                    .build()).putMetadata("orderId", payOrder.getOrderNo())
+            .build();
+        Session session = Session.create(params3);
+        return session.getUrl();
+    }
+
+    /**
+     *  支付回调
+     *
+     */
+    @PostMapping("/stripe_events")
+    public R<String> stripeEvent(HttpServletRequest request) {
+        try {
+            String endpointSecret = configService.getConfigValue("stripe", "secret");//webhook秘钥签名
+            InputStream inputStream = request.getInputStream();
+            ByteArrayOutputStream output = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024*4];
+            int n = 0;
+            while (-1 != (n = inputStream.read(buffer))) {
+                output.write(buffer, 0, n);
+            }
+            byte[] bytes = output.toByteArray();
+            String payload = new String(bytes, "UTF-8");
+            String sigHeader = request.getHeader("Stripe-Signature");
+            Event event = Webhook.constructEvent(payload, sigHeader, endpointSecret);//验签，并获取事件
+            if("checkout.session.completed".equals(event.getType())){
+                // 解析 JSON 字符串为 JSONObject
+                JSONObject jsonObject = JSONUtil.parseObj(event);
+                // 获取 metadata 对象
+                JSONObject metadata = jsonObject.getJSONObject("data")
+                    .getJSONObject("object")
+                    .getJSONObject("metadata");
+
+                OrderRequest orderRequest = new OrderRequest();
+                orderRequest.setPayType("stripe");
+                orderRequest.setOrderNo(metadata.getStr("orderId"));
+                paymentOrdersService.updatePayOrder(orderRequest);
+            }
+        } catch (Exception e) {
+            System.out.println("stripe异步通知（webhook事件）"+e);
+        }
+        return R.ok();
+    }
+
+    public String getKey(String key) {
+        return configService.getConfigValue("weixin", key);
+    }
+
+}
+

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/PaymentOrdersController.java

@@ -0,0 +1,108 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.PaymentOrdersBo;
+import org.ruoyi.system.domain.vo.PaymentOrdersVo;
+import org.ruoyi.system.service.IPaymentOrdersService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 支付订单
+ *
+ * @author Lion Li
+ * @date 2024-04-16
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/orders")
+public class PaymentOrdersController extends BaseController {
+
+    private final IPaymentOrdersService paymentOrdersService;
+
+    /**
+     * 查询支付订单列表
+     */
+    @SaCheckPermission("system:orders:list")
+    @GetMapping("/list")
+    public TableDataInfo<PaymentOrdersVo> list(PaymentOrdersBo bo, PageQuery pageQuery) {
+        pageQuery.setOrderByColumn("createTime");
+        pageQuery.setIsAsc("desc");
+        return paymentOrdersService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出支付订单列表
+     */
+    @SaCheckPermission("system:orders:export")
+    @Log(title = "支付订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PaymentOrdersBo bo, HttpServletResponse response) {
+        List<PaymentOrdersVo> list = paymentOrdersService.queryList(bo);
+        ExcelUtil.exportExcel(list, "支付订单", PaymentOrdersVo.class, response);
+    }
+
+    /**
+     * 获取支付订单详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:orders:query")
+    @GetMapping("/{id}")
+    public R<PaymentOrdersVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(paymentOrdersService.queryById(id));
+    }
+
+    /**
+     * 新增支付订单
+     */
+    @SaCheckPermission("system:orders:add")
+    @Log(title = "支付订单", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PaymentOrdersBo bo) {
+        return toAjax(paymentOrdersService.insertByBo(bo));
+    }
+
+    /**
+     * 修改支付订单
+     */
+    @SaCheckPermission("system:orders:edit")
+    @Log(title = "支付订单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PaymentOrdersBo bo) {
+        return toAjax(paymentOrdersService.updateByBo(bo));
+    }
+
+    /**
+     * 删除支付订单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:orders:remove")
+    @Log(title = "支付订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(paymentOrdersService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysConfigController.java

@@ -0,0 +1,137 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysConfigBo;
+import org.ruoyi.system.domain.vo.SysConfigVo;
+import org.ruoyi.system.service.ISysConfigService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController extends BaseController {
+
+    private final ISysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @SaCheckPermission("system:config:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysConfigVo> list(SysConfigBo config, PageQuery pageQuery) {
+        return configService.selectPageConfigList(config, pageQuery);
+    }
+
+    /**
+     * 导出参数配置列表
+     */
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:config:export")
+    @PostMapping("/export")
+    public void export(SysConfigBo config, HttpServletResponse response) {
+        List<SysConfigVo> list = configService.selectConfigList(config);
+        ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response);
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     *
+     * @param configId 参数ID
+     */
+    @SaCheckPermission("system:config:query")
+    @GetMapping(value = "/{configId}")
+    public R<SysConfigVo> getInfo(@PathVariable Long configId) {
+        return R.ok(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     *
+     * @param configKey 参数Key
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    public R<Void> getConfigKey(@PathVariable String configKey) {
+        return R.ok(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @SaCheckPermission("system:config:add")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysConfigBo config) {
+        if (!configService.checkConfigKeyUnique(config)) {
+            return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        configService.insertConfig(config);
+        return R.ok();
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @SaCheckPermission("system:config:edit")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysConfigBo config) {
+        if (!configService.checkConfigKeyUnique(config)) {
+            return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        configService.updateConfig(config);
+        return R.ok();
+    }
+
+    /**
+     * 根据参数键名修改参数配置
+     */
+    @SaCheckPermission("system:config:edit")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateByKey")
+    public R<Void> updateByKey(@RequestBody SysConfigBo config) {
+        configService.updateConfig(config);
+        return R.ok();
+    }
+
+    /**
+     * 删除参数配置
+     *
+     * @param configIds 参数ID串
+     */
+    @SaCheckPermission("system:config:remove")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public R<Void> remove(@PathVariable Long[] configIds) {
+        configService.deleteConfigByIds(configIds);
+        return R.ok();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @SaCheckPermission("system:config:remove")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public R<Void> refreshCache() {
+        configService.resetConfigCache();
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysDeptController.java

@@ -0,0 +1,120 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.convert.Convert;
+import org.ruoyi.common.core.constant.UserConstants;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysDeptBo;
+import org.ruoyi.system.domain.vo.SysDeptVo;
+import org.ruoyi.system.service.ISysDeptService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 部门信息
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/dept")
+public class SysDeptController extends BaseController {
+
+    private final ISysDeptService deptService;
+
+    /**
+     * 获取部门列表
+     */
+    @SaCheckPermission("system:dept:list")
+    @GetMapping("/list")
+    public R<List<SysDeptVo>> list(SysDeptBo dept) {
+        List<SysDeptVo> depts = deptService.selectDeptList(dept);
+        return R.ok(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     *
+     * @param deptId 部门ID
+     */
+    @SaCheckPermission("system:dept:list")
+    @GetMapping("/list/exclude/{deptId}")
+    public R<List<SysDeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+        List<SysDeptVo> depts = deptService.selectDeptList(new SysDeptBo());
+        depts.removeIf(d -> d.getDeptId().equals(deptId)
+            || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId)));
+        return R.ok(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     *
+     * @param deptId 部门ID
+     */
+    @SaCheckPermission("system:dept:query")
+    @GetMapping(value = "/{deptId}")
+    public R<SysDeptVo> getInfo(@PathVariable Long deptId) {
+        deptService.checkDeptDataScope(deptId);
+        return R.ok(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 新增部门
+     */
+    @SaCheckPermission("system:dept:add")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysDeptBo dept) {
+        if (!deptService.checkDeptNameUnique(dept)) {
+            return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        return toAjax(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @SaCheckPermission("system:dept:edit")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysDeptBo dept) {
+        Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
+        if (!deptService.checkDeptNameUnique(dept)) {
+            return R.fail("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        } else if (dept.getParentId().equals(deptId)) {
+            return R.fail("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+            && deptService.selectNormalChildrenDeptById(deptId) > 0) {
+            return R.fail("该部门包含未停用的子部门！");
+        }
+        return toAjax(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     *
+     * @param deptId 部门ID
+     */
+    @SaCheckPermission("system:dept:remove")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public R<Void> remove(@PathVariable Long deptId) {
+        if (deptService.hasChildByDeptId(deptId)) {
+            return R.warn("存在下级部门,不允许删除");
+        }
+        if (deptService.checkDeptExistUser(deptId)) {
+            return R.warn("部门存在用户,不允许删除");
+        }
+        deptService.checkDeptDataScope(deptId);
+        return toAjax(deptService.deleteDeptById(deptId));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysDictDataController.java

@@ -0,0 +1,117 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysDictDataBo;
+import org.ruoyi.system.domain.vo.SysDictDataVo;
+import org.ruoyi.system.service.ISysDictDataService;
+import org.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数据字典信息
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/dict/data")
+public class SysDictDataController extends BaseController {
+
+    private final ISysDictDataService dictDataService;
+    private final ISysDictTypeService dictTypeService;
+
+    /**
+     * 查询字典数据列表
+     */
+    @SaCheckPermission("system:dict:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysDictDataVo> list(SysDictDataBo dictData, PageQuery pageQuery) {
+        return dictDataService.selectPageDictDataList(dictData, pageQuery);
+    }
+
+    /**
+     * 导出字典数据列表
+     */
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:dict:export")
+    @PostMapping("/export")
+    public void export(SysDictDataBo dictData, HttpServletResponse response) {
+        List<SysDictDataVo> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response);
+    }
+
+    /**
+     * 查询字典数据详细
+     *
+     * @param dictCode 字典code
+     */
+    @SaCheckPermission("system:dict:query")
+    @GetMapping(value = "/{dictCode}")
+    public R<SysDictDataVo> getInfo(@PathVariable Long dictCode) {
+        return R.ok(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     *
+     * @param dictType 字典类型
+     */
+    @GetMapping(value = "/type/{dictType}")
+    public R<List<SysDictDataVo>> dictType(@PathVariable String dictType) {
+        List<SysDictDataVo> data = dictTypeService.selectDictDataByType(dictType);
+        if (ObjectUtil.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return R.ok(data);
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @SaCheckPermission("system:dict:add")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysDictDataBo dict) {
+        dictDataService.insertDictData(dict);
+        return R.ok();
+    }
+
+    /**
+     * 修改保存字典类型
+     */
+    @SaCheckPermission("system:dict:edit")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysDictDataBo dict) {
+        dictDataService.updateDictData(dict);
+        return R.ok();
+    }
+
+    /**
+     * 删除字典类型
+     *
+     * @param dictCodes 字典code串
+     */
+    @SaCheckPermission("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public R<Void> remove(@PathVariable Long[] dictCodes) {
+        dictDataService.deleteDictDataByIds(dictCodes);
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysDictTypeController.java

@@ -0,0 +1,125 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysDictTypeBo;
+import org.ruoyi.system.domain.vo.SysDictTypeVo;
+import org.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 数据字典信息
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/dict/type")
+public class SysDictTypeController extends BaseController {
+
+    private final ISysDictTypeService dictTypeService;
+
+    /**
+     * 查询字典类型列表
+     */
+    @SaCheckPermission("system:dict:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysDictTypeVo> list(SysDictTypeBo dictType, PageQuery pageQuery) {
+        return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
+    }
+
+    /**
+     * 导出字典类型列表
+     */
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:dict:export")
+    @PostMapping("/export")
+    public void export(SysDictTypeBo dictType, HttpServletResponse response) {
+        List<SysDictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil.exportExcel(list, "字典类型", SysDictTypeVo.class, response);
+    }
+
+    /**
+     * 查询字典类型详细
+     *
+     * @param dictId 字典ID
+     */
+    @SaCheckPermission("system:dict:query")
+    @GetMapping(value = "/{dictId}")
+    public R<SysDictTypeVo> getInfo(@PathVariable Long dictId) {
+        return R.ok(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @SaCheckPermission("system:dict:add")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysDictTypeBo dict) {
+        if (!dictTypeService.checkDictTypeUnique(dict)) {
+            return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dictTypeService.insertDictType(dict);
+        return R.ok();
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @SaCheckPermission("system:dict:edit")
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysDictTypeBo dict) {
+        if (!dictTypeService.checkDictTypeUnique(dict)) {
+            return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dictTypeService.updateDictType(dict);
+        return R.ok();
+    }
+
+    /**
+     * 删除字典类型
+     *
+     * @param dictIds 字典ID串
+     */
+    @SaCheckPermission("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public R<Void> remove(@PathVariable Long[] dictIds) {
+        dictTypeService.deleteDictTypeByIds(dictIds);
+        return R.ok();
+    }
+
+    /**
+     * 刷新字典缓存
+     */
+    @SaCheckPermission("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public R<Void> refreshCache() {
+        dictTypeService.resetDictCache();
+        return R.ok();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    public R<List<SysDictTypeVo>> optionselect() {
+        List<SysDictTypeVo> dictTypes = dictTypeService.selectDictTypeAll();
+        return R.ok(dictTypes);
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java

@@ -0,0 +1,182 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.lang.tree.Tree;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.constant.TenantConstants;
+import org.ruoyi.common.core.constant.UserConstants;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.satoken.utils.LoginHelper;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.SysMenu;
+import org.ruoyi.system.domain.bo.SysMenuBo;
+import org.ruoyi.system.domain.vo.MenuTreeSelectVo;
+import org.ruoyi.system.domain.vo.RouterVo;
+import org.ruoyi.system.domain.vo.SysMenuVo;
+import org.ruoyi.system.service.ISysMenuService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 菜单信息
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController {
+
+    private final ISysMenuService menuService;
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("/getRouters")
+    public R<List<RouterVo>> getRouters() {
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId());
+        return R.ok(menuService.buildMenus(menus));
+    }
+
+    /**
+     * 获取菜单列表
+     */
+    @SaCheckRole(value = {
+            TenantConstants.SUPER_ADMIN_ROLE_KEY,
+            TenantConstants.TENANT_ADMIN_ROLE_KEY
+    }, mode = SaMode.OR)
+    @SaCheckPermission("system:menu:list")
+    @GetMapping("/list")
+    public R<List<SysMenuVo>> list(SysMenuBo menu) {
+        List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+        return R.ok(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     *
+     * @param menuId 菜单ID
+     */
+    @SaCheckRole(value = {
+            TenantConstants.SUPER_ADMIN_ROLE_KEY,
+            TenantConstants.TENANT_ADMIN_ROLE_KEY
+    }, mode = SaMode.OR)
+    @SaCheckPermission("system:menu:query")
+    @GetMapping(value = "/{menuId}")
+    public R<SysMenuVo> getInfo(@PathVariable Long menuId) {
+        return R.ok(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @SaCheckRole(value = {
+            TenantConstants.SUPER_ADMIN_ROLE_KEY,
+            TenantConstants.TENANT_ADMIN_ROLE_KEY
+    }, mode = SaMode.OR)
+    @SaCheckPermission("system:menu:query")
+    @GetMapping("/treeselect")
+    public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
+        List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+        return R.ok(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     *
+     * @param roleId 角色ID
+     */
+    @SaCheckRole(value = {
+            TenantConstants.SUPER_ADMIN_ROLE_KEY,
+            TenantConstants.TENANT_ADMIN_ROLE_KEY
+    }, mode = SaMode.OR)
+    @SaCheckPermission("system:menu:query")
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public R<MenuTreeSelectVo> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+        List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
+        MenuTreeSelectVo selectVo = new MenuTreeSelectVo();
+        selectVo.setCheckedKeys(menuService.selectMenuListByRoleId(roleId));
+        selectVo.setMenus(menuService.buildMenuTreeSelect(menus));
+        return R.ok(selectVo);
+    }
+
+    /**
+     * 加载对应租户套餐菜单列表树
+     *
+     * @param packageId 租户套餐ID
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:menu:query")
+    @GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}")
+    public R<MenuTreeSelectVo> tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) {
+        List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
+        MenuTreeSelectVo selectVo = new MenuTreeSelectVo();
+        selectVo.setCheckedKeys(menuService.selectMenuListByPackageId(packageId));
+        selectVo.setMenus(menuService.buildMenuTreeSelect(menus));
+        return R.ok(selectVo);
+    }
+
+    /**
+     * 新增菜单
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:menu:add")
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysMenuBo menu) {
+        if (!menuService.checkMenuNameUnique(menu)) {
+            return R.fail("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
+            return R.fail("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        return toAjax(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:menu:edit")
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysMenuBo menu) {
+        if (!menuService.checkMenuNameUnique(menu)) {
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        return toAjax(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     *
+     * @param menuId 菜单ID
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:menu:remove")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public R<Void> remove(@PathVariable("menuId") Long menuId) {
+        if (menuService.hasChildByMenuId(menuId)) {
+            return R.warn("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId)) {
+            return R.warn("菜单已分配,不允许删除");
+        }
+        return toAjax(menuService.deleteMenuById(menuId));
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysModelController.java

@@ -0,0 +1,141 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.satoken.utils.LoginHelper;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysModelBo;
+import org.ruoyi.system.domain.bo.SysPackagePlanBo;
+import org.ruoyi.system.domain.vo.SysModelVo;
+import org.ruoyi.system.domain.vo.SysPackagePlanVo;
+import org.ruoyi.system.domain.vo.SysUserVo;
+import org.ruoyi.system.service.ISysModelService;
+import org.ruoyi.system.service.ISysPackagePlanService;
+import org.ruoyi.system.service.ISysUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 系统模型
+ *
+ * @author Lion Li
+ * @date 2024-04-04
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/model")
+public class SysModelController extends BaseController {
+
+    private final ISysModelService sysModelService;
+
+    private final ISysPackagePlanService sysPackagePlanService;
+
+    private final ISysUserService userService;
+
+
+    /**
+     * 查询系统模型列表 - 全部
+     */
+    @GetMapping("/list")
+    public TableDataInfo<SysModelVo> list(SysModelBo bo, PageQuery pageQuery) {
+        return sysModelService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询系统模型列表
+     */
+    @GetMapping("/modelList")
+    public R<List<SysModelVo>> modelList(SysModelBo bo) {
+        bo.setModelShow("0");
+        List<SysModelVo> sysModelVos = sysModelService.queryList(bo);
+        SysPackagePlanBo sysPackagePlanBo = new SysPackagePlanBo();
+        if (StpUtil.isLogin()) {
+            Long userId = LoginHelper.getLoginUser().getUserId();
+            SysUserVo sysUserVo = userService.selectUserById(userId);
+            if ("0".equals(sysUserVo.getUserGrade())){
+                sysPackagePlanBo.setName("Free");
+                SysPackagePlanVo sysPackagePlanVo = sysPackagePlanService.queryList(sysPackagePlanBo).get(0);
+                List<String> array = new ArrayList<>(Arrays.asList(sysPackagePlanVo.getPlanDetail().split(",")));
+                sysModelVos.removeIf(model -> !array.contains(model.getModelName()));
+            }
+        }else {
+            sysPackagePlanBo.setName("Visitor");
+            SysPackagePlanVo sysPackagePlanVo = sysPackagePlanService.queryList(sysPackagePlanBo).get(0);
+            List<String> array = new ArrayList<>(Arrays.asList(sysPackagePlanVo.getPlanDetail().split(",")));
+            sysModelVos.removeIf(model -> !array.contains(model.getModelName()));
+        }
+        return R.ok(sysModelVos);
+    }
+
+    /**
+     * 导出系统模型列表
+     */
+    @Log(title = "系统模型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysModelBo bo, HttpServletResponse response) {
+        List<SysModelVo> list = sysModelService.queryList(bo);
+        ExcelUtil.exportExcel(list, "系统模型", SysModelVo.class, response);
+    }
+
+    /**
+     * 获取系统模型详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:model:query")
+    @GetMapping("/{id}")
+    public R<SysModelVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysModelService.queryById(id));
+    }
+
+    /**
+     * 新增系统模型
+     */
+    @Log(title = "系统模型", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysModelBo bo) {
+        return toAjax(sysModelService.insertByBo(bo));
+    }
+
+    /**
+     * 修改系统模型
+     */
+    @Log(title = "系统模型", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysModelBo bo) {
+        return toAjax(sysModelService.updateByBo(bo));
+    }
+
+    /**
+     * 删除系统模型
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:model:remove")
+    @Log(title = "系统模型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysModelService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysNoticeController.java

@@ -0,0 +1,90 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.SysNotice;
+import org.ruoyi.system.domain.bo.SysNoticeBo;
+import org.ruoyi.system.domain.vo.SysNoticeVo;
+import org.ruoyi.system.service.ISysNoticeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 公告 信息操作处理
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController {
+
+    private final ISysNoticeService noticeService;
+
+    /**
+     * 获取公告列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
+        //公告类型（1通知 2公告）
+        notice.setNoticeType("2");
+        return noticeService.selectPageNoticeList(notice, pageQuery);
+    }
+
+    /**
+     * 获取通知信息
+     */
+    @GetMapping("/getNotice")
+    public R<SysNotice> getNotice(SysNoticeBo notice) {
+        return R.ok(noticeService.getNotice(notice));
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     *
+     * @param noticeId 公告ID
+     */
+    @SaCheckPermission("system:notice:query")
+    @GetMapping(value = "/{noticeId}")
+    public R<SysNoticeVo> getInfo(@PathVariable Long noticeId) {
+        return R.ok(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @SaCheckPermission("system:notice:add")
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysNoticeBo notice) {
+        return toAjax(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysNoticeBo notice) {
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     *
+     * @param noticeIds 公告ID串
+     */
+    @SaCheckPermission("system:notice:remove")
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    public R<Void> remove(@PathVariable Long[] noticeIds) {
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysNoticeStateController.java

@@ -0,0 +1,98 @@
+package org.ruoyi.system.controller.system;
+
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.satoken.utils.LoginHelper;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysNoticeStateBo;
+import org.ruoyi.system.domain.vo.SysNoticeStateVo;
+import org.ruoyi.system.service.ISysNoticeStateService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用户阅读状态
+ *
+ * @author Lion Li
+ * @date 2024-05-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/noticeState")
+public class SysNoticeStateController extends BaseController {
+
+    private final ISysNoticeStateService sysNoticeStateService;
+
+    /**
+     * 查询用户阅读状态列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<SysNoticeStateVo> list(SysNoticeStateBo bo, PageQuery pageQuery) {
+        return sysNoticeStateService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出用户阅读状态列表
+     */
+    @Log(title = "用户阅读状态", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysNoticeStateBo bo, HttpServletResponse response) {
+        List<SysNoticeStateVo> list = sysNoticeStateService.queryList(bo);
+        ExcelUtil.exportExcel(list, "用户阅读状态", SysNoticeStateVo.class, response);
+    }
+
+    /**
+     * 获取用户阅读状态详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<SysNoticeStateVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysNoticeStateService.queryById(id));
+    }
+
+    /**
+     * 新增用户阅读状态
+     */
+    @Log(title = "用户阅读状态", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysNoticeStateBo bo) {
+        return toAjax(sysNoticeStateService.insertByBo(bo));
+    }
+
+    /**
+     * 修改用户阅读状态
+     */
+    @PutMapping()
+    public R<Void> edit(@RequestBody SysNoticeStateBo bo) {
+        bo.setUserId(LoginHelper.getUserId());
+        return toAjax(sysNoticeStateService.updateByBo(bo));
+    }
+
+    /**
+     * 删除用户阅读状态
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "用户阅读状态", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysNoticeStateService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysOssConfigController.java

@@ -0,0 +1,105 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.core.validate.QueryGroup;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysOssConfigBo;
+import org.ruoyi.system.domain.vo.SysOssConfigVo;
+import org.ruoyi.system.service.ISysOssConfigService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 对象存储配置
+ *
+ * @author Lion Li
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/resource/oss/config")
+public class SysOssConfigController extends BaseController {
+
+    private final ISysOssConfigService ossConfigService;
+
+    /**
+     * 查询对象存储配置列表
+     */
+    @SaCheckPermission("system:oss:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
+        return ossConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取对象存储配置详细信息
+     *
+     * @param ossConfigId OSS配置ID
+     */
+    @SaCheckPermission("system:oss:query")
+    @GetMapping("/{ossConfigId}")
+    public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long ossConfigId) {
+        return R.ok(ossConfigService.queryById(ossConfigId));
+    }
+
+    /**
+     * 新增对象存储配置
+     */
+    @SaCheckPermission("system:oss:add")
+    @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+        return toAjax(ossConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改对象存储配置
+     */
+    @SaCheckPermission("system:oss:edit")
+    @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+        return toAjax(ossConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除对象存储配置
+     *
+     * @param ossConfigIds OSS配置ID串
+     */
+    @SaCheckPermission("system:oss:remove")
+    @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ossConfigIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ossConfigIds) {
+        return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:oss:edit")
+    @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+        return toAjax(ossConfigService.updateOssConfigStatus(bo));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysOssController.java

@@ -0,0 +1,108 @@
+package org.ruoyi.system.controller.system;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.QueryGroup;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysOssBo;
+import org.ruoyi.system.domain.vo.SysOssUploadVo;
+import org.ruoyi.system.domain.vo.SysOssVo;
+import org.ruoyi.system.service.ISysOssService;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 文件上传 控制层
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/resource/oss")
+public class SysOssController extends BaseController {
+
+    private final ISysOssService ossService;
+
+    /**
+     * 查询OSS对象存储列表
+     */
+    @SaCheckPermission("system:oss:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
+        return ossService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询OSS对象基于id串
+     *
+     * @param ossIds OSS对象ID串
+     */
+    @SaCheckPermission("system:oss:list")
+    @GetMapping("/listByIds/{ossIds}")
+    public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ossIds) {
+        List<SysOssVo> list = ossService.listByIds(Arrays.asList(ossIds));
+        return R.ok(list);
+    }
+
+    /**
+     * 上传OSS对象存储
+     *
+     * @param file 文件
+     */
+    @SaCheckPermission("system:oss:upload")
+    @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
+        if (ObjectUtil.isNull(file)) {
+            return R.fail("上传文件不能为空");
+        }
+        SysOssVo oss = ossService.upload(file);
+        SysOssUploadVo uploadVo = new SysOssUploadVo();
+        uploadVo.setUrl(oss.getUrl());
+        uploadVo.setFileName(oss.getOriginalName());
+        uploadVo.setOssId(oss.getOssId().toString());
+        return R.ok(uploadVo);
+    }
+
+    /**
+     * 下载OSS对象
+     *
+     * @param ossId OSS对象ID
+     */
+    @SaCheckPermission("system:oss:download")
+    @GetMapping("/download/{ossId}")
+    public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
+        ossService.download(ossId, response);
+    }
+
+    /**
+     * 删除OSS对象存储
+     *
+     * @param ossIds OSS对象ID串
+     */
+    @SaCheckPermission("system:oss:remove")
+    @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ossIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ossIds) {
+        return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true));
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysPackagePlanController.java

@@ -0,0 +1,114 @@
+package org.ruoyi.system.controller.system;
+
+import java.util.List;
+
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.log.enums.BusinessType;
+
+import org.ruoyi.system.domain.vo.SysPackagePlanVo;
+import org.ruoyi.system.domain.bo.SysPackagePlanBo;
+import org.ruoyi.system.service.ISysPackagePlanService;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 套餐管理
+ *
+ * @author Lion Li
+ * @date 2024-05-05
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/packagePlan")
+public class SysPackagePlanController extends BaseController {
+
+    private final ISysPackagePlanService sysPackagePlanService;
+
+    /**
+     * 查询套餐管理列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<SysPackagePlanVo> list(SysPackagePlanBo bo, PageQuery pageQuery) {
+        return sysPackagePlanService.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/listPlan")
+    public R<List<SysPackagePlanVo>> listPlan() {
+        return R.ok(sysPackagePlanService.queryList(new SysPackagePlanBo()));
+    }
+
+    /**
+     * 导出套餐管理列表
+     */
+    @SaCheckPermission("system:packagePlan:export")
+    @Log(title = "套餐管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysPackagePlanBo bo, HttpServletResponse response) {
+        List<SysPackagePlanVo> list = sysPackagePlanService.queryList(bo);
+        ExcelUtil.exportExcel(list, "套餐管理", SysPackagePlanVo.class, response);
+    }
+
+    /**
+     * 获取套餐管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:packagePlan:query")
+    @GetMapping("/{id}")
+    public R<SysPackagePlanVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysPackagePlanService.queryById(id));
+    }
+
+
+
+
+    /**
+     * 新增套餐管理
+     */
+    @SaCheckPermission("system:packagePlan:add")
+    @Log(title = "套餐管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysPackagePlanBo bo) {
+        return toAjax(sysPackagePlanService.insertByBo(bo));
+    }
+
+    /**
+     * 修改套餐管理
+     */
+    @SaCheckPermission("system:packagePlan:edit")
+    @Log(title = "套餐管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysPackagePlanBo bo) {
+        return toAjax(sysPackagePlanService.updateByBo(bo));
+    }
+
+    /**
+     * 删除套餐管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:packagePlan:remove")
+    @Log(title = "套餐管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysPackagePlanService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysPostController.java

@@ -0,0 +1,115 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysPostBo;
+import org.ruoyi.system.domain.vo.SysPostVo;
+import org.ruoyi.system.service.ISysPostService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 岗位信息操作处理
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/post")
+public class SysPostController extends BaseController {
+
+    private final ISysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @SaCheckPermission("system:post:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysPostVo> list(SysPostBo post, PageQuery pageQuery) {
+        return postService.selectPagePostList(post, pageQuery);
+    }
+
+    /**
+     * 导出岗位列表
+     */
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:post:export")
+    @PostMapping("/export")
+    public void export(SysPostBo post, HttpServletResponse response) {
+        List<SysPostVo> list = postService.selectPostList(post);
+        ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response);
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     *
+     * @param postId 岗位ID
+     */
+    @SaCheckPermission("system:post:query")
+    @GetMapping(value = "/{postId}")
+    public R<SysPostVo> getInfo(@PathVariable Long postId) {
+        return R.ok(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @SaCheckPermission("system:post:add")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysPostBo post) {
+        if (!postService.checkPostNameUnique(post)) {
+            return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        } else if (!postService.checkPostCodeUnique(post)) {
+            return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        return toAjax(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @SaCheckPermission("system:post:edit")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysPostBo post) {
+        if (!postService.checkPostNameUnique(post)) {
+            return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        } else if (!postService.checkPostCodeUnique(post)) {
+            return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        return toAjax(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     *
+     * @param postIds 岗位ID串
+     */
+    @SaCheckPermission("system:post:remove")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{postIds}")
+    public R<Void> remove(@PathVariable Long[] postIds) {
+        return toAjax(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @GetMapping("/optionselect")
+    public R<List<SysPostVo>> optionselect() {
+        List<SysPostVo> posts = postService.selectPostAll();
+        return R.ok(posts);
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysProfileController.java

@@ -0,0 +1,123 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.io.FileUtil;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.common.core.utils.file.MimeTypeUtils;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.satoken.utils.LoginHelper;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysUserBo;
+import org.ruoyi.system.domain.bo.SysUserProfileBo;
+import org.ruoyi.system.domain.vo.AvatarVo;
+import org.ruoyi.system.domain.vo.ProfileVo;
+import org.ruoyi.system.domain.vo.SysOssVo;
+import org.ruoyi.system.domain.vo.SysUserVo;
+import org.ruoyi.system.service.ISysOssService;
+import org.ruoyi.system.service.ISysUserService;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+
+/**
+ * 个人信息 业务处理
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController {
+
+    private final ISysUserService userService;
+    private final ISysOssService ossService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    public R<ProfileVo> profile() {
+        SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
+        ProfileVo profileVo = new ProfileVo();
+        profileVo.setUser(user);
+        profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserName()));
+        profileVo.setPostGroup(userService.selectUserPostGroup(user.getUserName()));
+        return R.ok(profileVo);
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> updateProfile(@RequestBody SysUserProfileBo profile) {
+        SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUserId(LoginHelper.getUserId());
+        if (userService.updateUserProfile(user) > 0) {
+            return R.ok();
+        }
+        return R.fail("修改个人信息异常，请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     *
+     * @param newPassword 旧密码
+     * @param oldPassword 新密码
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public R<Void> updatePwd(String oldPassword, String newPassword) {
+        SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
+        String password = user.getPassword();
+        if (!BCrypt.checkpw(oldPassword, password)) {
+            return R.fail("修改密码失败，旧密码错误");
+        }
+        if (BCrypt.checkpw(newPassword, password)) {
+            return R.fail("新密码不能与旧密码相同");
+        }
+
+        if (userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(newPassword)) > 0) {
+            return R.ok();
+        }
+        return R.fail("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     *
+     * @param avatarfile 用户头像
+     */
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<AvatarVo> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
+        if (!avatarfile.isEmpty()) {
+            String extension = FileUtil.extName(avatarfile.getOriginalFilename());
+            if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
+                return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
+            }
+            SysOssVo oss = ossService.upload(avatarfile);
+            String avatar = oss.getUrl();
+            if (userService.updateUserAvatar(LoginHelper.getUserId(), oss.getUrl())) {
+                AvatarVo avatarVo = new AvatarVo();
+                avatarVo.setImgUrl(avatar);
+                return R.ok(avatarVo);
+            }
+        }
+        return R.fail("上传图片异常，请联系管理员");
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysRoleController.java

@@ -0,0 +1,226 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.SysUserRole;
+import org.ruoyi.system.domain.bo.SysDeptBo;
+import org.ruoyi.system.domain.bo.SysRoleBo;
+import org.ruoyi.system.domain.bo.SysUserBo;
+import org.ruoyi.system.domain.vo.DeptTreeSelectVo;
+import org.ruoyi.system.domain.vo.SysRoleVo;
+import org.ruoyi.system.domain.vo.SysUserVo;
+import org.ruoyi.system.service.ISysDeptService;
+import org.ruoyi.system.service.ISysRoleService;
+import org.ruoyi.system.service.ISysUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 角色信息
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController {
+
+    private final ISysRoleService roleService;
+    private final ISysUserService userService;
+    private final ISysDeptService deptService;
+
+    /**
+     * 获取角色信息列表
+     */
+    @SaCheckPermission("system:role:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) {
+        return roleService.selectPageRoleList(role, pageQuery);
+    }
+
+    /**
+     * 导出角色信息列表
+     */
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:role:export")
+    @PostMapping("/export")
+    public void export(SysRoleBo role, HttpServletResponse response) {
+        List<SysRoleVo> list = roleService.selectRoleList(role);
+        ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response);
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     *
+     * @param roleId 角色ID
+     */
+    @SaCheckPermission("system:role:query")
+    @GetMapping(value = "/{roleId}")
+    public R<SysRoleVo> getInfo(@PathVariable Long roleId) {
+        roleService.checkRoleDataScope(roleId);
+        return R.ok(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @SaCheckPermission("system:role:add")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysRoleBo role) {
+        if (!roleService.checkRoleNameUnique(role)) {
+            return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        } else if (!roleService.checkRoleKeyUnique(role)) {
+            return R.fail("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        return toAjax(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysRoleBo role) {
+        roleService.checkRoleAllowed(role.getRoleId());
+        roleService.checkRoleDataScope(role.getRoleId());
+        if (!roleService.checkRoleNameUnique(role)) {
+            return R.fail("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        } else if (!roleService.checkRoleKeyUnique(role)) {
+            return R.fail("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+
+        if (roleService.updateRole(role) > 0) {
+            roleService.cleanOnlineUserByRole(role.getRoleId());
+            return R.ok();
+        }
+        return R.fail("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/dataScope")
+    public R<Void> dataScope(@RequestBody SysRoleBo role) {
+        roleService.checkRoleAllowed(role.getRoleId());
+        roleService.checkRoleDataScope(role.getRoleId());
+        return toAjax(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysRoleBo role) {
+        roleService.checkRoleAllowed(role.getRoleId());
+        roleService.checkRoleDataScope(role.getRoleId());
+        return toAjax(roleService.updateRoleStatus(role.getRoleId(), role.getStatus()));
+    }
+
+    /**
+     * 删除角色
+     *
+     * @param roleIds 角色ID串
+     */
+    @SaCheckPermission("system:role:remove")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public R<Void> remove(@PathVariable Long[] roleIds) {
+        return toAjax(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @SaCheckPermission("system:role:query")
+    @GetMapping("/optionselect")
+    public R<List<SysRoleVo>> optionselect() {
+        return R.ok(roleService.selectRoleAll());
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @SaCheckPermission("system:role:list")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo<SysUserVo> allocatedList(SysUserBo user, PageQuery pageQuery) {
+        return userService.selectAllocatedList(user, pageQuery);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @SaCheckPermission("system:role:list")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo<SysUserVo> unallocatedList(SysUserBo user, PageQuery pageQuery) {
+        return userService.selectUnallocatedList(user, pageQuery);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
+        return toAjax(roleService.deleteAuthUser(userRole));
+    }
+
+    /**
+     * 批量取消授权用户
+     *
+     * @param roleId  角色ID
+     * @param userIds 用户ID串
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
+        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     *
+     * @param roleId  角色ID
+     * @param userIds 用户ID串
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
+        roleService.checkRoleDataScope(roleId);
+        return toAjax(roleService.insertAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 获取对应角色部门树列表
+     *
+     * @param roleId 角色ID
+     */
+    @SaCheckPermission("system:role:list")
+    @GetMapping(value = "/deptTree/{roleId}")
+    public R<DeptTreeSelectVo> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
+        DeptTreeSelectVo selectVo = new DeptTreeSelectVo();
+        selectVo.setCheckedKeys(deptService.selectDeptListByRoleId(roleId));
+        selectVo.setDepts(deptService.selectDeptTreeList(new SysDeptBo()));
+        return R.ok(selectVo);
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysTenantController.java

@@ -0,0 +1,174 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
+import com.baomidou.lock.annotation.Lock4j;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.constant.TenantConstants;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.tenant.helper.TenantHelper;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysTenantBo;
+import org.ruoyi.system.domain.vo.SysTenantVo;
+import org.ruoyi.system.service.ISysTenantService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 租户管理
+ *
+ * @author Michelle.Chung
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/tenant")
+public class SysTenantController extends BaseController {
+
+    private final ISysTenantService tenantService;
+
+    /**
+     * 查询租户列表
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenant:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) {
+        return tenantService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出租户列表
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenant:export")
+    @Log(title = "租户", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysTenantBo bo, HttpServletResponse response) {
+        List<SysTenantVo> list = tenantService.queryList(bo);
+        ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response);
+    }
+
+    /**
+     * 获取租户详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenant:query")
+    @GetMapping("/{id}")
+    public R<SysTenantVo> getInfo(@NotNull(message = "主键不能为空")
+                                  @PathVariable Long id) {
+        return R.ok(tenantService.queryById(id));
+    }
+
+    /**
+     * 新增租户
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenant:add")
+    @Log(title = "租户", businessType = BusinessType.INSERT)
+    @Lock4j
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
+        if (!tenantService.checkCompanyNameUnique(bo)) {
+            return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
+        }
+        return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo)));
+    }
+
+    /**
+     * 修改租户
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenant:edit")
+    @Log(title = "租户", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
+        tenantService.checkTenantAllowed(bo.getTenantId());
+        if (!tenantService.checkCompanyNameUnique(bo)) {
+            return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在");
+        }
+        return toAjax(tenantService.updateByBo(bo));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenant:edit")
+    @Log(title = "租户", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
+        tenantService.checkTenantAllowed(bo.getTenantId());
+        return toAjax(tenantService.updateTenantStatus(bo));
+    }
+
+    /**
+     * 删除租户
+     *
+     * @param ids 主键串
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenant:remove")
+    @Log(title = "租户", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tenantService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 动态切换租户
+     *
+     * @param tenantId 租户ID
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @GetMapping("/dynamic/{tenantId}")
+    public R<Void> dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) {
+        TenantHelper.setDynamic(tenantId);
+        return R.ok();
+    }
+
+    /**
+     * 清除动态租户
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @GetMapping("/dynamic/clear")
+    public R<Void> dynamicClear() {
+        TenantHelper.clearDynamic();
+        return R.ok();
+    }
+
+
+    /**
+     * 同步租户套餐
+     *
+     * @param tenantId  租户id
+     * @param packageId 套餐id
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenant:edit")
+    @Log(title = "租户", businessType = BusinessType.UPDATE)
+    @GetMapping("/syncTenantPackage")
+    public R<Void> syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId, @NotBlank(message = "套餐ID不能为空") String packageId) {
+        return toAjax(TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId)));
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysTenantPackageController.java

@@ -0,0 +1,134 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.constant.TenantConstants;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysTenantPackageBo;
+import org.ruoyi.system.domain.vo.SysTenantPackageVo;
+import org.ruoyi.system.service.ISysTenantPackageService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 租户套餐管理
+ *
+ * @author Michelle.Chung
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/tenant/package")
+public class SysTenantPackageController extends BaseController {
+
+    private final ISysTenantPackageService tenantPackageService;
+
+    /**
+     * 查询租户套餐列表
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysTenantPackageVo> list(SysTenantPackageBo bo, PageQuery pageQuery) {
+        return tenantPackageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询租户套餐下拉选列表
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:list")
+    @GetMapping("/selectList")
+    public R<List<SysTenantPackageVo>> selectList() {
+        return R.ok(tenantPackageService.selectList());
+    }
+
+    /**
+     * 导出租户套餐列表
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:export")
+    @Log(title = "租户套餐", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysTenantPackageBo bo, HttpServletResponse response) {
+        List<SysTenantPackageVo> list = tenantPackageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "租户套餐", SysTenantPackageVo.class, response);
+    }
+
+    /**
+     * 获取租户套餐详细信息
+     *
+     * @param packageId 主键
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:query")
+    @GetMapping("/{packageId}")
+    public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long packageId) {
+        return R.ok(tenantPackageService.queryById(packageId));
+    }
+
+    /**
+     * 新增租户套餐
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:add")
+    @Log(title = "租户套餐", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) {
+        return toAjax(tenantPackageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改租户套餐
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:edit")
+    @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) {
+        return toAjax(tenantPackageService.updateByBo(bo));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:edit")
+    @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysTenantPackageBo bo) {
+        return toAjax(tenantPackageService.updatePackageStatus(bo));
+    }
+
+    /**
+     * 删除租户套餐
+     *
+     * @param packageIds 主键串
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:tenantPackage:remove")
+    @Log(title = "租户套餐", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{packageIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] packageIds) {
+        return toAjax(tenantPackageService.deleteWithValidByIds(List.of(packageIds), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserController.java

@@ -0,0 +1,324 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.domain.model.LoginUser;
+import org.ruoyi.common.core.utils.MapstructUtils;
+import org.ruoyi.common.core.utils.StreamUtils;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.common.excel.core.ExcelResult;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.satoken.utils.LoginHelper;
+import org.ruoyi.common.tenant.helper.TenantHelper;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysDeptBo;
+import org.ruoyi.system.domain.bo.SysUserBo;
+import org.ruoyi.system.domain.request.UserRequest;
+import org.ruoyi.system.domain.vo.*;
+import org.ruoyi.system.listener.SysUserImportListener;
+import org.ruoyi.system.service.*;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户信息
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController {
+
+    private final ISysUserService userService;
+    private final ISysRoleService roleService;
+    private final ISysPostService postService;
+    private final ISysDeptService deptService;
+    private final ISysTenantService tenantService;
+    private final ISysOssService ossService;
+    /**
+     * 获取用户列表
+     */
+    @SaCheckPermission("system:user:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
+        return userService.selectPageUserList(user, pageQuery);
+    }
+
+    /**
+     * 获取用户列表
+     */
+    @GetMapping("/getUserOption")
+    public R<List<SysUserOptionVo>> getUserOption() {
+        List<SysUserVo> sysUserVos = userService.selectUserList(new SysUserBo());
+        List<SysUserOptionVo> collect = sysUserVos.stream()
+            .map(this::convertToUserOptionVo)
+            .collect(Collectors.toList());
+        return R.ok(collect);
+    }
+
+    private SysUserOptionVo convertToUserOptionVo(SysUserVo sysUserVo) {
+        SysUserOptionVo sysUserOptionVo = new SysUserOptionVo();
+        sysUserOptionVo.setUserId(sysUserVo.getUserId());
+        sysUserOptionVo.setName(sysUserVo.getNickName());
+        return sysUserOptionVo;
+    }
+
+    /**
+     * 导出用户列表
+     */
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:user:export")
+    @PostMapping("/export")
+    public void export(SysUserBo user, HttpServletResponse response) {
+        List<SysUserVo> list = userService.selectUserList(user);
+        List<SysUserExportVo> listVo = MapstructUtils.convert(list, SysUserExportVo.class);
+        ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
+    }
+
+    /**
+     * 导入数据
+     *
+     * @param file          导入文件
+     * @param updateSupport 是否更新已存在数据
+     */
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @SaCheckPermission("system:user:import")
+    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
+        return R.ok(result.getAnalysis());
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("/getInfo")
+    public R<UserInfoVo> getInfo() {
+        UserInfoVo userInfoVo = new UserInfoVo();
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
+            // 超级管理员 如果重新加载用户信息需清除动态租户
+            TenantHelper.clearDynamic();
+        }
+        SysUserVo user = userService.selectUserById(loginUser.getUserId());
+        userInfoVo.setUser(user);
+        userInfoVo.setPermissions(loginUser.getMenuPermission());
+        userInfoVo.setRoles(loginUser.getRolePermission());
+        return R.ok(userInfoVo);
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     *
+     * @param userId 用户ID
+     */
+    @SaCheckPermission("system:user:query")
+    @GetMapping(value = {"/", "/{userId}"})
+    public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+        userService.checkUserDataScope(userId);
+        SysUserInfoVo userInfoVo = new SysUserInfoVo();
+        List<SysRoleVo> roles = roleService.selectRoleAll();
+        userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));
+        userInfoVo.setPosts(postService.selectPostAll());
+        if (ObjectUtil.isNotNull(userId)) {
+            SysUserVo sysUser = userService.selectUserById(userId);
+            userInfoVo.setUser(sysUser);
+            userInfoVo.setRoleIds(StreamUtils.toList(sysUser.getRoles(), SysRoleVo::getRoleId));
+            userInfoVo.setPostIds(postService.selectPostListByUserId(userId));
+        }
+        return R.ok(userInfoVo);
+    }
+
+    /**
+     * 新增用户
+     */
+    @SaCheckPermission("system:user:add")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysUserBo user) {
+        if (!userService.checkUserNameUnique(user)) {
+            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+            return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+            return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        if (TenantHelper.isEnable()) {
+            if (!tenantService.checkAccountBalance(TenantHelper.getTenantId())) {
+                return R.fail("当前租户下用户名额不足，请联系管理员");
+            }
+        }
+        if(StringUtils.isEmpty(user.getPassword())){
+            user.setPassword("123456");
+        }
+        if(StringUtils.isEmpty(user.getNickName())){
+            user.setNickName(user.getUserName());
+        }
+        user.setDeptId(103L);
+        user.setPassword(BCrypt.hashpw(user.getPassword()));
+        return toAjax(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @SaCheckPermission("system:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysUserBo user) {
+        userService.checkUserAllowed(user.getUserId());
+        userService.checkUserDataScope(user.getUserId());
+        if (!userService.checkUserNameUnique(user)) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        return toAjax(userService.updateUser(user));
+    }
+
+    /**
+     * 修改用户名称
+     */
+    @Log(title = "修改用户名称", businessType = BusinessType.UPDATE)
+    @PostMapping("/editName")
+    public R<Void> editName(@RequestBody @Validated  UserRequest userRequest) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        userService.updateUserName(loginUser.getUserId(), userRequest.getNickName());
+        return R.ok("操作成功!");
+    }
+
+    /**
+     * 修改用户头像
+     */
+    @Log(title = "修改用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit/avatar")
+    public R<Void> editAvatar(@RequestPart("file") MultipartFile file) {
+        if (ObjectUtil.isNull(file)) {
+            return R.fail("上传文件不能为空");
+        }
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        // 获取当前登录用户
+        SysOssVo oss = ossService.upload(file);
+        userService.updateUserAvatar(loginUser.getUserId(), oss.getUrl());
+        return R.ok(oss.getUrl());
+    }
+
+    /**
+     * 小程序-修改用户
+     */
+    @PostMapping("/edit/xcxUser")
+    public R<SysUserVo> editXcxUser(@RequestBody SysUserBo user) {
+        return R.ok(userService.updateXcxUser(user));
+    }
+
+    /**
+     * 删除用户
+     *
+     * @param userIds 角色ID串
+     */
+    @SaCheckPermission("system:user:remove")
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public R<Void> remove(@PathVariable Long[] userIds) {
+        if (ArrayUtil.contains(userIds, LoginHelper.getUserId())) {
+            return R.fail("当前用户不能删除");
+        }
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @SaCheckPermission("system:user:resetPwd")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public R<Void> resetPwd(@RequestBody SysUserBo user) {
+        userService.checkUserAllowed(user.getUserId());
+        userService.checkUserDataScope(user.getUserId());
+        user.setPassword(BCrypt.hashpw(user.getPassword()));
+        return toAjax(userService.resetUserPwd(user.getUserId(), user.getPassword()));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysUserBo user) {
+        userService.checkUserAllowed(user.getUserId());
+        userService.checkUserDataScope(user.getUserId());
+        return toAjax(userService.updateUserStatus(user.getUserId(), user.getStatus()));
+    }
+
+    /**
+     * 根据用户编号获取授权角色
+     *
+     * @param userId 用户ID
+     */
+    @SaCheckPermission("system:user:query")
+    @GetMapping("/authRole/{userId}")
+    public R<SysUserInfoVo> authRole(@PathVariable Long userId) {
+        SysUserVo user = userService.selectUserById(userId);
+        List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
+        SysUserInfoVo userInfoVo = new SysUserInfoVo();
+        userInfoVo.setUser(user);
+        userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));
+        return R.ok(userInfoVo);
+    }
+
+    /**
+     * 用户授权角色
+     *
+     * @param userId  用户Id
+     * @param roleIds 角色ID串
+     */
+    @SaCheckPermission("system:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authRole")
+    public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
+        userService.checkUserDataScope(userId);
+        userService.insertUserAuth(userId, roleIds);
+        return R.ok();
+    }
+
+    /**
+     * 获取部门树列表
+     */
+    @SaCheckPermission("system:user:list")
+    @GetMapping("/deptTree")
+    public R<List<Tree<Long>>> deptTree(SysDeptBo dept) {
+        return R.ok(deptService.selectDeptTreeList(dept));
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserGroupController.java

@@ -0,0 +1,106 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.SysUserGroupBo;
+import org.ruoyi.system.domain.vo.SysUserGroupVo;
+import org.ruoyi.system.service.ISysUserGroupService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】
+ *
+ * @author Lion Li
+ * @date 2024-08-03
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/userGroup")
+public class SysUserGroupController extends BaseController {
+
+    private final ISysUserGroupService sysUserGroupService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @SaCheckPermission("system:userGroup:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysUserGroupVo> list(SysUserGroupBo bo, PageQuery pageQuery) {
+        return sysUserGroupService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @SaCheckPermission("system:userGroup:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysUserGroupBo bo, HttpServletResponse response) {
+        List<SysUserGroupVo> list = sysUserGroupService.queryList(bo);
+        ExcelUtil.exportExcel(list, "【请填写功能名称】", SysUserGroupVo.class, response);
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:userGroup:query")
+    @GetMapping("/{id}")
+    public R<SysUserGroupVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysUserGroupService.queryById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @SaCheckPermission("system:userGroup:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysUserGroupBo bo) {
+        return toAjax(sysUserGroupService.insertByBo(bo));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @SaCheckPermission("system:userGroup:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysUserGroupBo bo) {
+        return toAjax(sysUserGroupService.updateByBo(bo));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:userGroup:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysUserGroupService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysUserModelController.java

@@ -0,0 +1,105 @@
+package org.ruoyi.system.controller.system;
+
+import java.util.List;
+
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.system.domain.vo.SysUserModelVo;
+import org.ruoyi.system.domain.bo.SysUserModelBo;
+import org.ruoyi.system.service.ISysUserModelService;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】
+ *
+ * @author Lion Li
+ * @date 2024-08-03
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/userModel")
+public class SysUserModelController extends BaseController {
+
+    private final ISysUserModelService sysUserModelService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @SaCheckPermission("system:userModel:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysUserModelVo> list(SysUserModelBo bo, PageQuery pageQuery) {
+        return sysUserModelService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @SaCheckPermission("system:userModel:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysUserModelBo bo, HttpServletResponse response) {
+        List<SysUserModelVo> list = sysUserModelService.queryList(bo);
+        ExcelUtil.exportExcel(list, "【请填写功能名称】", SysUserModelVo.class, response);
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:userModel:query")
+    @GetMapping("/{id}")
+    public R<SysUserModelVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(sysUserModelService.queryById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @SaCheckPermission("system:userModel:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysUserModelBo bo) {
+        return toAjax(sysUserModelService.insertByBo(bo));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @SaCheckPermission("system:userModel:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysUserModelBo bo) {
+        return toAjax(sysUserModelService.updateByBo(bo));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:userModel:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysUserModelService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/WeixinServerController.java

@@ -0,0 +1,48 @@
+package org.ruoyi.system.controller.system;
+
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.ruoyi.system.service.WeixinUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+@Slf4j
+@RestController
+public class WeixinServerController {
+
+    @Autowired
+    private WeixinUserService weixinUserService;
+
+    @GetMapping(value = "/weixin/check")
+    public String weixinCheck(HttpServletRequest request) {
+        String signature = request.getParameter("signature");
+        String timestamp = request.getParameter("timestamp");
+        String nonce = request.getParameter("nonce");
+        String echostr = request.getParameter("echostr");
+
+        if (StringUtils.isEmpty(signature) || StringUtils.isEmpty(timestamp) || StringUtils.isEmpty(nonce)) {
+            return "";
+        }
+        weixinUserService.checkSignature(signature, timestamp, nonce);
+        return echostr;
+    }
+
+    @PostMapping(value = "/weixin/check")
+    public String weixinMsg(@RequestBody String requestBody, @RequestParam("signature") String signature,
+        @RequestParam("timestamp") String timestamp, @RequestParam("nonce") String nonce) {
+
+        log.debug("requestBody:{}", requestBody);
+        log.debug("signature:{}", signature);
+        log.debug("timestamp:{}", timestamp);
+        log.debug("nonce:{}", nonce);
+
+        weixinUserService.checkSignature(signature, timestamp, nonce);
+        return weixinUserService.handleWeixinMsg(requestBody);
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/WeixinUserController.java

@@ -0,0 +1,55 @@
+package org.ruoyi.system.controller.system;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.system.domain.model.WeixinQrCode;
+import org.ruoyi.system.domain.vo.LoginVo;
+import org.ruoyi.system.service.SysLoginService;
+import org.ruoyi.system.util.WeixinApiUtil;
+import org.ruoyi.system.util.WeixinQrCodeCacheUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author https://www.wdbyte.com
+ */
+@Slf4j
+@RestController
+public class WeixinUserController {
+
+    @Autowired
+    private WeixinApiUtil weixinApiUtil;
+
+    @Autowired
+    private SysLoginService loginService;
+
+    @GetMapping(value = "/user/qrcode")
+    public R<WeixinQrCode> getQrCode() {
+        WeixinQrCode qrCode = weixinApiUtil.getQrCode();
+        qrCode.setUrl(null);
+        qrCode.setExpireSeconds(null);
+        return R.ok(qrCode);
+    }
+
+    /**
+     * 校验是否扫描完成
+     * 完成，返回 JWT
+     * 未完成，返回 check faild
+     *
+     * @param ticket
+     * @return
+     */
+    @GetMapping(value = "/user/login/qrcode")
+    public R<LoginVo> userLogin(String ticket) {
+        String openId = WeixinQrCodeCacheUtil.get(ticket);
+        if (StringUtils.isNotEmpty(openId)) {
+            log.info("login success,open id:{}", openId);
+            LoginVo loginVo = loginService.mpLogin(openId);
+            return R.ok(loginVo);
+        }
+        log.info("login error,ticket:{}", ticket);
+        return R.fail("check faild");
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/WxRobKeywordController.java

@@ -0,0 +1,106 @@
+package org.ruoyi.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.excel.utils.ExcelUtil;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.mybatis.core.page.PageQuery;
+import org.ruoyi.common.mybatis.core.page.TableDataInfo;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.system.domain.bo.WxRobKeywordBo;
+import org.ruoyi.system.domain.vo.WxRobKeywordVo;
+import org.ruoyi.system.service.IWxRobKeywordService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】
+ *
+ * @author Lion Li
+ * @date 2024-05-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/robKeyword")
+public class WxRobKeywordController extends BaseController {
+
+    private final IWxRobKeywordService wxRobKeywordService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @SaCheckPermission("system:robKeyword:list")
+    @GetMapping("/list")
+    public TableDataInfo<WxRobKeywordVo> list(WxRobKeywordBo bo, PageQuery pageQuery) {
+        return wxRobKeywordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @SaCheckPermission("system:robKeyword:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(WxRobKeywordBo bo, HttpServletResponse response) {
+        List<WxRobKeywordVo> list = wxRobKeywordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "【请填写功能名称】", WxRobKeywordVo.class, response);
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:robKeyword:query")
+    @GetMapping("/{id}")
+    public R<WxRobKeywordVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(wxRobKeywordService.queryById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @SaCheckPermission("system:robKeyword:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WxRobKeywordBo bo) {
+        return toAjax(wxRobKeywordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @SaCheckPermission("system:robKeyword:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WxRobKeywordBo bo) {
+        return toAjax(wxRobKeywordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:robKeyword:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(wxRobKeywordService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatConfig.java

@@ -0,0 +1,70 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 对话配置信息
+对象 chat_config
+ *
+ * @author Lion Li
+ * @date 2024-04-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_config")
+public class ChatConfig extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 配置类型
+     */
+    private String category;
+
+    /**
+     * 配置名称
+     */
+    private String configName;
+
+    /**
+     * 配置值
+     */
+    private String configValue;
+
+    /**
+     * 说明
+     */
+    private String configDict;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatGpts.java

@@ -0,0 +1,101 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * gpts管理对象 chat_gpts
+ *
+ * @author Lion Li
+ * @date 2024-07-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_gpts")
+public class ChatGpts extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * gpts应用id
+     */
+    private String gid;
+
+    /**
+     * gpts应用名称
+     */
+    private String name;
+
+    /**
+     * gpts图标
+     */
+    private String logo;
+
+    /**
+     * gpts描述
+     */
+    private String info;
+
+    /**
+     * 作者id
+     */
+    private String authorId;
+
+    /**
+     * 作者名称
+     */
+    private String authorName;
+
+    /**
+     * 点赞
+     */
+    private String useCnt;
+
+    /**
+     * 差评
+     */
+    private String bad;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 版本
+     */
+    @Version
+    private Long version;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatMessage.java

@@ -0,0 +1,70 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 聊天消息对象 chat_message
+ *
+ * @author Lion Li
+ * @date 2023-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_message")
+public class ChatMessage extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID", groups = { AddGroup.class, EditGroup.class })
+    private Long UserId;
+
+    /**
+     * 消息内容
+     */
+    @NotBlank(message = "消息内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String content;
+
+
+    /**
+     * 扣除费用
+     */
+    private Double deductCost;
+
+    /**
+     * 累计 Tokens
+     */
+    @NotNull(message = "累计 Tokens不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer totalTokens;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String modelName;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatToken.java

@@ -0,0 +1,49 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 用户token使用记录
+ *
+ * @author Lion Li
+ * @date 2023-11-26
+ */
+@Data
+@TableName("chat_usage_token")
+public class ChatToken implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID", groups = { AddGroup.class, EditGroup.class })
+    private Long UserId;
+
+    /**
+     * 待结算token
+     */
+    private Integer token;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String modelName;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatVisitorUsage.java

@@ -0,0 +1,73 @@
+package org.ruoyi.system.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 访客管理对象 chat_visitor_usage
+ *
+ * @author Lion Li
+ * @date 2024-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_visitor_usage")
+public class ChatVisitorUsage extends BaseEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 浏览器指纹
+     */
+    private String fingerprint;
+
+    /**
+     * 使用次数
+     */
+    private String usageCount;
+
+    /**
+     * ip地址
+     */
+    private String ipAddress;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 版本
+     */
+    @Version
+    private Long version;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatVoucher.java

@@ -0,0 +1,67 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+
+/**
+ * 用户兑换记录对象 chat_voucher
+ *
+ * @author Lion Li
+ * @date 2024-05-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_voucher")
+public class ChatVoucher extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 兑换码
+     */
+    private String code;
+
+    /**
+     * 兑换金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 兑换状态
+     */
+    private String status;
+
+    /**
+     * 兑换前余额
+     */
+    private BigDecimal balanceBefore;
+
+    /**
+     * 兑换后余额
+     */
+    private BigDecimal balanceAfter;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/GenerateLuma.java

@@ -0,0 +1,22 @@
+package org.ruoyi.system.domain;
+
+import lombok.Data;
+
+/**
+ * 描述：文生视频请求对象
+ *
+ * @author ageerle@163.com
+ * date 2024/6/27
+ */
+@Data
+public class GenerateLuma {
+
+    private String aspect_ratio;
+
+    private boolean expand_prompt;
+
+    private String image_url;
+
+    private String user_prompt;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/GenerateLyric.java

@@ -0,0 +1,23 @@
+package org.ruoyi.system.domain;
+
+import lombok.Data;
+
+/**
+ * 描述：生成歌词
+ *
+ * @author ageerle@163.com
+ * date 2024/6/27
+ */
+@Data
+public class GenerateLyric {
+
+    /**
+     * 歌词提示词
+     */
+    private String prompt;
+
+    /**
+     * 回调地址
+     */
+    private String notify_hook;
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/GenerateSuno.java

@@ -0,0 +1,64 @@
+package org.ruoyi.system.domain;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author WangLe
+ */
+@Data
+public class GenerateSuno implements Serializable {
+
+    /**
+     * 歌词 (自定义模式专用)
+     */
+    private String prompt;
+
+    /**
+     * mv模型，chirp-v3-0、chirp-v3-5。不写默认 chirp-v3-0
+     */
+    private String mv;
+
+    /**
+     * 标题(自定义模式专用)
+     */
+    private String title;
+
+    /**
+     * 风格标签(自定义模式专用)
+     */
+    private String tags;
+
+    /**
+     * 是否生成纯音乐，true 为生成纯音乐
+     */
+    private boolean make_instrumental;
+
+    /**
+     * 任务id，用于对之前的任务再操作
+     */
+    private String task_id;
+
+    /**
+     * float，歌曲延长时间，单位秒
+     */
+    private int continue_at;
+
+    /**
+     * 歌曲id，需要续写哪首歌
+     */
+    private String continue_clip_id;
+
+    /**
+     * 灵感模式提示词(灵感模式专用)
+     */
+    private String gpt_description_prompt;
+
+    /**
+     * 回调地址
+     */
+    private String notify_hook;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/PaymentOrder.java

@@ -0,0 +1,67 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+
+/**
+ * 支付订单对象 payment_orders
+ *
+ * @author Lion Li
+ * @date 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_pay_order")
+public class PaymentOrder extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 订单名称
+     */
+    private String orderName;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 支付状态
+     */
+    private String paymentStatus;
+
+    /**
+     * 支付方式
+     */
+    private String paymentMethod;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysCache.java

@@ -0,0 +1,47 @@
+package org.ruoyi.system.domain;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.ruoyi.common.core.utils.StringUtils;
+
+/**
+ * 缓存信息
+ *
+ * @author Lion Li
+ */
+@Data
+@NoArgsConstructor
+public class SysCache {
+
+    /**
+     * 缓存名称
+     */
+    private String cacheName = "";
+
+    /**
+     * 缓存键名
+     */
+    private String cacheKey = "";
+
+    /**
+     * 缓存内容
+     */
+    private String cacheValue = "";
+
+    /**
+     * 备注
+     */
+    private String remark = "";
+
+    public SysCache(String cacheName, String remark) {
+        this.cacheName = cacheName;
+        this.remark = remark;
+    }
+
+    public SysCache(String cacheName, String cacheKey, String cacheValue) {
+        this.cacheName = StringUtils.replace(cacheName, ":", "");
+        this.cacheKey = StringUtils.replace(cacheKey, cacheName, "");
+        this.cacheValue = cacheValue;
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysConfig.java

@@ -0,0 +1,51 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+/**
+ * 参数配置表 sys_config
+ *
+ * @author Lion Li
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_config")
+public class SysConfig extends TenantEntity {
+
+    /**
+     * 参数主键
+     */
+    @TableId(value = "config_id")
+    private Long configId;
+
+    /**
+     * 参数名称
+     */
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    private String configValue;
+
+    /**
+     * 系统内置（Y是 N否）
+     */
+    private String configType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysDept.java

@@ -0,0 +1,78 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 部门表 sys_dept
+ *
+ * @author Lion Li
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_dept")
+public class SysDept extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+    @TableId(value = "dept_id")
+    private Long deptId;
+
+    /**
+     * 父部门ID
+     */
+    private Long parentId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 负责人
+     */
+    private String leader;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 部门状态:0正常,1停用
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysDictData.java

@@ -0,0 +1,76 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.constant.UserConstants;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+/**
+ * 字典数据表 sys_dict_data
+ *
+ * @author Lion Li
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_dict_data")
+public class SysDictData extends TenantEntity {
+
+    /**
+     * 字典编码
+     */
+    @TableId(value = "dict_code")
+    private Long dictCode;
+
+    /**
+     * 字典排序
+     */
+    private Integer dictSort;
+
+    /**
+     * 字典标签
+     */
+    private String dictLabel;
+
+    /**
+     * 字典键值
+     */
+    private String dictValue;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 样式属性（其他样式扩展）
+     */
+    private String cssClass;
+
+    /**
+     * 表格字典样式
+     */
+    private String listClass;
+
+    /**
+     * 是否默认（Y是 N否）
+     */
+    private String isDefault;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public boolean getDefault() {
+        return UserConstants.YES.equals(this.isDefault);
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysDictType.java

@@ -0,0 +1,46 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+/**
+ * 字典类型表 sys_dict_type
+ *
+ * @author Lion Li
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_dict_type")
+public class SysDictType extends TenantEntity {
+
+    /**
+     * 字典主键
+     */
+    @TableId(value = "dict_id")
+    private Long dictId;
+
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysLogininfor.java

@@ -0,0 +1,75 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 系统访问记录表 sys_logininfor
+ *
+ * @author Lion Li
+ */
+
+@Data
+@TableName("sys_logininfor")
+public class SysLogininfor implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "info_id")
+    private Long infoId;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 登录状态 0成功 1失败
+     */
+    private String status;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 提示消息
+     */
+    private String msg;
+
+    /**
+     * 访问时间
+     */
+    private Date loginTime;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysMenu.java

@@ -0,0 +1,191 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.ruoyi.common.core.constant.Constants;
+import org.ruoyi.common.core.constant.UserConstants;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 菜单权限表 sys_menu
+ *
+ * @author Lion Li
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_menu")
+public class SysMenu extends BaseEntity {
+
+    /**
+     * 菜单ID
+     */
+    @TableId(value = "menu_id")
+    private Long menuId;
+
+    /**
+     * 父菜单ID
+     */
+    private Long parentId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 组件路径
+     */
+    private String component;
+
+    /**
+     * 路由参数
+     */
+    private String queryParam;
+
+    /**
+     * 是否为外链（0是 1否）
+     */
+    private String isFrame;
+
+    /**
+     * 是否缓存（0缓存 1不缓存）
+     */
+    private String isCache;
+
+    /**
+     * 类型（M目录 C菜单 F按钮）
+     */
+    private String menuType;
+
+    /**
+     * 显示状态（0显示 1隐藏）
+     */
+    private String visible;
+
+    /**
+     * 菜单状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 权限字符串
+     */
+    private String perms;
+
+    /**
+     * 菜单图标
+     */
+    private String icon;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 父菜单名称
+     */
+    @TableField(exist = false)
+    private String parentName;
+
+    /**
+     * 子菜单
+     */
+    @TableField(exist = false)
+    private List<SysMenu> children = new ArrayList<>();
+
+    /**
+     * 获取路由名称
+     */
+    public String getRouteName() {
+        String routerName = StringUtils.capitalize(path);
+        // 非外链并且是一级目录（类型为目录）
+        if (isMenuFrame()) {
+            routerName = StringUtils.EMPTY;
+        }
+        return routerName;
+    }
+
+    /**
+     * 获取路由地址
+     */
+    public String getRouterPath() {
+        String routerPath = this.path;
+        // 内链打开外网方式
+        if (getParentId() != 0L && isInnerLink()) {
+            routerPath = innerLinkReplaceEach(routerPath);
+        }
+        // 非外链并且是一级目录（类型为目录）
+        if (0L == getParentId() && UserConstants.TYPE_DIR.equals(getMenuType())
+            && UserConstants.NO_FRAME.equals(getIsFrame())) {
+            routerPath = "/" + this.path;
+        }
+        // 非外链并且是一级目录（类型为菜单）
+        else if (isMenuFrame()) {
+            routerPath = "/";
+        }
+        return routerPath;
+    }
+
+    /**
+     * 获取组件信息
+     */
+    public String getComponentInfo() {
+        String component = UserConstants.LAYOUT;
+        if (StringUtils.isNotEmpty(this.component) && !isMenuFrame()) {
+            component = this.component;
+        } else if (StringUtils.isEmpty(this.component) && getParentId() != 0L && isInnerLink()) {
+            component = UserConstants.INNER_LINK;
+        } else if (StringUtils.isEmpty(this.component) && isParentView()) {
+            component = UserConstants.PARENT_VIEW;
+        }
+        return component;
+    }
+
+    /**
+     * 是否为菜单内部跳转
+     */
+    public boolean isMenuFrame() {
+        return getParentId() == 0L && UserConstants.TYPE_MENU.equals(menuType) && isFrame.equals(UserConstants.NO_FRAME);
+    }
+
+    /**
+     * 是否为内链组件
+     */
+    public boolean isInnerLink() {
+        return isFrame.equals(UserConstants.NO_FRAME) && StringUtils.ishttp(path);
+    }
+
+    /**
+     * 是否为parent_view组件
+     */
+    public boolean isParentView() {
+        return getParentId() != 0L && UserConstants.TYPE_DIR.equals(menuType);
+    }
+
+    /**
+     * 内链域名特殊字符替换
+     */
+    public static String innerLinkReplaceEach(String path) {
+        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, "."},
+            new String[]{"", "", "", "/"});
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysModel.java

@@ -0,0 +1,77 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 系统模型对象 sys_model
+ *
+ * @author Lion Li
+ * @date 2024-04-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_model")
+public class SysModel extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 模型描述
+     */
+    private String modelDescribe;
+
+    /**
+     * 模型价格
+     */
+    private double modelPrice;
+
+    /**
+     * 计费类型
+     */
+    private String modelType;
+
+    /**
+     * 是否显示
+     */
+    private String modelShow;
+
+
+    /**
+     * 系统提示词
+     */
+    private String systemPrompt;
+
+    /**
+     * 请求地址
+     */
+    private String apiHost;
+
+    /**
+     * 密钥
+     */
+    private String apiKey;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysNotice.java

@@ -0,0 +1,51 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+
+/**
+ * 通知公告表 sys_notice
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_notice")
+public class SysNotice extends TenantEntity {
+
+    /**
+     * 公告ID
+     */
+    @TableId(value = "notice_id")
+    private Long noticeId;
+
+    /**
+     * 公告标题
+     */
+    private String noticeTitle;
+
+    /**
+     * 公告类型（1通知 2公告）
+     */
+    private String noticeType;
+
+    /**
+     * 公告内容
+     */
+    private String noticeContent;
+
+    /**
+     * 公告状态（0正常 1关闭）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysNoticeState.java

@@ -0,0 +1,52 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 用户阅读状态对象 sys_notice_state
+ *
+ * @author Lion Li
+ * @date 2024-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_notice_state")
+public class SysNoticeState extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 公告ID
+     */
+    private Long noticeId;
+
+    /**
+     * 阅读状态（0未读 1已读）
+     */
+    private String readStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysOperLog.java

@@ -0,0 +1,115 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 操作日志记录表 oper_log
+ *
+ * @author Lion Li
+ */
+
+@Data
+@TableName("sys_oper_log")
+public class SysOperLog implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 日志主键
+     */
+    @TableId(value = "oper_id")
+    private Long operId;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 操作模块
+     */
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+
+    /**
+     * 请求方法
+     */
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    private String requestMethod;
+
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
+    private Integer operatorType;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 请求url
+     */
+    private String operUrl;
+
+    /**
+     * 操作地址
+     */
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    private Date operTime;
+
+    /**
+     * 消耗时间
+     */
+    private Long costTime;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysOss.java

@@ -0,0 +1,50 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.ruoyi.common.tenant.core.TenantEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * OSS对象存储对象
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oss")
+public class SysOss extends TenantEntity {
+
+    /**
+     * 对象存储主键
+     */
+    @TableId(value = "oss_id")
+    private Long ossId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原名
+     */
+    private String originalName;
+
+    /**
+     * 文件后缀名
+     */
+    private String fileSuffix;
+
+    /**
+     * URL地址
+     */
+    private String url;
+
+    /**
+     * 服务商
+     */
+    private String service;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysOssConfig.java

@@ -0,0 +1,89 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.ruoyi.common.tenant.core.TenantEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 对象存储配置对象 sys_oss_config
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oss_config")
+public class SysOssConfig extends TenantEntity {
+
+    /**
+     * 主建
+     */
+    @TableId(value = "oss_config_id")
+    private Long ossConfigId;
+
+    /**
+     * 配置key
+     */
+    private String configKey;
+
+    /**
+     * accessKey
+     */
+    private String accessKey;
+
+    /**
+     * 秘钥
+     */
+    private String secretKey;
+
+    /**
+     * 桶名称
+     */
+    private String bucketName;
+
+    /**
+     * 前缀
+     */
+    private String prefix;
+
+    /**
+     * 访问站点
+     */
+    private String endpoint;
+
+    /**
+     * 自定义域名
+     */
+    private String domain;
+
+    /**
+     * 是否https（0否 1是）
+     */
+    private String isHttps;
+
+    /**
+     * 域
+     */
+    private String region;
+
+    /**
+     * 是否默认（0=是,1=否）
+     */
+    private String status;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 桶权限类型(0private 1public 2custom)
+     */
+    private String accessPolicy;
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysPackagePlan.java

@@ -0,0 +1,58 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 套餐管理对象 sys_package_plan
+ *
+ * @author Lion Li
+ * @date 2024-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_package_plan")
+public class SysPackagePlan extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 套餐名称
+     */
+    private String name;
+
+    /**
+     * 套餐价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 有效时间
+     */
+    private Long duration;
+
+    /**
+     * 计划详情
+     */
+    private String planDetail;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysPost.java

@@ -0,0 +1,51 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+/**
+ * 岗位表 sys_post
+ *
+ * @author Lion Li
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_post")
+public class SysPost extends TenantEntity {
+
+    /**
+     * 岗位序号
+     */
+    @TableId(value = "post_id")
+    private Long postId;
+
+    /**
+     * 岗位编码
+     */
+    private String postCode;
+
+    /**
+     * 岗位名称
+     */
+    private String postName;
+
+    /**
+     * 岗位排序
+     */
+    private Integer postSort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysRole.java

@@ -0,0 +1,79 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+/**
+ * 角色表 sys_role
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_role")
+public class SysRole extends TenantEntity {
+
+    /**
+     * 角色ID
+     */
+    @TableId(value = "role_id")
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+
+    /**
+     * 角色排序
+     */
+    private Integer roleSort;
+
+    /**
+     * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
+     */
+    private String dataScope;
+
+    /**
+     * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
+     */
+    private Boolean menuCheckStrictly;
+
+    /**
+     * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
+     */
+    private Boolean deptCheckStrictly;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public SysRole(Long roleId) {
+        this.roleId = roleId;
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysRoleDept.java

@@ -0,0 +1,29 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 角色和部门关联 sys_role_dept
+ *
+ * @author Lion Li
+ */
+
+@Data
+@TableName("sys_role_dept")
+public class SysRoleDept {
+
+    /**
+     * 角色ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long roleId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysRoleMenu.java

@@ -0,0 +1,29 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 角色和菜单关联 sys_role_menu
+ *
+ * @author Lion Li
+ */
+
+@Data
+@TableName("sys_role_menu")
+public class SysRoleMenu {
+
+    /**
+     * 角色ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long roleId;
+
+    /**
+     * 菜单ID
+     */
+    private Long menuId;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysTenant.java

@@ -0,0 +1,103 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 租户对象 sys_tenant
+ *
+ * @author Michelle.Chung
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_tenant")
+public class SysTenant extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 联系人
+     */
+    private String contactUserName;
+
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String licenseNumber;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 域名
+     */
+    private String domain;
+
+    /**
+     * 企业简介
+     */
+    private String intro;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 租户套餐编号
+     */
+    private Long packageId;
+
+    /**
+     * 过期时间
+     */
+    private Date expireTime;
+
+    /**
+     * 用户数量（-1不限制）
+     */
+    private Long accountCount;
+
+    /**
+     * 租户状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysTenantPackage.java

@@ -0,0 +1,56 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 租户套餐对象 sys_tenant_package
+ *
+ * @author Michelle.Chung
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_tenant_package")
+public class SysTenantPackage extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户套餐id
+     */
+    @TableId(value = "package_id")
+    private Long packageId;
+    /**
+     * 套餐名称
+     */
+    private String packageName;
+    /**
+     * 关联菜单id
+     */
+    private String menuIds;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
+     */
+    private Boolean menuCheckStrictly;
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysUser.java

@@ -0,0 +1,134 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.ruoyi.common.core.constant.UserConstants;
+import org.ruoyi.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_user")
+public class SysUser extends TenantEntity {
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id")
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+
+    /**
+     * 用户套餐
+     */
+    private String userPlan;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别
+     */
+    private String sex;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    @TableField(
+        insertStrategy = FieldStrategy.NOT_EMPTY,
+        updateStrategy = FieldStrategy.NOT_EMPTY,
+        whereStrategy = FieldStrategy.NOT_EMPTY
+    )
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 注册域名
+     */
+    private String domainName;
+
+    /**
+     * 最后登录时间
+     */
+    private Date loginDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /** 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序 */
+    private String openId;
+
+    /** 用户余额 */
+    private Double userBalance;
+
+    /** 用户等级 */
+    private String userGrade;
+
+    public SysUser(Long userId) {
+        this.userId = userId;
+    }
+
+    public boolean isSuperAdmin() {
+        return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysUserGroup.java

@@ -0,0 +1,58 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import org.ruoyi.common.tenant.core.TenantEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 【请填写功能名称】对象 sys_user_group
+ *
+ * @author Lion Li
+ * @date 2024-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_user_group")
+public class SysUserGroup extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户组名称
+     */
+    private String groupName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 版本
+     */
+    @Version
+    private Long version;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysUserModel.java

@@ -0,0 +1,42 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 【请填写功能名称】对象 sys_user_model
+ *
+ * @author Lion Li
+ * @date 2024-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_user_model")
+public class SysUserModel extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模型id
+     */
+    private Long mid;
+
+    /**
+     * 用户组id
+     */
+    private Long gid;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysUserOnline.java

@@ -0,0 +1,54 @@
+package org.ruoyi.system.domain;
+
+import lombok.Data;
+
+/**
+ * 当前在线会话
+ *
+ * @author Lion Li
+ */
+
+@Data
+public class SysUserOnline {
+
+    /**
+     * 会话编号
+     */
+    private String tokenId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地址
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysUserPost.java

@@ -0,0 +1,29 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 用户和岗位关联 sys_user_post
+ *
+ * @author Lion Li
+ */
+
+@Data
+@TableName("sys_user_post")
+public class SysUserPost {
+
+    /**
+     * 用户ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long userId;
+
+    /**
+     * 岗位ID
+     */
+    private Long postId;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/SysUserRole.java

@@ -0,0 +1,29 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 用户和角色关联 sys_user_role
+ *
+ * @author Lion Li
+ */
+
+@Data
+@TableName("sys_user_role")
+public class SysUserRole {
+
+    /**
+     * 用户ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long userId;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/VoiceRole.java

@@ -0,0 +1,63 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 配音角色对象 voice_role
+ *
+ * @author Lion Li
+ * @date 2024-03-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_audio_role")
+public class VoiceRole extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 角色名称
+     */
+    private String name;
+
+    /**
+     * 角色描述
+     */
+    private String description;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 角色id
+     */
+    private String voiceId;
+
+    /**
+     * 音频地址
+     */
+    private String fileUrl;
+
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/WxRobConfig.java

@@ -0,0 +1,66 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 微信机器人对象 wx_rob_config
+ *
+ * @author Lion Li
+ * @date 2024-05-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("chat_rob_config")
+public class WxRobConfig extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 机器人名称
+     */
+    private String botName;
+
+    /**
+     * 机器唯一码
+     */
+    private String uniqueKey;
+
+    /**
+     * 备注（微信号）
+     */
+    private String remark;
+
+    /**
+     * 默认好友回复开关
+     */
+    private String defaultFriend;
+
+    /**
+     * 默认群回复开关
+     */
+    private String defaultGroup;
+
+
+    /**
+     * 机器启用1禁用0
+     */
+    private String enable;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/WxRobKeyword.java

@@ -0,0 +1,67 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 【请填写功能名称】对象 wx_rob_keyword
+ *
+ * @author Lion Li
+ * @date 2024-05-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("wx_rob_keyword")
+public class WxRobKeyword extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 机器唯一码
+     */
+    private String uniqueKey;
+
+    /**
+     * 关键词
+     */
+    private String keyData;
+
+    /**
+     * 回复内容
+     */
+    private String valueData;
+
+    /**
+     * 回复类型
+     */
+    private String typeData;
+
+    /**
+     * 目标昵称
+     */
+    private String nickName;
+
+    /**
+     * 群1好友0
+     */
+    private Integer toGroup;
+
+    /**
+     * 启用1禁用0
+     */
+    private Integer enable;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/WxRobRelation.java

@@ -0,0 +1,62 @@
+package org.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 【请填写功能名称】对象 wx_rob_relation
+ *
+ * @author Lion Li
+ * @date 2024-05-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("wx_rob_relation")
+public class WxRobRelation extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 外接唯一码
+     */
+    private String outKey;
+
+    /**
+     * 机器唯一码
+     */
+    private String uniqueKey;
+
+    /**
+     * 目标昵称
+     */
+    private String nickName;
+
+    /**
+     * 群1好友0
+     */
+    private Integer toGroup;
+
+    /**
+     * 启用1禁用0
+     */
+    private Integer enable;
+
+    /**
+     * IP白名单
+     */
+    private String whiteList;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/ChatConfigBo.java

@@ -0,0 +1,68 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.ChatConfig;
+
+/**
+ * 对话配置信息
+业务对象 chat_config
+ *
+ * @author Lion Li
+ * @date 2024-04-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatConfig.class, reverseConvertGenerate = false)
+public class ChatConfigBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 配置类型
+     */
+    @NotBlank(message = "配置类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String category;
+
+    /**
+     * 配置名称
+     */
+    @NotBlank(message = "配置名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String configName;
+
+    /**
+     * 配置值
+     */
+    @NotBlank(message = "配置值不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String configValue;
+
+    /**
+     * 说明
+     */
+    @NotBlank(message = "参数说明不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String configDict;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 更新IP
+     */
+    @NotBlank(message = "更新IP不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String updateIp;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/ChatGptsBo.java

@@ -0,0 +1,87 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.ChatGpts;
+
+/**
+ * gpts管理业务对象 chat_gpts
+ *
+ * @author Lion Li
+ * @date 2024-07-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatGpts.class, reverseConvertGenerate = false)
+public class ChatGptsBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * gpts应用id
+     */
+    @NotBlank(message = "gpts应用id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String gid;
+
+    /**
+     * gpts应用名称
+     */
+    @NotBlank(message = "gpts应用名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * gpts图标
+     */
+    private String logo;
+
+    /**
+     * gpts描述
+     */
+    private String info;
+
+    /**
+     * 作者id
+     */
+    private String authorId;
+
+    /**
+     * 作者名称
+     */
+    private String authorName;
+
+    /**
+     * 点赞
+     */
+    private String useCnt;
+
+    /**
+     * 差评
+     */
+    private String bad;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/ChatMessageBo.java

@@ -0,0 +1,70 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.ChatMessage;
+
+/**
+ * 聊天消息业务对象 chat_message
+ *
+ * @author Lion Li
+ * @date 2023-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatMessage.class, reverseConvertGenerate = false)
+public class ChatMessageBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID", groups = { AddGroup.class, EditGroup.class })
+    private Long UserId;
+
+    /**
+     * 用户名称
+     */
+    private String UserName;
+
+    /**
+     * 消息内容
+     */
+    @NotBlank(message = "消息内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String content;
+
+    /**
+     * 扣除费用
+     */
+    private Double deductCost;
+
+    /**
+     * 累计 Tokens
+     */
+    @NotNull(message = "累计 Tokens不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer totalTokens;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String modelName;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/ChatVisitorUsageBo.java

@@ -0,0 +1,61 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.ChatVisitorUsage;
+
+/**
+ * 访客管理业务对象 chat_visitor_usage
+ *
+ * @author Lion Li
+ * @date 2024-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatVisitorUsage.class, reverseConvertGenerate = false)
+public class ChatVisitorUsageBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 浏览器指纹
+     */
+    @NotBlank(message = "浏览器指纹不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String fingerprint;
+
+    /**
+     * 使用次数
+     */
+    @NotBlank(message = "使用次数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String usageCount;
+
+    /**
+     * ip地址
+     */
+    @NotBlank(message = "ip地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String ipAddress;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 更新IP
+     */
+    @NotBlank(message = "更新IP不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String updateIp;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/ChatVoucherBo.java

@@ -0,0 +1,68 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.ChatVoucher;
+
+import java.math.BigDecimal;
+
+/**
+ * 用户兑换记录业务对象 chat_voucher
+ *
+ * @author Lion Li
+ * @date 2024-05-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatVoucher.class, reverseConvertGenerate = false)
+public class ChatVoucherBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 兑换码
+     */
+    private String code;
+
+    /**
+     * 兑换金额
+     */
+    @NotNull(message = "兑换金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal amount;
+
+    /**
+     * 兑换状态
+     */
+    private String status;
+
+    /**
+     * 兑换前余额
+     */
+    private Double balanceBefore;
+
+    /**
+     * 兑换后余额
+     */
+    private Double balanceAfter;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/PaymentOrdersBo.java

@@ -0,0 +1,76 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.PaymentOrder;
+
+import java.math.BigDecimal;
+
+/**
+ * 支付订单业务对象 payment_orders
+ *
+ * @author Lion Li
+ * @date 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PaymentOrder.class, reverseConvertGenerate = false)
+public class PaymentOrdersBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 订单编号
+     */
+    @NotBlank(message = "订单编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String orderNo;
+
+    /**
+     * 订单名称
+     */
+    @NotBlank(message = "订单名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String orderName;
+
+    /**
+     * 金额
+     */
+    @NotNull(message = "金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal amount;
+
+    /**
+     * 支付状态
+     */
+    @NotBlank(message = "支付状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String paymentStatus;
+
+    /**
+     * 支付方式
+     */
+    @NotBlank(message = "支付方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String paymentMethod;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysConfigBo.java

@@ -0,0 +1,63 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysConfig;
+
+/**
+ * 参数配置业务对象 sys_config
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysConfig.class, reverseConvertGenerate = false)
+public class SysConfigBo extends BaseEntity {
+
+    /**
+     * 参数主键
+     */
+    @NotNull(message = "参数主键不能为空", groups = { EditGroup.class })
+    private Long configId;
+
+    /**
+     * 参数名称
+     */
+    @NotBlank(message = "参数名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 100, message = "参数名称不能超过{max}个字符")
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    @NotBlank(message = "参数键名不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 100, message = "参数键名长度不能超过{max}个字符")
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    @NotBlank(message = "参数键值不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 500, message = "参数键值长度不能超过{max}个字符")
+    private String configValue;
+
+    /**
+     * 系统内置（Y是 N否）
+     */
+    private String configType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysDeptBo.java

@@ -0,0 +1,73 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysDept;
+
+/**
+ * 部门业务对象 sys_dept
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysDept.class, reverseConvertGenerate = false)
+public class SysDeptBo extends BaseEntity {
+
+    /**
+     * 部门id
+     */
+    @NotNull(message = "部门id不能为空", groups = { EditGroup.class })
+    private Long deptId;
+
+    /**
+     * 父部门ID
+     */
+    private Long parentId;
+
+    /**
+     * 部门名称
+     */
+    @NotBlank(message = "部门名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 30, message = "部门名称长度不能超过{max}个字符")
+    private String deptName;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空")
+    private Integer orderNum;
+
+    /**
+     * 负责人
+     */
+    private String leader;
+
+    /**
+     * 联系电话
+     */
+    @Size(min = 0, max = 11, message = "联系电话长度不能超过{max}个字符")
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符")
+    private String email;
+
+    /**
+     * 部门状态（0正常 1停用）
+     */
+    private String status;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysDictDataBo.java

@@ -0,0 +1,88 @@
+package org.ruoyi.system.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysDictData;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 字典数据业务对象 sys_dict_data
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysDictData.class, reverseConvertGenerate = false)
+public class SysDictDataBo extends BaseEntity {
+
+    /**
+     * 字典编码
+     */
+    @NotNull(message = "字典编码不能为空", groups = { EditGroup.class })
+    private Long dictCode;
+
+    /**
+     * 字典排序
+     */
+    private Integer dictSort;
+
+    /**
+     * 字典标签
+     */
+    @NotBlank(message = "字典标签不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 100, message = "字典标签长度不能超过{max}个字符")
+    private String dictLabel;
+
+    /**
+     * 字典键值
+     */
+    @NotBlank(message = "字典键值不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 100, message = "字典键值长度不能超过{max}个字符")
+    private String dictValue;
+
+    /**
+     * 字典类型
+     */
+    @NotBlank(message = "字典类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 100, message = "字典类型长度不能超过{max}个字符")
+    private String dictType;
+
+    /**
+     * 样式属性（其他样式扩展）
+     */
+    @Size(min = 0, max = 100, message = "样式属性长度不能超过{max}个字符")
+    private String cssClass;
+
+    /**
+     * 表格回显样式
+     */
+    private String listClass;
+
+    /**
+     * 是否默认（Y是 N否）
+     */
+    private String isDefault;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 创建部门
+     */
+    private Long createDept;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysDictTypeBo.java

@@ -0,0 +1,58 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysDictType;
+
+/**
+ * 字典类型业务对象 sys_dict_type
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysDictType.class, reverseConvertGenerate = false)
+public class SysDictTypeBo extends BaseEntity {
+
+    /**
+     * 字典主键
+     */
+    @NotNull(message = "字典主键不能为空", groups = { EditGroup.class })
+    private Long dictId;
+
+    /**
+     * 字典名称
+     */
+    @NotBlank(message = "字典名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过{max}个字符")
+    private String dictName;
+
+    /**
+     * 字典类型
+     */
+    @NotBlank(message = "字典类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过{max}个字符")
+    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
+    private String dictType;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysLogininforBo.java

@@ -0,0 +1,77 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.ruoyi.system.domain.SysLogininfor;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 系统访问记录业务对象 sys_logininfor
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@AutoMapper(target = SysLogininfor.class, reverseConvertGenerate = false)
+public class SysLogininforBo {
+
+    /**
+     * 访问ID
+     */
+    private Long infoId;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 登录状态（0成功 1失败）
+     */
+    private String status;
+
+    /**
+     * 提示消息
+     */
+    private String msg;
+
+    /**
+     * 访问时间
+     */
+    private Date loginTime;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params = new HashMap<>();
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysMenuBo.java

@@ -0,0 +1,111 @@
+package org.ruoyi.system.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysMenu;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 菜单权限业务对象 sys_menu
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysMenu.class, reverseConvertGenerate = false)
+public class SysMenuBo extends BaseEntity {
+
+    /**
+     * 菜单ID
+     */
+    @NotNull(message = "菜单ID不能为空", groups = { EditGroup.class })
+    private Long menuId;
+
+    /**
+     * 父菜单ID
+     */
+    private Long parentId;
+
+    /**
+     * 菜单名称
+     */
+    @NotBlank(message = "菜单名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 50, message = "菜单名称长度不能超过{max}个字符")
+    private String menuName;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer orderNum;
+
+    /**
+     * 路由地址
+     */
+    @Size(min = 0, max = 200, message = "路由地址不能超过{max}个字符")
+    private String path;
+
+    /**
+     * 组件路径
+     */
+    @Size(min = 0, max = 200, message = "组件路径不能超过{max}个字符")
+    private String component;
+
+    /**
+     * 路由参数
+     */
+    private String queryParam;
+
+    /**
+     * 是否为外链（0是 1否）
+     */
+    private String isFrame;
+
+    /**
+     * 是否缓存（0缓存 1不缓存）
+     */
+    private String isCache;
+
+    /**
+     * 菜单类型（M目录 C菜单 F按钮）
+     */
+    @NotBlank(message = "菜单类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String menuType;
+
+    /**
+     * 显示状态（0显示 1隐藏）
+     */
+    private String visible;
+
+    /**
+     * 菜单状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 权限标识
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @Size(min = 0, max = 100, message = "权限标识长度不能超过{max}个字符")
+    private String perms;
+
+    /**
+     * 菜单图标
+     */
+    private String icon;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysModelBo.java

@@ -0,0 +1,82 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysModel;
+
+/**
+ * 系统模型业务对象 sys_model
+ *
+ * @author Lion Li
+ * @date 2024-04-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysModel.class, reverseConvertGenerate = false)
+public class SysModelBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String modelName;
+
+
+    /**
+     * 模型描述
+     */
+    @NotBlank(message = "模型描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String modelDescribe;
+
+    /**
+     * 模型价格
+     */
+    @NotNull(message = "模型价格不能为空", groups = { AddGroup.class, EditGroup.class })
+    private double modelPrice;
+
+    /**
+     * 计费类型 (1 token扣费; 2 次数扣费 )
+     */
+    @NotBlank(message = "计费类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String modelType;
+
+    /**
+     * 模型状态  (0 显示; 1 隐藏 )
+     */
+    private String modelShow;
+
+
+    /**
+     * 系统提示词
+     */
+    private String systemPrompt;
+
+    /**
+     * 请求地址
+     */
+    private String apiHost;
+
+    /**
+     * 请求密钥
+     */
+    private String apiKey;
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysNoticeBo.java

@@ -0,0 +1,65 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.core.xss.Xss;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysNotice;
+
+/**
+ * 通知公告业务对象 sys_notice
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysNotice.class, reverseConvertGenerate = false)
+public class SysNoticeBo extends BaseEntity {
+
+    /**
+     * 公告ID
+     */
+    @NotNull(message = "公告ID不能为空", groups = { EditGroup.class })
+    private Long noticeId;
+
+    /**
+     * 公告标题
+     */
+    @Xss(message = "公告标题不能包含脚本字符")
+    @NotBlank(message = "公告标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 50, message = "公告标题不能超过{max}个字符")
+    private String noticeTitle;
+
+    /**
+     * 公告类型（1通知 2公告）
+     */
+    private String noticeType;
+
+    /**
+     * 公告内容
+     */
+    private String noticeContent;
+
+    /**
+     * 公告状态（0正常 1关闭）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人名称
+     */
+    private String createByName;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysNoticeStateBo.java

@@ -0,0 +1,54 @@
+package org.ruoyi.system.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.system.domain.SysNoticeState;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 用户阅读状态业务对象 sys_notice_state
+ *
+ * @author Lion Li
+ * @date 2024-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysNoticeState.class, reverseConvertGenerate = false)
+public class SysNoticeStateBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 公告ID
+     */
+    @NotNull(message = "公告ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long noticeId;
+
+    /**
+     * 阅读状态（0未读 1已读）
+     */
+    @NotBlank(message = "阅读状态（0未读 1已读）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String readStatus;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysOperLogBo.java

@@ -0,0 +1,127 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMappers;
+import lombok.Data;
+import org.ruoyi.common.log.event.OperLogEvent;
+import org.ruoyi.system.domain.SysOperLog;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 操作日志记录业务对象 sys_oper_log
+ *
+ * @author Michelle.Chung
+ * @date 2023-02-07
+ */
+
+@Data
+@AutoMappers({
+    @AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false),
+    @AutoMapper(target = OperLogEvent.class)
+})
+public class SysOperLogBo {
+
+    /**
+     * 日志主键
+     */
+    private Long operId;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 模块标题
+     */
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+
+    /**
+     * 业务类型数组
+     */
+    private Integer[] businessTypes;
+
+    /**
+     * 方法名称
+     */
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    private String requestMethod;
+
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
+    private Integer operatorType;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 请求URL
+     */
+    private String operUrl;
+
+    /**
+     * 主机地址
+     */
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    private Date operTime;
+
+    /**
+     * 消耗时间
+     */
+    private Long costTime;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params = new HashMap<>();
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysOssBo.java

@@ -0,0 +1,49 @@
+package org.ruoyi.system.domain.bo;
+
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysOss;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * OSS对象存储分页查询对象 sys_oss
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysOss.class, reverseConvertGenerate = false)
+public class SysOssBo extends BaseEntity {
+
+    /**
+     * ossId
+     */
+    private Long ossId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原名
+     */
+    private String originalName;
+
+    /**
+     * 文件后缀名
+     */
+    private String fileSuffix;
+
+    /**
+     * URL地址
+     */
+    private String url;
+
+    /**
+     * 服务商
+     */
+    private String service;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysOssConfigBo.java

@@ -0,0 +1,109 @@
+package org.ruoyi.system.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysOssConfig;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 对象存储配置业务对象 sys_oss_config
+ *
+ * @author Lion Li
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false)
+public class SysOssConfigBo extends BaseEntity {
+
+    /**
+     * 主建
+     */
+    @NotNull(message = "主建不能为空", groups = {EditGroup.class})
+    private Long ossConfigId;
+
+    /**
+     * 配置key
+     */
+    @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "configKey长度必须介于{min}和{max} 之间")
+    private String configKey;
+
+    /**
+     * accessKey
+     */
+    @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "accessKey长度必须介于{min}和{max} 之间")
+    private String accessKey;
+
+    /**
+     * 秘钥
+     */
+    @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "secretKey长度必须介于{min}和{max} 之间")
+    private String secretKey;
+
+    /**
+     * 桶名称
+     */
+    @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "bucketName长度必须介于{min}和{max}之间")
+    private String bucketName;
+
+    /**
+     * 前缀
+     */
+    private String prefix;
+
+    /**
+     * 访问站点
+     */
+    @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "endpoint长度必须介于{min}和{max}之间")
+    private String endpoint;
+
+    /**
+     * 自定义域名
+     */
+    private String domain;
+
+    /**
+     * 是否https（Y=是,N=否）
+     */
+    private String isHttps;
+
+    /**
+     * 是否默认（0=是,1=否）
+     */
+    private String status;
+
+    /**
+     * 域
+     */
+    private String region;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 桶权限类型(0private 1public 2custom)
+     */
+    @NotBlank(message = "桶权限类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String accessPolicy;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysPackagePlanBo.java

@@ -0,0 +1,61 @@
+package org.ruoyi.system.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.system.domain.SysPackagePlan;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.math.BigDecimal;
+
+/**
+ * 套餐管理业务对象 sys_package_plan
+ *
+ * @author Lion Li
+ * @date 2024-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysPackagePlan.class, reverseConvertGenerate = false)
+public class SysPackagePlanBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 套餐名称
+     */
+    @NotBlank(message = "套餐名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 套餐价格
+     */
+    @NotNull(message = "套餐价格不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal price;
+
+    /**
+     * 有效时间
+     */
+    @NotNull(message = "有效时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long duration;
+
+    /**
+     * 计划详情
+     */
+    @NotBlank(message = "计划详情不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String planDetail;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysPostBo.java

@@ -0,0 +1,62 @@
+package org.ruoyi.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysPost;
+
+/**
+ * 岗位信息业务对象 sys_post
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysPost.class, reverseConvertGenerate = false)
+public class SysPostBo extends BaseEntity {
+
+    /**
+     * 岗位ID
+     */
+    @NotNull(message = "岗位ID不能为空", groups = { EditGroup.class })
+    private Long postId;
+
+    /**
+     * 岗位编码
+     */
+    @NotBlank(message = "岗位编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 64, message = "岗位编码长度不能超过{max}个字符")
+    private String postCode;
+
+    /**
+     * 岗位名称
+     */
+    @NotBlank(message = "岗位名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 50, message = "岗位名称长度不能超过{max}个字符")
+    private String postName;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer postSort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysRoleBo.java

@@ -0,0 +1,97 @@
+package org.ruoyi.system.domain.bo;
+
+import org.ruoyi.common.core.constant.UserConstants;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysRole;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 角色信息业务对象 sys_role
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysRole.class, reverseConvertGenerate = false)
+public class SysRoleBo extends BaseEntity {
+
+    /**
+     * 角色ID
+     */
+    @NotNull(message = "角色ID不能为空", groups = { EditGroup.class })
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    @NotBlank(message = "角色名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 30, message = "角色名称长度不能超过{max}个字符")
+    private String roleName;
+
+    /**
+     * 角色权限字符串
+     */
+    @NotBlank(message = "角色权限字符串不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Size(min = 0, max = 100, message = "权限字符长度不能超过{max}个字符")
+    private String roleKey;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer roleSort;
+
+    /**
+     * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）
+     */
+    private String dataScope;
+
+    /**
+     * 菜单树选择项是否关联显示
+     */
+    private Boolean menuCheckStrictly;
+
+    /**
+     * 部门树选择项是否关联显示
+     */
+    private Boolean deptCheckStrictly;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 菜单组
+     */
+    private Long[] menuIds;
+
+    /**
+     * 部门组（数据权限）
+     */
+    private Long[] deptIds;
+
+    public SysRoleBo(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public boolean isSuperAdmin() {
+        return UserConstants.SUPER_ADMIN_ID.equals(this.roleId);
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/SysTenantBo.java

@@ -0,0 +1,114 @@
+package org.ruoyi.system.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import org.ruoyi.system.domain.SysTenant;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 租户业务对象 sys_tenant
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysTenant.class, reverseConvertGenerate = false)
+public class SysTenantBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 联系人
+     */
+    @NotBlank(message = "联系人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contactUserName;
+
+    /**
+     * 联系电话
+     */
+    @NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contactPhone;
+
+    /**
+     * 企业名称
+     */
+    @NotBlank(message = "企业名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String companyName;
+
+    /**
+     * 用户名（创建系统用户）
+     */
+    @NotBlank(message = "用户名不能为空", groups = { AddGroup.class })
+    private String username;
+
+    /**
+     * 密码（创建系统用户）
+     */
+    @NotBlank(message = "密码不能为空", groups = { AddGroup.class })
+    private String password;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String licenseNumber;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 域名
+     */
+    private String domain;
+
+    /**
+     * 企业简介
+     */
+    private String intro;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 租户套餐编号
+     */
+    @NotNull(message = "租户套餐不能为空", groups = { AddGroup.class })
+    private Long packageId;
+
+    /**
+     * 过期时间
+     */
+    private Date expireTime;
+
+    /**
+     * 用户数量（-1不限制）
+     */
+    private Long accountCount;
+
+    /**
+     * 租户状态（0正常 1停用）
+     */
+    private String status;
+
+
+}