From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001 From: KonBAI <1527468660@qq.com> Date: 星期六, 02 四月 2022 13:02:56 +0800 Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。 --- ruoyi-common/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 40 insertions(+), 16 deletions(-) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 2111510..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.4.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> <!-- 鑷畾涔夐獙璇佹敞瑙� --> @@ -95,18 +100,41 @@ <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-extension</artifactId> </dependency> + + <!-- dynamic-datasource 澶氭暟鎹簮--> <dependency> - <groupId>cn.hutool</groupId> - <artifactId>hutool-all</artifactId> - </dependency> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> + <groupId>com.baomidou</groupId> + <artifactId>dynamic-datasource-spring-boot-starter</artifactId> </dependency> <dependency> - <groupId>de.codecentric</groupId> - <artifactId>spring-boot-admin-starter-client</artifactId> + <groupId>cn.hutool</groupId> + <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> <dependency> @@ -119,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> -- Gitblit v1.9.3