yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 升级 dubbo 独立管理版本 解决兼容性问题 与 bug修复

Browse Source
dev
疯狂的狮子Li 4 years ago
parent 3efd7c7bd4
commit 581f54742a
2 changed files with 403 additions and 372 deletions
Show Stats Download Patch File Download Diff File

764
pom.xml
Unescape Escape View File

@ -1,373 +1,393 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-cloud-plus</artifactId> <artifactId>ruoyi-cloud-plus</artifactId>
<version>0.2.0</version> <version>0.2.0</version>
<name>RuoYi-Cloud-Plus</name> <name>RuoYi-Cloud-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus</url> <url>https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus</url>
<description>RuoYi-Cloud-Plus微服务系统</description> <description>RuoYi-Cloud-Plus微服务系统</description>
<properties> <properties>
<ruoyi.version>0.2.0</ruoyi.version> <ruoyi.version>0.2.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-boot.version>2.5.8</spring-boot.version> <spring-boot.version>2.5.8</spring-boot.version>
<spring-cloud.version>2020.0.4</spring-cloud.version> <spring-cloud.version>2020.0.4</spring-cloud.version>
<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version> <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
<alibaba.nacos.version>2.0.3</alibaba.nacos.version> <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
<spring-boot-admin.version>2.5.4</spring-boot-admin.version> <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
<spring-boot.mybatis>2.2.0</spring-boot.mybatis> <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
<swagger.fox.version>3.0.0</swagger.fox.version> <swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.6.2</swagger.core.version> <swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version> <tobato.version>1.27.2</tobato.version>
<kaptcha.version>2.3.2</kaptcha.version> <kaptcha.version>2.3.2</kaptcha.version>
<pagehelper.boot.version>1.4.0</pagehelper.boot.version> <pagehelper.boot.version>1.4.0</pagehelper.boot.version>
<druid.version>1.2.8</druid.version> <druid.version>1.2.8</druid.version>
<dynamic-ds.version>3.5.0</dynamic-ds.version> <dynamic-ds.version>3.5.0</dynamic-ds.version>
<commons.io.version>2.11.0</commons.io.version> <commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version> <commons.fileupload.version>1.4</commons.fileupload.version>
<velocity.version>2.3</velocity.version> <velocity.version>2.3</velocity.version>
<minio.version>8.2.2</minio.version> <minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<common-pool.version>2.10.0</common-pool.version> <common-pool.version>2.10.0</common-pool.version>
<commons-collections.version>3.2.2</commons-collections.version> <commons-collections.version>3.2.2</commons-collections.version>
<transmittable-thread-local.version>2.12.2</transmittable-thread-local.version> <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
<hutool.version>5.7.16</hutool.version> <hutool.version>5.7.16</hutool.version>
<redisson.version>3.16.7</redisson.version> <redisson.version>3.16.7</redisson.version>
<lock4j.version>2.2.1</lock4j.version> <lock4j.version>2.2.1</lock4j.version>
<dubbo.version>3.0.4</dubbo.version> <dubbo.version>2.7.15</dubbo.version>
</properties> <spring.context.support.version>1.0.11</spring.context.support.version>
</properties>
<profiles>
<profile> <profiles>
<id>dev</id> <profile>
<properties> <id>dev</id>
<!-- 环境标识，需要与配置文件的名称相对应 --> <properties>
<profiles.active>dev</profiles.active> <!-- 环境标识，需要与配置文件的名称相对应 -->
<nacos.server>127.0.0.1:8848</nacos.server> <profiles.active>dev</profiles.active>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group> <nacos.server>127.0.0.1:8848</nacos.server>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group> <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<sentinel.server>127.0.0.1:8718</sentinel.server> <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
</properties> <sentinel.server>127.0.0.1:8718</sentinel.server>
<activation> </properties>
<!-- 默认环境 --> <activation>
<activeByDefault>true</activeByDefault> <!-- 默认环境 -->
</activation> <activeByDefault>true</activeByDefault>
</profile> </activation>
<profile> </profile>
<id>prod</id> <profile>
<properties> <id>prod</id>
<profiles.active>prod</profiles.active> <properties>
<nacos.server>127.0.0.1:8848</nacos.server> <profiles.active>prod</profiles.active>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group> <nacos.server>127.0.0.1:8848</nacos.server>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group> <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<sentinel.server>127.0.0.1:8718</sentinel.server> <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
</properties> <sentinel.server>127.0.0.1:8718</sentinel.server>
</profile> </properties>
</profiles> </profile>
</profiles>
<!-- 依赖声明 -->
<dependencyManagement> <!-- 依赖声明 -->
<dependencies> <dependencyManagement>
<dependencies>
<!-- SpringCloud 微服务 -->
<dependency> <!-- SpringCloud 微服务 -->
<groupId>org.springframework.cloud</groupId> <dependency>
<artifactId>spring-cloud-dependencies</artifactId> <groupId>org.springframework.cloud</groupId>
<version>${spring-cloud.version}</version> <artifactId>spring-cloud-dependencies</artifactId>
<type>pom</type> <version>${spring-cloud.version}</version>
<scope>import</scope> <type>pom</type>
</dependency> <scope>import</scope>
</dependency>
<!-- SpringCloud Alibaba 微服务 -->
<dependency> <!-- SpringCloud Alibaba 微服务 -->
<groupId>com.alibaba.cloud</groupId> <dependency>
<artifactId>spring-cloud-alibaba-dependencies</artifactId> <groupId>com.alibaba.cloud</groupId>
<version>${spring-cloud-alibaba.version}</version> <artifactId>spring-cloud-alibaba-dependencies</artifactId>
<type>pom</type> <version>${spring-cloud-alibaba.version}</version>
<scope>import</scope> <type>pom</type>
</dependency> <scope>import</scope>
</dependency>
<!-- Alibaba Nacos 配置 -->
<dependency> <!-- Alibaba Nacos 配置 -->
<groupId>com.alibaba.nacos</groupId> <dependency>
<artifactId>nacos-client</artifactId> <groupId>com.alibaba.nacos</groupId>
<version>${alibaba.nacos.version}</version> <artifactId>nacos-client</artifactId>
</dependency> <version>${alibaba.nacos.version}</version>
</dependency>
<!-- SpringBoot 依赖配置 -->
<dependency> <!-- Apache Dubbo 配置 -->
<groupId>org.springframework.boot</groupId> <dependency>
<artifactId>spring-boot-dependencies</artifactId> <groupId>org.apache.dubbo</groupId>
<version>${spring-boot.version}</version> <artifactId>dubbo-spring-boot-starter</artifactId>
<type>pom</type> <version>${dubbo.version}</version>
<scope>import</scope> </dependency>
</dependency>
<dependency>
<!-- SpringBoot 监控客户端 --> <groupId>org.apache.dubbo</groupId>
<dependency> <artifactId>dubbo</artifactId>
<groupId>de.codecentric</groupId> <version>${dubbo.version}</version>
<artifactId>spring-boot-admin-starter-client</artifactId> </dependency>
<version>${spring-boot-admin.version}</version>
</dependency> <dependency>
<groupId>com.alibaba.spring</groupId>
<!-- FastDFS 分布式文件系统 --> <artifactId>spring-context-support</artifactId>
<dependency> <version>${spring.context.support.version}</version>
<groupId>com.github.tobato</groupId> </dependency>
<artifactId>fastdfs-client</artifactId>
<version>${tobato.version}</version> <!-- SpringBoot 依赖配置 -->
</dependency> <dependency>
<groupId>org.springframework.boot</groupId>
<!-- Mybatis 依赖配置 --> <artifactId>spring-boot-dependencies</artifactId>
<dependency> <version>${spring-boot.version}</version>
<groupId>org.mybatis.spring.boot</groupId> <type>pom</type>
<artifactId>mybatis-spring-boot-starter</artifactId> <scope>import</scope>
<version>${spring-boot.mybatis}</version> </dependency>
</dependency>
<!-- SpringBoot 监控客户端 -->
<!-- Swagger 依赖配置 --> <dependency>
<dependency> <groupId>de.codecentric</groupId>
<groupId>io.swagger</groupId> <artifactId>spring-boot-admin-starter-client</artifactId>
<artifactId>swagger-models</artifactId> <version>${spring-boot-admin.version}</version>
<version>${swagger.core.version}</version> </dependency>
</dependency>
<dependency> <!-- FastDFS 分布式文件系统 -->
<groupId>io.swagger</groupId> <dependency>
<artifactId>swagger-annotations</artifactId> <groupId>com.github.tobato</groupId>
<version>${swagger.core.version}</version> <artifactId>fastdfs-client</artifactId>
</dependency> <version>${tobato.version}</version>
</dependency>
<!-- 验证码 -->
<dependency> <!-- Mybatis 依赖配置 -->
<groupId>com.github.penggle</groupId> <dependency>
<artifactId>kaptcha</artifactId> <groupId>org.mybatis.spring.boot</groupId>
<version>${kaptcha.version}</version> <artifactId>mybatis-spring-boot-starter</artifactId>
</dependency> <version>${spring-boot.mybatis}</version>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency> <!-- Swagger 依赖配置 -->
<groupId>com.github.pagehelper</groupId> <dependency>
<artifactId>pagehelper-spring-boot-starter</artifactId> <groupId>io.swagger</groupId>
<version>${pagehelper.boot.version}</version> <artifactId>swagger-models</artifactId>
</dependency> <version>${swagger.core.version}</version>
</dependency>
<!-- io常用工具类 --> <dependency>
<dependency> <groupId>io.swagger</groupId>
<groupId>commons-io</groupId> <artifactId>swagger-annotations</artifactId>
<artifactId>commons-io</artifactId> <version>${swagger.core.version}</version>
<version>${commons.io.version}</version> </dependency>
</dependency>
<!-- 验证码 -->
<!-- excel工具 --> <dependency>
<dependency> <groupId>com.github.penggle</groupId>
<groupId>org.apache.poi</groupId> <artifactId>kaptcha</artifactId>
<artifactId>poi-ooxml</artifactId> <version>${kaptcha.version}</version>
<version>${poi.version}</version> </dependency>
</dependency>
<!-- pagehelper 分页插件 -->
<!-- 文件上传工具类 --> <dependency>
<dependency> <groupId>com.github.pagehelper</groupId>
<groupId>commons-fileupload</groupId> <artifactId>pagehelper-spring-boot-starter</artifactId>
<artifactId>commons-fileupload</artifactId> <version>${pagehelper.boot.version}</version>
<version>${commons.fileupload.version}</version> </dependency>
</dependency>
<!-- io常用工具类 -->
<!-- 代码生成使用模板 --> <dependency>
<dependency> <groupId>commons-io</groupId>
<groupId>org.apache.velocity</groupId> <artifactId>commons-io</artifactId>
<artifactId>velocity-engine-core</artifactId> <version>${commons.io.version}</version>
<version>${velocity.version}</version> </dependency>
</dependency>
<!-- excel工具 -->
<!-- Collection 增强Java集合框架 --> <dependency>
<dependency> <groupId>org.apache.poi</groupId>
<groupId>commons-collections</groupId> <artifactId>poi-ooxml</artifactId>
<artifactId>commons-collections</artifactId> <version>${poi.version}</version>
<version>${commons-collections.version}</version> </dependency>
</dependency>
<!-- 文件上传工具类 -->
<!-- 线程传递值 --> <dependency>
<dependency> <groupId>commons-fileupload</groupId>
<groupId>com.alibaba</groupId> <artifactId>commons-fileupload</artifactId>
<artifactId>transmittable-thread-local</artifactId> <version>${commons.fileupload.version}</version>
<version>${transmittable-thread-local.version}</version> </dependency>
</dependency>
<!-- 代码生成使用模板 -->
<!-- 公共资源池 --> <dependency>
<dependency> <groupId>org.apache.velocity</groupId>
<groupId>org.apache.commons</groupId> <artifactId>velocity-engine-core</artifactId>
<artifactId>commons-pool2</artifactId> <version>${velocity.version}</version>
<version>${common-pool.version}</version> </dependency>
</dependency>
<!-- Collection 增强Java集合框架 -->
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>commons-collections</groupId>
<artifactId>hutool-all</artifactId> <artifactId>commons-collections</artifactId>
<version>${hutool.version}</version> <version>${commons-collections.version}</version>
</dependency> </dependency>
<!--redisson--> <!-- 线程传递值 -->
<dependency> <dependency>
<groupId>org.redisson</groupId> <groupId>com.alibaba</groupId>
<artifactId>redisson-spring-boot-starter</artifactId> <artifactId>transmittable-thread-local</artifactId>
<version>${redisson.version}</version> <version>${transmittable-thread-local.version}</version>
</dependency> </dependency>
<dependency> <!-- 公共资源池 -->
<groupId>com.baomidou</groupId> <dependency>
<artifactId>lock4j-redisson-spring-boot-starter</artifactId> <groupId>org.apache.commons</groupId>
<version>${lock4j.version}</version> <artifactId>commons-pool2</artifactId>
</dependency> <version>${common-pool.version}</version>
</dependency>
<!-- 核心模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>cn.hutool</groupId>
<artifactId>ruoyi-common-core</artifactId> <artifactId>hutool-all</artifactId>
<version>${ruoyi.version}</version> <version>${hutool.version}</version>
</dependency> </dependency>
<!-- 接口模块 --> <!--redisson-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>org.redisson</groupId>
<artifactId>ruoyi-common-swagger</artifactId> <artifactId>redisson-spring-boot-starter</artifactId>
<version>${ruoyi.version}</version> <version>${redisson.version}</version>
</dependency> </dependency>
<!-- 安全模块 --> <dependency>
<dependency> <groupId>com.baomidou</groupId>
<groupId>com.ruoyi</groupId> <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
<artifactId>ruoyi-common-security</artifactId> <version>${lock4j.version}</version>
<version>${ruoyi.version}</version> </dependency>
</dependency>
<!-- 核心模块 -->
<!-- 权限范围 --> <dependency>
<dependency> <groupId>com.ruoyi</groupId>
<groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-core</artifactId>
<artifactId>ruoyi-common-datascope</artifactId> <version>${ruoyi.version}</version>
<version>${ruoyi.version}</version> </dependency>
</dependency>
<!-- 接口模块 -->
<!-- 多数据源 --> <dependency>
<dependency> <groupId>com.ruoyi</groupId>
<groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-swagger</artifactId>
<artifactId>ruoyi-common-datasource</artifactId> <version>${ruoyi.version}</version>
<version>${ruoyi.version}</version> </dependency>
</dependency>
<!-- 安全模块 -->
<!-- 日志记录 --> <dependency>
<dependency> <groupId>com.ruoyi</groupId>
<groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-security</artifactId>
<artifactId>ruoyi-common-log</artifactId> <version>${ruoyi.version}</version>
<version>${ruoyi.version}</version> </dependency>
</dependency>
<!-- 权限范围 -->
<!-- 缓存服务 --> <dependency>
<dependency> <groupId>com.ruoyi</groupId>
<groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-datascope</artifactId>
<artifactId>ruoyi-common-redis</artifactId> <version>${ruoyi.version}</version>
<version>${ruoyi.version}</version> </dependency>
</dependency>
<!-- 多数据源 -->
<!-- web服务 --> <dependency>
<dependency> <groupId>com.ruoyi</groupId>
<groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-datasource</artifactId>
<artifactId>ruoyi-common-web</artifactId> <version>${ruoyi.version}</version>
<version>${ruoyi.version}</version> </dependency>
</dependency>
<!-- 日志记录 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-dubbo</artifactId> <artifactId>ruoyi-common-log</artifactId>
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<!-- 系统接口 --> <!-- 缓存服务 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api-system</artifactId> <artifactId>ruoyi-common-redis</artifactId>
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<!-- 文件服务接口 --> <!-- web服务 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api-file</artifactId> <artifactId>ruoyi-common-web</artifactId>
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
</dependencies> <dependency>
</dependencyManagement> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-dubbo</artifactId>
<modules> <version>${ruoyi.version}</version>
<module>ruoyi-auth</module> </dependency>
<module>ruoyi-gateway</module>
<module>ruoyi-visual</module> <!-- 系统接口 -->
<module>ruoyi-modules</module> <dependency>
<module>ruoyi-api</module> <groupId>com.ruoyi</groupId>
<module>ruoyi-common</module> <artifactId>ruoyi-api-system</artifactId>
</modules> <version>${ruoyi.version}</version>
<packaging>pom</packaging> </dependency>
<dependencies> <!-- 文件服务接口 -->
<!-- bootstrap 启动器 --> <dependency>
<dependency> <groupId>com.ruoyi</groupId>
<groupId>org.springframework.cloud</groupId> <artifactId>ruoyi-api-file</artifactId>
<artifactId>spring-cloud-starter-bootstrap</artifactId> <version>${ruoyi.version}</version>
</dependency> </dependency>
</dependencies>
</dependencies>
<build> </dependencyManagement>
<plugins>
<plugin> <modules>
<groupId>org.apache.maven.plugins</groupId> <module>ruoyi-auth</module>
<artifactId>maven-compiler-plugin</artifactId> <module>ruoyi-gateway</module>
<version>3.1</version> <module>ruoyi-visual</module>
<configuration> <module>ruoyi-modules</module>
<source>${java.version}</source> <module>ruoyi-api</module>
<target>${java.version}</target> <module>ruoyi-common</module>
<encoding>${project.build.sourceEncoding}</encoding> </modules>
</configuration> <packaging>pom</packaging>
</plugin>
</plugins> <dependencies>
<resources> <!-- bootstrap 启动器 -->
<resource> <dependency>
<!--打包该目录下的 application.yml --> <groupId>org.springframework.cloud</groupId>
<directory>src/main/resources</directory> <artifactId>spring-cloud-starter-bootstrap</artifactId>
<!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 --> </dependency>
<filtering>true</filtering> </dependencies>
</resource>
</resources> <build>
</build> <plugins>
<plugin>
<repositories> <groupId>org.apache.maven.plugins</groupId>
<repository> <artifactId>maven-compiler-plugin</artifactId>
<id>public</id> <version>3.1</version>
<name>aliyun nexus</name> <configuration>
<url>https://maven.aliyun.com/repository/public/</url> <source>${java.version}</source>
<releases> <target>${java.version}</target>
<enabled>true</enabled> <encoding>${project.build.sourceEncoding}</encoding>
</releases> </configuration>
</repository> </plugin>
</repositories> </plugins>
<resources>
<pluginRepositories> <resource>
<pluginRepository> <!--打包该目录下的 application.yml -->
<id>public</id> <directory>src/main/resources</directory>
<name>aliyun nexus</name> <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->
<url>https://maven.aliyun.com/repository/public/</url> <filtering>true</filtering>
<releases> </resource>
<enabled>true</enabled> </resources>
</releases> </build>
<snapshots>
<enabled>false</enabled> <repositories>
</snapshots> <repository>
</pluginRepository> <id>public</id>
</pluginRepositories> <name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>

11
ruoyi-common/ruoyi-common-dubbo/pom.xml
Unescape Escape View File

@ -27,6 +27,17 @@
<artifactId>spring-cloud-starter-dubbo</artifactId> <artifactId>spring-cloud-starter-dubbo</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-actuator</artifactId>
<version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.spring</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba.csp</groupId> <groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-apache-dubbo-adapter</artifactId> <artifactId>sentinel-apache-dubbo-adapter</artifactId>

Write Preview
Loading…
Cancel
Save