feat: 1. 调整项目结构 2.增加插件管理

This commit is contained in:
ageer
2025-03-31 19:13:27 +08:00
parent 6382e177bf
commit 412e8bdc10
495 changed files with 646 additions and 121 deletions

5
.gitignore vendored
View File

@@ -1,6 +1,9 @@
###################################################################### ######################################################################
# Build Tools # Build Tools
.gradle .gradle
/build/ /build/
!gradle/wrapper/gradle-wrapper.jar !gradle/wrapper/gradle-wrapper.jar
@@ -8,6 +11,8 @@
target/ target/
!.mvn/wrapper/maven-wrapper.jar !.mvn/wrapper/maven-wrapper.jar
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vben5
###################################################################### ######################################################################
# IDE # IDE

View File

@@ -317,7 +317,7 @@
<dependency> <dependency>
<groupId>org.ruoyi</groupId> <groupId>org.ruoyi</groupId>
<artifactId>ruoyi-fusion</artifactId> <artifactId>ruoyi-chat</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>

View File

@@ -54,7 +54,7 @@
<dependency> <dependency>
<groupId>org.ruoyi</groupId> <groupId>org.ruoyi</groupId>
<artifactId>ruoyi-fusion</artifactId> <artifactId>ruoyi-chat</artifactId>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -3,7 +3,6 @@ package org.ruoyi.controller;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.hutool.json.ObjectMapper;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
import org.ruoyi.common.core.constant.Constants; import org.ruoyi.common.core.constant.Constants;
import org.ruoyi.common.core.domain.R; import org.ruoyi.common.core.domain.R;
@@ -76,6 +75,7 @@ public class AuthController {
body.getUsername(), body.getPassword(), body.getUsername(), body.getPassword(),
body.getCode(), body.getUuid()); body.getCode(), body.getUuid());
loginVo.setToken(token); loginVo.setToken(token);
loginVo.setAccess_token(token);
loginVo.setUserInfo(LoginHelper.getLoginUser()); loginVo.setUserInfo(LoginHelper.getLoginUser());
return R.ok(loginVo); return R.ok(loginVo);
} }

View File

@@ -34,6 +34,7 @@
<module>ruoyi-common-chat</module> <module>ruoyi-common-chat</module>
<module>ruoyi-common-pay</module> <module>ruoyi-common-pay</module>
<module>ruoyi-common-wechat</module> <module>ruoyi-common-wechat</module>
<module>ruoyi-common-live</module>
</modules> </modules>
<artifactId>ruoyi-common</artifactId> <artifactId>ruoyi-common</artifactId>

View File

@@ -169,7 +169,7 @@
<!-- AI绘画 --> <!-- AI绘画 -->
<dependency> <dependency>
<groupId>org.ruoyi</groupId> <groupId>org.ruoyi</groupId>
<artifactId>ruoyi-fusion</artifactId> <artifactId>ruoyi-chat</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>

View File

@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.ruoyi</groupId> <groupId>org.ruoyi</groupId>
<artifactId>ruoyi-live</artifactId> <artifactId>ruoyi-common-live</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

View File

@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.ruoyi</groupId> <groupId>org.ruoyi</groupId>
<artifactId>ruoyi-live</artifactId> <artifactId>ruoyi-common-live</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

Some files were not shown because too many files have changed in this diff Show More