pom.xml
@@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.ruoyi</groupId> <artifactId>ruoyi</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd</artifactId> <version>3.6.8</version> <name>ruoyi</name> <url>http://www.ruoyi.vip</url> <description>若依微服务系统</description> <name>sgd</name> <url>http://www.sgd.vip</url> <description>sgd微服务系统</description> <properties> <ruoyi.version>3.6.8</ruoyi.version> <sgd.version>3.6.8</sgd.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>17</java.version> @@ -144,84 +144,84 @@ <!-- 核心模块 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-core</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-core</artifactId> <version>${sgd.version}</version> </dependency> <!-- 接口模块 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-swagger</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-swagger</artifactId> <version>${sgd.version}</version> </dependency> <!-- 安全模块 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-security</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-security</artifactId> <version>${sgd.version}</version> </dependency> <!-- 数据脱敏 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-sensitive</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-sensitive</artifactId> <version>${sgd.version}</version> </dependency> <!-- 权限范围 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-datascope</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-datascope</artifactId> <version>${sgd.version}</version> </dependency> <!-- 多数据源 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-datasource</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-datasource</artifactId> <version>${sgd.version}</version> </dependency> <!-- 分布式事务 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-seata</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-seata</artifactId> <version>${sgd.version}</version> </dependency> <!-- 日志记录 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-log</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-log</artifactId> <version>${sgd.version}</version> </dependency> <!-- 缓存服务 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-redis</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-common-redis</artifactId> <version>${sgd.version}</version> </dependency> <!-- 系统接口 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-api-system</artifactId> <version>${ruoyi.version}</version> <groupId>com.sgd</groupId> <artifactId>sgd-api-system</artifactId> <version>${sgd.version}</version> </dependency> </dependencies> </dependencyManagement> <modules> <module>ruoyi-auth</module> <module>ruoyi-gateway</module> <module>ruoyi-visual</module> <module>ruoyi-modules</module> <module>ruoyi-api</module> <module>ruoyi-common</module> <module>sgd-auth</module> <module>sgd-gateway</module> <module>sgd-visual</module> <module>sgd-modules</module> <module>sgd-api</module> <module>sgd-common</module> </modules> <packaging>pom</packaging>
File was deleted ruoyi-common/ruoyi-common-datascope/pom.xml
File was deleted ruoyi-modules/pom.xml
File was deleted sgd-api/pom.xml
File was renamed from ruoyi-api/pom.xml @@ -2,21 +2,21 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <modules> <module>ruoyi-api-system</module> <module>sgd-api-system</module> </modules> <artifactId>ruoyi-api</artifactId> <artifactId>sgd-api</artifactId> <packaging>pom</packaging> <description> ruoyi-api系统接口 sgd-api系统接口 </description> </project> sgd-auth/pom.xml
File was renamed from ruoyi-auth/pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-auth</artifactId> <artifactId>sgd-auth</artifactId> <description> ruoyi-auth认证授权中心 sgd-auth认证授权中心 </description> <dependencies> @@ -46,10 +46,10 @@ <artifactId>spring-boot-starter-actuator</artifactId> </dependency> <!-- RuoYi Common Security--> <!-- sgd Common Security--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-security</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-security</artifactId> </dependency> </dependencies> sgd-common/pom.xml
New file @@ -0,0 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.sgd</groupId> <artifactId>sgd</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <modules> <module>sgd-common-log</module> <module>sgd-common-core</module> <module>sgd-common-redis</module> <module>sgd-common-seata</module> <module>sgd-common-swagger</module> <module>sgd-common-security</module> <module>sgd-common-sensitive</module> <module>sgd-common-datascope</module> <module>sgd-common-datasource</module> </modules> <artifactId>sgd-common</artifactId> <packaging>pom</packaging> <description> sgd-common通用模块 </description> </project> sgd-common/sgd-common-core/pom.xml
File was renamed from ruoyi-common/ruoyi-common-core/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-core</artifactId> <artifactId>sgd-common-core</artifactId> <description> ruoyi-common-core核心模块 sgd-common-core核心模块 </description> <dependencies> sgd-common/sgd-common-datascope/pom.xml
File was renamed from ruoyi-common/ruoyi-common-log/pom.xml @@ -3,24 +3,24 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-log</artifactId> <artifactId>sgd-common-datascope</artifactId> <description> ruoyi-common-log日志记录 sgd-common-datascope权限范围 </description> <dependencies> <!-- RuoYi Common Security --> <!-- sgd Common Security --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-security</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-security</artifactId> </dependency> </dependencies> sgd-common/sgd-common-datasource/pom.xml
File was renamed from ruoyi-common/ruoyi-common-datasource/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-datasource</artifactId> <artifactId>sgd-common-datasource</artifactId> <description> ruoyi-common-datasource多数据源 sgd-common-datasource多数据源 </description> <dependencies> sgd-common/sgd-common-log/pom.xmlcopy from ruoyi-common/ruoyi-common-log/pom.xml copy to sgd-common/sgd-common-log/pom.xml
File was copied from ruoyi-common/ruoyi-common-log/pom.xml @@ -3,24 +3,24 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-log</artifactId> <artifactId>sgd-common-log</artifactId> <description> ruoyi-common-log日志记录 sgd-common-log日志记录 </description> <dependencies> <!-- RuoYi Common Security --> <!-- sgd Common Security --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-security</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-security</artifactId> </dependency> </dependencies> sgd-common/sgd-common-redis/pom.xml
File was renamed from ruoyi-common/ruoyi-common-redis/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-redis</artifactId> <artifactId>sgd-common-redis</artifactId> <description> ruoyi-common-redis缓存服务 sgd-common-redis缓存服务 </description> <dependencies> @@ -23,10 +23,10 @@ <artifactId>spring-boot-starter-data-redis</artifactId> </dependency> <!-- RuoYi Common Core--> <!-- sgd Common Core--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-core</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-core</artifactId> </dependency> </dependencies> sgd-common/sgd-common-seata/pom.xml
File was renamed from ruoyi-common/ruoyi-common-seata/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-seata</artifactId> <artifactId>sgd-common-seata</artifactId> <description> ruoyi-common-seata分布式事务 sgd-common-seata分布式事务 </description> <dependencies> sgd-common/sgd-common-security/pom.xml
File was renamed from ruoyi-common/ruoyi-common-security/pom.xml @@ -2,16 +2,16 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-security</artifactId> <artifactId>sgd-common-security</artifactId> <description> ruoyi-common-security安全模块 sgd-common-security安全模块 </description> <dependencies> @@ -22,16 +22,16 @@ <artifactId>spring-webmvc</artifactId> </dependency> <!-- RuoYi Api System --> <!-- sgd Api System --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-api-system</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-api-system</artifactId> </dependency> <!-- RuoYi Common Redis--> <!-- sgd Common Redis--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-redis</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-redis</artifactId> </dependency> </dependencies> sgd-common/sgd-common-security/src/main/java/com/sgd/common/security/aspect/PreAuthorizeAspect.java
File was renamed from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java @@ -1,4 +1,4 @@ package com.ruoyi.common.security.aspect; package com.sgd.common.security.aspect; import java.lang.reflect.Method; import org.aspectj.lang.ProceedingJoinPoint; @@ -7,10 +7,10 @@ import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; import com.ruoyi.common.security.annotation.RequiresLogin; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.annotation.RequiresRoles; import com.ruoyi.common.security.auth.AuthUtil; import com.sgd.common.security.annotation.RequiresLogin; import com.sgd.common.security.annotation.RequiresPermissions; import com.sgd.common.security.annotation.RequiresRoles; import com.sgd.common.security.auth.AuthUtil; /** * 基于 Spring Aop 的注解鉴权 @@ -31,9 +31,9 @@ /** * 定义AOP签名 (切入所有使用鉴权注解的方法) */ public static final String POINTCUT_SIGN = " @annotation(com.ruoyi.common.security.annotation.RequiresLogin) || " + "@annotation(com.ruoyi.common.security.annotation.RequiresPermissions) || " + "@annotation(com.ruoyi.common.security.annotation.RequiresRoles)"; public static final String POINTCUT_SIGN = " @annotation(com.sgd.common.security.annotation.RequiresLogin) || " + "@annotation(com.sgd.common.security.annotation.RequiresPermissions) || " + "@annotation(com.sgd.common.security.annotation.RequiresRoles)"; /** * 声明AOP签名 sgd-common/sgd-common-security/src/main/java/com/sgd/common/security/service/TokenService.java
File was renamed from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -1,4 +1,4 @@ package com.ruoyi.common.security.service; package com.sgd.common.security.service; import java.util.HashMap; import java.util.Map; @@ -8,16 +8,16 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.utils.JwtUtils; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.ip.IpUtils; import com.ruoyi.common.core.utils.uuid.IdUtils; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; import com.sgd.common.core.constant.CacheConstants; import com.sgd.common.core.constant.SecurityConstants; import com.sgd.common.core.utils.JwtUtils; import com.sgd.common.core.utils.ServletUtils; import com.sgd.common.core.utils.StringUtils; import com.sgd.common.core.utils.ip.IpUtils; import com.sgd.common.core.utils.uuid.IdUtils; import com.sgd.common.redis.service.RedisService; import com.sgd.common.security.utils.SecurityUtils; import com.sgd.system.api.model.LoginUser; /** * token验证处理 sgd-common/sgd-common-security/src/main/java/com/sgd/common/security/utils/SecurityUtils.java
File was renamed from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java @@ -1,13 +1,13 @@ package com.ruoyi.common.security.utils; package com.sgd.common.security.utils; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.TokenConstants; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.context.SecurityContextHolder; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.model.LoginUser; import com.sgd.common.core.constant.SecurityConstants; import com.sgd.common.core.constant.TokenConstants; import com.sgd.common.core.constant.UserConstants; import com.sgd.common.core.context.SecurityContextHolder; import com.sgd.common.core.utils.ServletUtils; import com.sgd.common.core.utils.StringUtils; import com.sgd.system.api.model.LoginUser; import jakarta.servlet.http.HttpServletRequest; /** sgd-common/sgd-common-sensitive/pom.xml
File was renamed from ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -3,24 +3,24 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-sensitive</artifactId> <artifactId>sgd-common-sensitive</artifactId> <description> ruoyi-common-sensitive数据脱敏 sgd-common-sensitive数据脱敏 </description> <dependencies> <!-- RuoYi Common Core --> <!-- sgd Common Core --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-core</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-core</artifactId> </dependency> </dependencies> sgd-common/sgd-common-swagger/pom.xml
File was renamed from ruoyi-common/ruoyi-common-swagger/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-common-swagger</artifactId> <artifactId>sgd-common-swagger</artifactId> <description> ruoyi-common-swagger系统接口 sgd-common-swagger系统接口 </description> <dependencies> sgd-gateway/pom.xml
File was renamed from ruoyi-gateway/pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-gateway</artifactId> <artifactId>sgd-gateway</artifactId> <description> ruoyi-gateway网关模块 sgd-gateway网关模块 </description> <dependencies> @@ -70,10 +70,10 @@ <artifactId>kaptcha</artifactId> </dependency> <!-- RuoYi Common Redis--> <!-- sgd Common Redis--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-redis</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-redis</artifactId> </dependency> <!-- Springdoc --> sgd-modules/pom.xml
File was renamed from ruoyi-visual/pom.xml @@ -2,21 +2,24 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <modules> <module>ruoyi-monitor</module> <module>sgd-system</module> <module>sgd-gen</module> <module>sgd-job</module> <module>sgd-file</module> </modules> <artifactId>ruoyi-visual</artifactId> <artifactId>sgd-modules</artifactId> <packaging>pom</packaging> <description> ruoyi-visual图形化管理模块 sgd-modules业务模块 </description> </project> sgd-modules/sgd-file/pom.xml
File was renamed from ruoyi-modules/ruoyi-file/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-modules</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-modules</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-modules-file</artifactId> <artifactId>sgd-modules-file</artifactId> <description> ruoyi-modules-file文件服务 sgd-modules-file文件服务 </description> <dependencies> @@ -54,10 +54,10 @@ <version>${minio.version}</version> </dependency> <!-- RuoYi Api System --> <!-- sgd Api System --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-api-system</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-api-system</artifactId> </dependency> </dependencies> sgd-modules/sgd-gen/pom.xml
File was renamed from ruoyi-modules/ruoyi-gen/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-modules</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-modules</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-modules-gen</artifactId> <artifactId>sgd-modules-gen</artifactId> <description> ruoyi-modules-gen代码生成 sgd-modules-gen代码生成 </description> <dependencies> @@ -53,16 +53,16 @@ <artifactId>mysql-connector-j</artifactId> </dependency> <!-- RuoYi Common Log --> <!-- sgd Common Log --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-log</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-log</artifactId> </dependency> <!-- RuoYi Common Swagger --> <!-- sgd Common Swagger --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-swagger</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-swagger</artifactId> </dependency> </dependencies> sgd-modules/sgd-job/pom.xml
File was renamed from ruoyi-modules/ruoyi-job/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-modules</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-modules</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-modules-job</artifactId> <artifactId>sgd-modules-job</artifactId> <description> ruoyi-modules-job定时任务 sgd-modules-job定时任务 </description> <dependencies> @@ -53,16 +53,16 @@ <artifactId>mysql-connector-j</artifactId> </dependency> <!-- RuoYi Common Log --> <!-- sgd Common Log --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-log</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-log</artifactId> </dependency> <!-- RuoYi Common Swagger --> <!-- sgd Common Swagger --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-swagger</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-swagger</artifactId> </dependency> </dependencies> sgd-modules/sgd-job/src/main/resources/mapper/job/SysJobLogMapper.xml
File was renamed from ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.job.mapper.SysJobLogMapper"> <mapper namespace="com.sgd.job.mapper.SysJobLogMapper"> <resultMap type="SysJobLog" id="SysJobLogResult"> <id property="jobLogId" column="job_log_id" /> sgd-modules/sgd-job/src/main/resources/mapper/job/SysJobMapper.xml
File was renamed from ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.job.mapper.SysJobMapper"> <mapper namespace="com.sgd.job.mapper.SysJobMapper"> <resultMap type="SysJob" id="SysJobResult"> <id property="jobId" column="job_id" /> sgd-modules/sgd-system/pom.xml
File was renamed from ruoyi-modules/ruoyi-system/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-modules</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-modules</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ruoyi-modules-system</artifactId> <artifactId>sgd-modules-system</artifactId> <description> ruoyi-modules-system系统模块 sgd-modules-system系统模块 </description> <dependencies> @@ -47,28 +47,28 @@ <artifactId>mysql-connector-j</artifactId> </dependency> <!-- RuoYi Common DataSource --> <!-- sgd Common DataSource --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-datasource</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-datasource</artifactId> </dependency> <!-- RuoYi Common DataScope --> <!-- sgd Common DataScope --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-datascope</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-datascope</artifactId> </dependency> <!-- RuoYi Common Log --> <!-- sgd Common Log --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-log</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-log</artifactId> </dependency> <!-- RuoYi Common Swagger --> <!-- sgd Common Swagger --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-swagger</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd-common-swagger</artifactId> </dependency> </dependencies> sgd-modules/sgd-system/src/main/resources/mapper/system/SysConfigMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper"> <mapper namespace="com.sgd.system.mapper.SysConfigMapper"> <resultMap type="SysConfig" id="SysConfigResult"> <id property="configId" column="config_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysDeptMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper"> <mapper namespace="com.sgd.system.mapper.SysDeptMapper"> <resultMap type="SysDept" id="SysDeptResult"> <id property="deptId" column="dept_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysDictDataMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper"> <mapper namespace="com.sgd.system.mapper.SysDictDataMapper"> <resultMap type="SysDictData" id="SysDictDataResult"> <id property="dictCode" column="dict_code" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper"> <mapper namespace="com.sgd.system.mapper.SysDictTypeMapper"> <resultMap type="SysDictType" id="SysDictTypeResult"> <id property="dictId" column="dict_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysLogininforMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper"> <mapper namespace="com.sgd.system.mapper.SysLogininforMapper"> <resultMap type="SysLogininfor" id="SysLogininforResult"> <id property="infoId" column="info_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysMenuMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper"> <mapper namespace="com.sgd.system.mapper.SysMenuMapper"> <resultMap type="SysMenu" id="SysMenuResult"> <id property="menuId" column="menu_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysNoticeMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper"> <mapper namespace="com.sgd.system.mapper.SysNoticeMapper"> <resultMap type="SysNotice" id="SysNoticeResult"> <result property="noticeId" column="notice_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysNoticeReadMapper"> <mapper namespace="com.sgd.system.mapper.SysNoticeReadMapper"> <resultMap type="SysNoticeRead" id="SysNoticeReadResult"> <id property="readId" column="read_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysOperLogMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper"> <mapper namespace="com.sgd.system.mapper.SysOperLogMapper"> <resultMap type="SysOperLog" id="SysOperLogResult"> <id property="operId" column="oper_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysPostMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysPostMapper"> <mapper namespace="com.sgd.system.mapper.SysPostMapper"> <resultMap type="SysPost" id="SysPostResult"> <id property="postId" column="post_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper"> <mapper namespace="com.sgd.system.mapper.SysRoleDeptMapper"> <resultMap type="SysRoleDept" id="SysRoleDeptResult"> <result property="roleId" column="role_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysRoleMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper"> <mapper namespace="com.sgd.system.mapper.SysRoleMapper"> <resultMap type="SysRole" id="SysRoleResult"> <id property="roleId" column="role_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper"> <mapper namespace="com.sgd.system.mapper.SysRoleMenuMapper"> <resultMap type="SysRoleMenu" id="SysRoleMenuResult"> <result property="roleId" column="role_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysUserMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysUserMapper"> <mapper namespace="com.sgd.system.mapper.SysUserMapper"> <resultMap type="SysUser" id="SysUserResult"> <id property="userId" column="user_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysUserPostMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper"> <mapper namespace="com.sgd.system.mapper.SysUserPostMapper"> <resultMap type="SysUserPost" id="SysUserPostResult"> <result property="userId" column="user_id" /> sgd-modules/sgd-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper"> <mapper namespace="com.sgd.system.mapper.SysUserRoleMapper"> <resultMap type="SysUserRole" id="SysUserRoleResult"> <result property="userId" column="user_id" /> sgd-visual/pom.xmlcopy from ruoyi-api/pom.xml copy to sgd-visual/pom.xml
File was copied from ruoyi-api/pom.xml @@ -2,21 +2,21 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>com.ruoyi</groupId> <artifactId>ruoyi</artifactId> <groupId>com.sgd</groupId> <artifactId>sgd</artifactId> <version>3.6.8</version> </parent> <modelVersion>4.0.0</modelVersion> <modules> <module>ruoyi-api-system</module> <module>sgd-monitor</module> </modules> <artifactId>ruoyi-api</artifactId> <artifactId>sgd-visual</artifactId> <packaging>pom</packaging> <description> ruoyi-api系统接口 sgd-visual图形化管理模块 </description> </project>
