From db3a83d163fd66734136567807e1023d66d1d455 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 05 三月 2022 13:05:39 +0800 Subject: [PATCH] !150 fix 修复talbleId的单词拼写错误,应为tableId Merge pull request !150 from xlt/dev --- ruoyi-common/pom.xml | 107 +++++++++++++++++++++++------------------------------ 1 files changed, 46 insertions(+), 61 deletions(-) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index b6e9f9a..81a983f 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>3.2.0</version> + <version>4.0.1</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,10 +29,15 @@ <artifactId>spring-web</artifactId> </dependency> - <!-- spring security 瀹夊叏璁よ瘉 --> + <!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ --> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> + <groupId>cn.dev33</groupId> + <artifactId>sa-token-spring-boot-starter</artifactId> + </dependency> + <!-- Sa-Token 鏁村悎 jwt --> + <dependency> + <groupId>cn.dev33</groupId> + <artifactId>sa-token-jwt</artifactId> </dependency> <!-- 鑷畾涔夐獙璇佹敞瑙� --> @@ -64,34 +69,21 @@ <artifactId>easyexcel</artifactId> </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + </dependency> + <!-- yml瑙f瀽鍣� --> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> </dependency> - <!-- Token鐢熸垚涓庤В鏋�--> + <!-- jdk11 缂哄け渚濊禆 jaxb--> <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt</artifactId> - </dependency> - - <!-- Jaxb --> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - - <!-- redis 缂撳瓨鎿嶄綔 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-redis</artifactId> - </dependency> - - <!-- pool 瀵硅薄姹� --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-pool2</artifactId> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> </dependency> <!-- servlet鍖� --> @@ -108,30 +100,41 @@ <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-extension</artifactId> </dependency> + + <!-- dynamic-datasource 澶氭暟鎹簮--> + <dependency> + <groupId>com.baomidou</groupId> + <artifactId>dynamic-datasource-spring-boot-starter</artifactId> + </dependency> + <dependency> <groupId>cn.hutool</groupId> - <artifactId>hutool-all</artifactId> + <artifactId>hutool-core</artifactId> </dependency> + + <dependency> + <groupId>cn.hutool</groupId> + <artifactId>hutool-http</artifactId> + </dependency> + + <dependency> + <groupId>cn.hutool</groupId> + <artifactId>hutool-captcha</artifactId> + </dependency> + + <dependency> + <groupId>cn.hutool</groupId> + <artifactId>hutool-jwt</artifactId> + </dependency> + + <dependency> + <groupId>cn.hutool</groupId> + <artifactId>hutool-extra</artifactId> + </dependency> + <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - </dependency> - - <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 --> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter-openfeign</artifactId> - </dependency> - - <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 --> - <dependency> - <groupId>io.github.openfeign</groupId> - <artifactId>feign-okhttp</artifactId> - </dependency> - - <dependency> - <groupId>de.codecentric</groupId> - <artifactId>spring-boot-admin-starter-client</artifactId> </dependency> <dependency> @@ -144,10 +147,6 @@ <artifactId>swagger-annotations</artifactId> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> <!-- 鑷姩鐢熸垚YML閰嶇疆鍏宠仈JSON鏂囦欢 --> <dependency> <groupId>org.springframework.boot</groupId> @@ -165,20 +164,6 @@ <artifactId>lock4j-redisson-spring-boot-starter</artifactId> </dependency> - <dependency> - <groupId>com.yomahub</groupId> - <artifactId>tlog-spring-boot-configuration</artifactId> - </dependency> - - <dependency> - <groupId>com.yomahub</groupId> - <artifactId>tlog-webroot</artifactId> - </dependency> - - <dependency> - <groupId>com.yomahub</groupId> - <artifactId>tlog-feign</artifactId> - </dependency> </dependencies> </project> -- Gitblit v1.9.3