From de194880ae912fcf46123f278529dbeaa3754c6f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 04 七月 2021 02:21:04 +0800
Subject: [PATCH] update 关闭默认二级缓存 推荐使用 spring-cache 注解手动缓存

---
 pom.xml |  184 +++++++++++++++++++++++++--------------------
 1 files changed, 103 insertions(+), 81 deletions(-)

diff --git a/pom.xml b/pom.xml
index c709651..cf20fa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,87 +3,55 @@
          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">
 	<modelVersion>4.0.0</modelVersion>
-	
-    <groupId>com.ruoyi</groupId>
-    <artifactId>ruoyi</artifactId>
-    <version>3.4.0</version>
 
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>鑻ヤ緷绠$悊绯荤粺</description>
-    
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi-vue-plus</artifactId>
+    <version>2.4.0</version>
+
+    <name>RuoYi-Vue-Plus</name>
+    <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
+    <description>RuoYi-Vue-Plus鍚庡彴绠$悊绯荤粺</description>
+
     <properties>
-        <ruoyi.version>3.4.0</ruoyi.version>
+        <ruoyi-vue-plus.version>2.4.0</ruoyi-vue-plus.version>
+        <spring-boot.version>2.4.7</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <druid.version>1.2.4</druid.version>
-        <knife4j.version>2.0.8</knife4j.version>
-        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
-        <fastjson.version>1.2.75</fastjson.version>
-        <oshi.version>5.6.0</oshi.version>
-        <jna.version>5.7.0</jna.version>
+        <druid.version>1.2.6</druid.version>
+        <knife4j.version>3.0.3</knife4j.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
-        <mybatis-plus.version>3.4.2</mybatis-plus.version>
-        <hutool.version>5.5.8</hutool.version>
-        <feign.version>2.2.6.RELEASE</feign.version>
+        <mybatis-plus.version>3.4.3</mybatis-plus.version>
+        <hutool.version>5.7.3</hutool.version>
+        <feign.version>3.0.3</feign.version>
         <feign-okhttp.version>11.0</feign-okhttp.version>
-        <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
+        <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
+        <redisson.version>3.16.0</redisson.version>
+        <lock4j.version>2.2.1</lock4j.version>
+        <datasource.version>3.4.0</datasource.version>
     </properties>
-	
+
     <!-- 渚濊禆澹版槑 -->
     <dependencyManagement>
         <dependencies>
-        
+
             <!-- SpringBoot鐨勪緷璧栭厤缃�-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.2.13.RELEASE</version>
+                <version>${spring-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            
-            <!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+
+            <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid-spring-boot-starter</artifactId>
                 <version>${druid.version}</version>
-            </dependency>
-
-            <!-- pagehelper 鍒嗛〉鎻掍欢 -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.mybatis</groupId>
-                        <artifactId>mybatis</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <!-- 鑾峰彇绯荤粺淇℃伅 -->
-            <dependency>
-                <groupId>com.github.oshi</groupId>
-                <artifactId>oshi-core</artifactId>
-                <version>${oshi.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>net.java.dev.jna</groupId>
-                <artifactId>jna</artifactId>
-                <version>${jna.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>net.java.dev.jna</groupId>
-                <artifactId>jna-platform</artifactId>
-                <version>${jna.version}</version>
             </dependency>
 
             <dependency>
@@ -91,33 +59,33 @@
                 <artifactId>knife4j-spring-boot-starter</artifactId>
                 <version>${knife4j.version}</version>
             </dependency>
-			
+
             <!-- excel宸ュ叿 -->
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
             </dependency>
-			
-            <!--velocity浠g爜鐢熸垚浣跨敤妯℃澘 -->
+
+            <!-- velocity浠g爜鐢熸垚浣跨敤妯℃澘 -->
             <dependency>
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>
             </dependency>
 
-            <!-- 闃块噷JSON瑙f瀽鍣� -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-			
-            <!--Token鐢熸垚涓庤В鏋�-->
+            <!-- Token鐢熸垚涓庤В鏋�-->
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt</artifactId>
                 <version>${jwt.version}</version>
+            </dependency>
+
+            <!-- dynamic-datasource 澶氭暟鎹簮-->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+                <version>${datasource.version}</version>
             </dependency>
 
             <dependency>
@@ -130,6 +98,7 @@
                 <artifactId>mybatis-plus-extension</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>cn.hutool</groupId>
                 <artifactId>hutool-all</artifactId>
@@ -159,51 +128,57 @@
                 <version>${spring-boot-admin.version}</version>
             </dependency>
 
+            <!--redisson-->
             <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-actuator</artifactId>
+                <groupId>org.redisson</groupId>
+                <artifactId>redisson-spring-boot-starter</artifactId>
+                <version>${redisson.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
+                <version>${lock4j.version}</version>
+            </dependency>
             <!-- 瀹氭椂浠诲姟-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-quartz</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${ruoyi-vue-plus.version}</version>
             </dependency>
-	
+
             <!-- 浠g爜鐢熸垚-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-generator</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${ruoyi-vue-plus.version}</version>
             </dependency>
-			
+
             <!-- 鏍稿績妯″潡-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-framework</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${ruoyi-vue-plus.version}</version>
             </dependency>
-			
+
             <!-- 绯荤粺妯″潡-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-system</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${ruoyi-vue-plus.version}</version>
             </dependency>
-			
+
             <!-- 閫氱敤宸ュ叿-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-common</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
             <!-- demo妯″潡 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-demo</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
         </dependencies>
@@ -275,6 +250,14 @@
 
     <profiles>
         <profile>
+            <id>local</id>
+            <properties>
+                <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+                <profiles.active>local</profiles.active>
+                <logging.level>debug</logging.level>
+            </properties>
+        </profile>
+        <profile>
             <id>dev</id>
             <properties>
                 <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
@@ -293,6 +276,45 @@
                 <logging.level>warn</logging.level>
             </properties>
         </profile>
+
+        <!-- jdk澶氱増鏈厤缃� -->
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <jdk>1.8</jdk>
+            </activation>
+            <properties>
+                <java.version>1.8</java.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk11</id>
+            <activation>
+                <jdk>11</jdk>
+            </activation>
+            <properties>
+                <java.version>11</java.version>
+                <jaxb.version>3.0.1</jaxb.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <!-- jdk11 缂哄け渚濊禆 jaxb-->
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>${jaxb.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <!--jaxb-->
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>

--
Gitblit v1.9.3