From 3353ead5d36abc44ac3121209b49d89fcb1b7fab Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 28 十月 2021 09:45:29 +0800
Subject: [PATCH] update 搜索框 更新文本域生成 用于模糊查询
---
pom.xml | 201 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 137 insertions(+), 64 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0454126..5b6144d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,44 +6,54 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>2.6.0</version>
+ <version>3.2.0</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>2.6.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.3</spring-boot.version>
+ <ruoyi-vue-plus.version>3.2.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.6</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.6</druid.version>
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+ <druid.version>1.2.8</druid.version>
<knife4j.version>3.0.3</knife4j.version>
+ <swagger-annotations.version>1.5.22</swagger-annotations.version>
<poi.version>4.1.2</poi.version>
+ <easyexcel.version>2.2.11</easyexcel.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.3</mybatis-plus.version>
- <hutool.version>5.7.6</hutool.version>
+ <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
+ <p6spy.version>3.9.1</p6spy.version>
+ <hutool.version>5.7.15</hutool.version>
<feign.version>3.0.3</feign.version>
- <feign-okhttp.version>11.0</feign-okhttp.version>
- <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
- <redisson.version>3.16.1</redisson.version>
+ <feign-okhttp.version>11.6</feign-okhttp.version>
+ <okhttp.version>4.9.1</okhttp.version>
+ <spring-boot-admin.version>2.5.2</spring-boot-admin.version>
+ <redisson.version>3.16.3</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
- <datasource.version>3.4.1</datasource.version>
+ <dynamic-ds.version>3.4.1</dynamic-ds.version>
+ <tlog.version>1.3.3</tlog.version>
+ <xxl-job.version>2.3.0</xxl-job.version>
+
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <jaxb.version>3.0.1</jaxb.version>
<!-- OSS 閰嶇疆 -->
<qiniu.version>7.8.0</qiniu.version>
- <aliyun.oss.version>3.13.0</aliyun.oss.version>
- <qcloud.cos.version>5.6.47</qcloud.cos.version>
- <minio.version>8.3.0</minio.version>
+ <aliyun.oss.version>3.13.1</aliyun.oss.version>
+ <qcloud.cos.version>5.6.58</qcloud.cos.version>
+ <minio.version>8.3.1</minio.version>
<!-- docker 閰嶇疆 -->
<docker.registry.url>localhost</docker.registry.url>
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
<docker.namespace>ruoyi</docker.namespace>
<docker.plugin.version>1.2.2</docker.plugin.version>
+
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -70,6 +80,18 @@
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>swagger-annotations</artifactId>
+ <groupId>io.swagger</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger-annotations.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
@@ -77,6 +99,22 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>${easyexcel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
@@ -93,11 +131,18 @@
<version>${jwt.version}</version>
</dependency>
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>${datasource.version}</version>
+ <version>${dynamic-ds.version}</version>
</dependency>
<dependency>
@@ -110,6 +155,12 @@
<artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+ <!-- sql鎬ц兘鍒嗘瀽鎻掍欢 -->
+ <dependency>
+ <groupId>p6spy</groupId>
+ <artifactId>p6spy</artifactId>
+ <version>${p6spy.version}</version>
+ </dependency>
<dependency>
<groupId>cn.hutool</groupId>
@@ -117,16 +168,29 @@
<version>${hutool.version}</version>
</dependency>
+ <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${feign.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>feign-core</artifactId>
+ <groupId>io.github.openfeign</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+ <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 -->
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId>
<version>${feign-okhttp.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
</dependency>
<dependency>
@@ -151,10 +215,59 @@
<artifactId>lock4j-redisson-spring-boot-starter</artifactId>
<version>${lock4j.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
+
+ <!-- xxl-job-core -->
+ <dependency>
+ <groupId>com.xuxueli</groupId>
+ <artifactId>xxl-job-core</artifactId>
+ <version>${xxl-job.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-spring-boot-configuration</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-webroot</artifactId>
+ <version>${tlog.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javassist</artifactId>
+ <groupId>org.javassist</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-feign</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-xxl-job</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <!-- 瀹氭椂浠诲姟 @deprecated 3.4.0鍒犻櫎 杩佺Щ鑷硏xl-job -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
+ <version>${ruoyi-vue-plus.version}</version>
+ </dependency>
+
+ <!-- 瀹氭椂浠诲姟 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-job</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
@@ -186,7 +299,7 @@
<version>${ruoyi-vue-plus.version}</version>
</dependency>
- <!-- demo妯″潡 -->
+ <!-- OSS瀵硅薄瀛樺偍妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-oss</artifactId>
@@ -208,6 +321,7 @@
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
<module>ruoyi-quartz</module>
+ <module>ruoyi-job</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-demo</module>
@@ -215,11 +329,6 @@
<module>ruoyi-oss</module>
</modules>
<packaging>pom</packaging>
-
-
- <dependencies>
-
- </dependencies>
<build>
<plugins>
@@ -248,7 +357,7 @@
<repository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -259,7 +368,7 @@
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -276,6 +385,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
+ <endpoints.include>'*'</endpoints.include>
</properties>
</profile>
<profile>
@@ -284,6 +394,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
+ <endpoints.include>'*'</endpoints.include>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -295,46 +406,8 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
+ <endpoints.include>health, info, logfile</endpoints.include>
</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>
--
Gitblit v1.9.3