Browse Source

改配置

Yangyz 2 years ago
parent
commit
24a7e3a5e2
3 changed files with 47 additions and 57 deletions
  1. 42 53
      benyun-core/pom.xml
  2. 2 2
      pom.xml
  3. 3 2
      ruoyi-admin/pom.xml

+ 42 - 53
benyun-core/pom.xml

@@ -3,53 +3,50 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.2</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <artifactId>Bailian-Al</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>4.8.0</version>
     </parent>
-    <groupId>com.benyun.core</groupId>
     <artifactId>benyun-core</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>benyun-core</name>
+
     <description>benyun-core</description>
-    <properties>
-        <java.version>11</java.version>
-        <ruoyi-vue-plus.version>4.8.0</ruoyi-vue-plus.version>
-        <spring-boot.version>2.7.13</spring-boot.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>11</java.version>
-        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
-        <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
-        <springdoc.version>1.6.15</springdoc.version>
-        <poi.version>5.2.3</poi.version>
-        <easyexcel.version>3.3.1</easyexcel.version>
-        <velocity.version>2.3</velocity.version>
-        <satoken.version>1.35.0.RC</satoken.version>
-        <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
-        <p6spy.version>3.9.1</p6spy.version>
-        <hutool.version>5.8.18</hutool.version>
-        <okhttp.version>4.10.0</okhttp.version>
-        <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
-        <redisson.version>3.20.1</redisson.version>
-        <lock4j.version>2.2.3</lock4j.version>
-        <dynamic-ds.version>3.5.2</dynamic-ds.version>
-        <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
-        <xxl-job.version>2.4.0</xxl-job.version>
-        <lombok.version>1.18.26</lombok.version>
-        <bouncycastle.version>1.72</bouncycastle.version>
-        <!-- 离线IP地址定位库 -->
-        <ip2region.version>2.7.0</ip2region.version>
-
-        <!-- 临时修复 snakeyaml 漏洞 -->
-        <snakeyaml.version>1.33</snakeyaml.version>
-
-        <!-- OSS 配置 -->
-        <aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
-        <!-- SMS 配置 -->
-        <sms4j.version>2.2.0</sms4j.version>
-    </properties>
+<!--    <properties>-->
+<!--        <java.version>1.8</java.version>-->
+<!--        <ruoyi-vue-plus.version>4.8.0</ruoyi-vue-plus.version>-->
+<!--        <spring-boot.version>2.7.13</spring-boot.version>-->
+<!--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
+<!--        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
+<!--        <java.version>11</java.version>-->
+<!--        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>-->
+<!--        <spring-boot.mybatis>2.2.2</spring-boot.mybatis>-->
+<!--        <springdoc.version>1.6.15</springdoc.version>-->
+<!--        <poi.version>5.2.3</poi.version>-->
+<!--        <easyexcel.version>3.3.1</easyexcel.version>-->
+<!--        <velocity.version>2.3</velocity.version>-->
+<!--        <satoken.version>1.35.0.RC</satoken.version>-->
+<!--        <mybatis-plus.version>3.5.3.1</mybatis-plus.version>-->
+<!--        <p6spy.version>3.9.1</p6spy.version>-->
+<!--        <hutool.version>5.8.18</hutool.version>-->
+<!--        <okhttp.version>4.10.0</okhttp.version>-->
+<!--        <spring-boot-admin.version>2.7.10</spring-boot-admin.version>-->
+<!--        <redisson.version>3.20.1</redisson.version>-->
+<!--        <lock4j.version>2.2.3</lock4j.version>-->
+<!--        <dynamic-ds.version>3.5.2</dynamic-ds.version>-->
+<!--        <alibaba-ttl.version>2.14.2</alibaba-ttl.version>-->
+<!--        <xxl-job.version>2.4.0</xxl-job.version>-->
+<!--        <lombok.version>1.18.26</lombok.version>-->
+<!--        <bouncycastle.version>1.72</bouncycastle.version>-->
+<!--        &lt;!&ndash; 离线IP地址定位库 &ndash;&gt;-->
+<!--        <ip2region.version>2.7.0</ip2region.version>-->
+
+<!--        &lt;!&ndash; 临时修复 snakeyaml 漏洞 &ndash;&gt;-->
+<!--        <snakeyaml.version>1.33</snakeyaml.version>-->
+
+<!--        &lt;!&ndash; OSS 配置 &ndash;&gt;-->
+<!--        <aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>-->
+<!--        &lt;!&ndash; SMS 配置 &ndash;&gt;-->
+<!--        <sms4j.version>2.2.0</sms4j.version>-->
+<!--    </properties>-->
     <dependencies>
 
         <!--redis坐标-->
@@ -96,7 +93,6 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
-            <version>${ruoyi-vue-plus.version}</version>
         </dependency>
 
         <dependency>
@@ -127,13 +123,6 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+
 
 </project>

+ 2 - 2
pom.xml

@@ -349,7 +349,7 @@
     </dependencyManagement>
 
     <modules>
-        <module>ruoyi-admin</module>
+<!--        <module>ruoyi-admin</module>-->
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
         <module>ruoyi-job</module>
@@ -359,7 +359,7 @@
         <module>ruoyi-extend</module>
         <module>ruoyi-oss</module>
         <module>ruoyi-sms</module>
-
+        <module>benyun-core</module>
     </modules>
     <packaging>pom</packaging>
 

+ 3 - 2
ruoyi-admin/pom.xml

@@ -26,8 +26,9 @@
 
         <!-- Mysql驱动包 -->
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.17</version>
         </dependency>
         <!-- Oracle -->
         <dependency>