From 62081aebb9030d53a168d24e825800c613a4303a Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期三, 21 四月 2021 16:34:44 +0800 Subject: [PATCH] 修复开启TopNav后,左侧打开外链问题 --- pom.xml | 64 +++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index a4309d8..53467b2 100644 --- a/pom.xml +++ b/pom.xml @@ -22,12 +22,14 @@ <bitwalker.version>1.21</bitwalker.version> <swagger.version>2.9.2</swagger.version> <kaptcha.version>2.3.2</kaptcha.version> + <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version> <pagehelper.boot.version>1.3.0</pagehelper.boot.version> <fastjson.version>1.2.75</fastjson.version> - <oshi.version>5.3.6</oshi.version> - <jna.version>5.6.0</jna.version> + <oshi.version>5.6.0</oshi.version> + <jna.version>5.7.0</jna.version> <commons.io.version>2.5</commons.io.version> <commons.fileupload.version>1.3.3</commons.fileupload.version> + <commons.collections.version>3.2.2</commons.collections.version> <poi.version>4.1.2</poi.version> <velocity.version>1.7</velocity.version> <jwt.version>0.9.1</jwt.version> @@ -36,7 +38,7 @@ <!-- 渚濊禆澹版槑 --> <dependencyManagement> <dependencies> - + <!-- SpringBoot鐨勪緷璧栭厤缃�--> <dependency> <groupId>org.springframework.boot</groupId> @@ -45,28 +47,35 @@ <type>pom</type> <scope>import</scope> </dependency> - + <!--闃块噷鏁版嵁搴撹繛鎺ユ睜 --> <dependency> <groupId>com.alibaba</groupId> <artifactId>druid-spring-boot-starter</artifactId> <version>${druid.version}</version> </dependency> - + <!-- 瑙f瀽瀹㈡埛绔搷浣滅郴缁熴�佹祻瑙堝櫒绛� --> <dependency> <groupId>eu.bitwalker</groupId> <artifactId>UserAgentUtils</artifactId> <version>${bitwalker.version}</version> </dependency> - + + <!-- SpringBoot闆嗘垚mybatis妗嗘灦 --> + <dependency> + <groupId>org.mybatis.spring.boot</groupId> + <artifactId>mybatis-spring-boot-starter</artifactId> + <version>${mybatis-spring-boot.version}</version> + </dependency> + <!-- pagehelper 鍒嗛〉鎻掍欢 --> <dependency> <groupId>com.github.pagehelper</groupId> <artifactId>pagehelper-spring-boot-starter</artifactId> <version>${pagehelper.boot.version}</version> </dependency> - + <!-- 鑾峰彇绯荤粺淇℃伅 --> <dependency> <groupId>com.github.oshi</groupId> @@ -85,7 +94,7 @@ <artifactId>jna-platform</artifactId> <version>${jna.version}</version> </dependency> - + <!-- swagger2--> <dependency> <groupId>io.springfox</groupId> @@ -102,91 +111,104 @@ </exclusion> </exclusions> </dependency> - + <!-- swagger2-UI--> <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-swagger-ui</artifactId> <version>${swagger.version}</version> </dependency> - + <!--io甯哥敤宸ュ叿绫� --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> </dependency> - + <!--鏂囦欢涓婁紶宸ュ叿绫� --> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> <version>${commons.fileupload.version}</version> </dependency> - + <!-- excel宸ュ叿 --> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId> <version>${poi.version}</version> </dependency> - + <!--velocity浠g爜鐢熸垚浣跨敤妯℃澘 --> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>${velocity.version}</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> </dependency> - + + <!-- collections宸ュ叿绫� --> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons.collections.version}</version> + </dependency> + <!-- 闃块噷JSON瑙f瀽鍣� --> <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> <version>${fastjson.version}</version> </dependency> - + <!--Token鐢熸垚涓庤В鏋�--> <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt</artifactId> <version>${jwt.version}</version> </dependency> - + <!--楠岃瘉鐮� --> <dependency> <groupId>com.github.penggle</groupId> <artifactId>kaptcha</artifactId> <version>${kaptcha.version}</version> </dependency> - + <!-- 瀹氭椂浠诲姟--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-quartz</artifactId> <version>${ruoyi.version}</version> </dependency> - + <!-- 浠g爜鐢熸垚--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-generator</artifactId> <version>${ruoyi.version}</version> </dependency> - + <!-- 鏍稿績妯″潡--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-framework</artifactId> <version>${ruoyi.version}</version> </dependency> - + <!-- 绯荤粺妯″潡--> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-system</artifactId> <version>${ruoyi.version}</version> </dependency> - + <!-- 閫氱敤宸ュ叿--> <dependency> <groupId>com.ruoyi</groupId> -- Gitblit v1.9.3