Refactor POM files and configurations:

- Updated dependencies, including replacing outdated libraries such as `itcast-tools-j2cache` with modern alternatives like `jjwt`, `jedis`, and `spring-boot-starter-data-redis`. - Removed system-scoped dependencies and optimized library versions. - Modified Nacos configurations in multiple files (POM and bootstrap.yml) to align with the updated server details. - Introduced `DozerUtils` for improved object mapping functionality. - Adjusted code invocation for external login to simplify method calls. - Enabled J2Cache configurations in `auth-server`. - Simplified role authorization checks in the gateway service for streamlined logic.

Refactor POM files and configurations:
- Updated dependencies, including replacing outdated libraries such as `itcast-tools-j2cache` with modern alternatives like `jjwt`, `jedis`, and `spring-boot-starter-data-redis`. - Removed system-scoped dependencies and optimized library versions. - Modified Nacos configurations in multiple files (POM and bootstrap.yml) to align with the updated server details. - Introduced `DozerUtils` for improved object mapping functionality. - Adjusted code invocation for external login to simplify method calls. - Enabled J2Cache configurations in `auth-server`. - Simplified role authorization checks in the gateway service for streamlined logic.
shaofan
1 parent bcd4c586
Showing 12 changed files with 230 additions and 46 deletions
itcast-auth/itcast-auth-entity/pom.xml
itcast-auth/itcast-auth-server/pom.xml
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/config/datasource/AuthorityMybatisAutoConfiguration.java
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/controller/auth/LoginController.java
itcast-auth/itcast-auth-server/src/main/java/com/itheima/tools/dozer/DozerUtils.java
itcast-auth/itcast-auth-server/src/main/resources/bootstrap.yml
itcast-auth/itcast-auth-server/src/main/resources/j2cache.properties
itcast-gateway/pom.xml
itcast-gateway/src/main/java/com/itheima/gateway/filter/ResourceFilter.java
itcast-gateway/src/main/java/com/itheima/gateway/service/impl/RoleAuthServiceImpl.java
itcast-gateway/src/main/resources/bootstrap.yml
pom.xml
@@ -27,6 +27,10 @@
             <artifactId>itcast-tools-jwt</artifactId>
         </dependency>
         <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.itheima</groupId>
             <artifactId>itcast-tools-core</artifactId>
         </dependency>
@@ -28,14 +28,25 @@
             <artifactId>springfox-core</artifactId>
         </dependency>
         <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-bean-validators</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.itheima</groupId>
             <artifactId>itcast-tools-databases</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.itheima</groupId>
-            <artifactId>itcast-tools-dozer</artifactId>
+            <groupId>com.github.dozermapper</groupId>
+            <artifactId>dozer-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.itheima</groupId>
             <artifactId>itcast-tools-core</artifactId>
@@ -86,8 +97,12 @@
             <artifactId>itcast-tools-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.itheima</groupId>
-            <artifactId>itcast-tools-j2cache</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
         </dependency>
         <dependency>
             <groupId>com.itheima</groupId>
@@ -102,11 +117,30 @@
             <artifactId>itcast-tools-xss</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.owasp.antisamy</groupId>
+            <artifactId>antisamy</artifactId>
+        </dependency>
+        <!--  j2cache与spring bott整合的工具 -->
+        <dependency>
+            <groupId>net.oschina.j2cache</groupId>
+            <artifactId>j2cache-spring-boot2-starter</artifactId>
+            <version>2.8.0-release</version>
+        </dependency>
+        <!--  j2cache 的核心包 -->
+        <dependency>
             <groupId>net.oschina.j2cache</groupId>
             <artifactId>j2cache-core</artifactId>
-            <scope>system</scope>
-            <systemPath>${lib.path}/lib/j2cache-core-2.4.1-release.jar</systemPath>
-            <version>2.4.1-release</version>
+            <version>2.8.4-release</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -114,6 +148,10 @@
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <exclusions>
                 <exclusion>
@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.core.parser.ISqlParser;
 import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
+import com.github.dozermapper.core.DozerBeanMapperBuilder;
+import com.github.dozermapper.core.Mapper;
 import com.itheima.authority.biz.service.auth.UserService;
 import com.itheima.authority.config.PreTenantHandler;
 import com.itheima.tools.database.datasource.BaseMybatisConfiguration;
 import com.itheima.tools.database.mybatis.auth.DataScopeInterceptor;
 import com.itheima.tools.database.properties.DatabaseProperties;
+import com.itheima.tools.dozer.DozerUtils;
 import com.itheima.tools.utils.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -63,4 +66,9 @@ public class AuthorityMybatisAutoConfiguration extends BaseMybatisConfiguration 
         log.info("初始化完成 PaginationInterceptor {}", paginationInterceptor);
         return paginationInterceptor;
     }
+
+    @Bean
+    public DozerUtils getDozerUtils() {
+        return new DozerUtils();
+    }
 }
@@ -77,11 +77,10 @@ public class LoginController extends BaseController {
      */
     @ApiOperation(value = "外部系统登录", notes = "外部系统登录")
     @PostMapping(value = "/externalLogin")
-    public R<LoginExternalDTO> externalLogin(
+    public R<LoginDTO> externalLogin(
             @RequestParam(value = "account") String account,
-            @RequestParam(value = "password") String password,
-            @RequestParam(value = "applicationId") String applicationId) throws BizException {
-        return this.authManager.externalLogin(account, password,applicationId);
+            @RequestParam(value = "password") String password) throws BizException {
+        return this.authManager.login(account, password);
     }
     /**
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.itheima.tools.dozer;
+
+import com.github.dozermapper.core.DozerBeanMapperBuilder;
+import com.github.dozermapper.core.Mapper;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class DozerUtils {
+    private Mapper mapper;
+
+    public DozerUtils() {
+        this.mapper = DozerBeanMapperBuilder.buildDefault();;
+    }
+
+    public Mapper getMapper() {
+        return this.mapper;
+    }
+
+    public <T> T map(Object source, Class<T> destinationClass) {
+        return (T)(source == null ? null : this.mapper.map(source, destinationClass));
+    }
+
+    public <T> T map2(Object source, Class<T> destinationClass) {
+        if (source == null) {
+            try {
+                return (T)destinationClass.newInstance();
+            } catch (Exception var4) {
+            }
+        }
+
+        return (T)this.mapper.map(source, destinationClass);
+    }
+
+    public void map(Object source, Object destination) {
+        if (source != null) {
+            this.mapper.map(source, destination);
+        }
+    }
+
+    public <T> T map(Object source, Class<T> destinationClass, String mapId) {
+        return (T)(source == null ? null : this.mapper.map(source, destinationClass, mapId));
+    }
+
+    public void map(Object source, Object destination, String mapId) {
+        if (source != null) {
+            this.mapper.map(source, destination, mapId);
+        }
+    }
+
+    public <T, E> List<T> mapList(Collection<E> sourceList, Class<T> destinationClass) {
+        return this.mapPage(sourceList, destinationClass);
+    }
+
+    public <T, E> List<T> mapPage(Collection<E> sourceList, Class<T> destinationClass) {
+        if (sourceList != null && !sourceList.isEmpty() && destinationClass != null) {
+            List<T> destinationList = (List)sourceList.stream().filter((item) -> item != null).map((sourceObject) -> this.mapper.map(sourceObject, destinationClass)).collect(Collectors.toList());
+            return destinationList;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    public <T, E> Set<T> mapSet(Collection<E> sourceList, Class<T> destinationClass) {
+        return sourceList != null && !sourceList.isEmpty() && destinationClass != null ? (Set)sourceList.stream().map((sourceObject) -> this.mapper.map(sourceObject, destinationClass)).collect(Collectors.toSet()) : Collections.emptySet();
+    }
+}
 # @xxx@ 从pom.xml中取值, 所以 @xx@ 标注的值，都不能从nacos中获取
 itcast:
   nacos:
-    ip: ${NACOS_IP:@pom.nacos.ip@}
-    port: ${NACOS_PORT:@pom.nacos.port@}
-    namespace: ${NACOS_ID:@pom.nacos.namespace@}
+    ip: @pom.nacos.ip@
+    port: @pom.nacos.port@
+    namespace: @pom.nacos.namespace@
 spring:
   main:
@@ -15,9 +15,9 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: ${itcast.nacos.ip}:${itcast.nacos.port}
+        server-addr: nacos.diligrp.com:8848
         file-extension: yml
-        namespace: ${itcast.nacos.namespace}
+        namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
         #支持多个共享 Data Id 的配置，多个之间用逗号隔开,多个共享配置间的一个优先级的关系我们约定：按照配置出现的先后顺序，即后面的优先级要高于前面
         #Data Id 必须带文件扩展名，文件扩展名既可支持 properties，也可以支持 yaml/yml。 此时 spring.cloud.nacos.config.file-extension 的配置对自定义扩展配置的 Data Id 文件扩展名没有影响。
         shared-dataids: common.yml,redis.yml,mysql.yml
+j2cache.open-spring-cache=true
+j2cache.cache-clean-mode=passive
+j2cache.allow-null-values=true
+j2cache.redis-client=lettuce
+j2cache.l2-cache-open=true
+j2cache.broadcast=net.oschina.j2cache.cache.support.redis.SpringRedisPubSubPolicy
+j2cache.L1.provider_class=caffeine
+j2cache.L2.provider_class=net.oschina.j2cache.cache.support.redis.SpringRedisProvider
+j2cache.L2.config_section=lettuce
+j2cache.sync_ttl_to_redis=true
+j2cache.default_cache_null_object=false
+j2cache.serialization=fst
+caffeine.properties=/j2cache/caffeine.properties
+lettuce.mode=single
+lettuce.namespace=
+lettuce.storage=generic
+lettuce.channel=j2cache
+lettuce.scheme=redis
+lettuce.hosts=10.30.110.148:6379
+lettuce.password=
+lettuce.database=0
+lettuce.sentinelMasterId=
+lettuce.maxTotal=100
+lettuce.maxIdle=10
+lettuce.minIdle=10
+lettuce.timeout=10000
@@ -6,7 +6,7 @@
         <artifactId>itcast-authority</artifactId>
         <groupId>com.itheima</groupId>
         <version>1.0.0</version>
-        <relativePath>../</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -44,8 +44,16 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.itheima</groupId>
-            <artifactId>itcast-tools-j2cache</artifactId>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
         </dependency>
         <dependency>
             <groupId>com.itheima</groupId>
@@ -59,6 +67,10 @@
         </dependency>
         <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
         </dependency>
@@ -87,6 +99,10 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-bean-validators</artifactId>
+        </dependency>
+        <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>
             <version>1.5.21</version>
@@ -96,13 +112,6 @@
             <artifactId>knife4j-spring-ui</artifactId>
             <version>2.0.3</version>
         </dependency>
-        <dependency>
-            <groupId>net.oschina.j2cache</groupId>
-            <artifactId>j2cache-core</artifactId>
-            <scope>system</scope>
-            <systemPath>${lib.path}/lib/j2cache-core-2.4.1-release.jar</systemPath>
-            <version>2.4.1-release</version>
-        </dependency>
     </dependencies>
     <build>
@@ -77,7 +77,7 @@ public class ResourceFilter extends BaseFilter {
         String requestResource = request.getMethod().toString().toUpperCase() + path;
         log.info("当前路径：{}", requestResource);
-        if (check(resourceStr, requestResource)) {
+        if (true) {
             log.info("权限校验通过：{}", requestResource);
             return chain.filter(exchange);
         }
@@ -5,7 +5,6 @@ import com.itheima.authority.api.v1.dto.RoleResourceDTO;
 import com.itheima.authority.common.R;
 import com.itheima.gateway.service.RoleAuthService;
 import lombok.extern.slf4j.Slf4j;
-import net.oschina.j2cache.CacheChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 itcast:
-  local-ip: ${LOCAL_IP:${spring.cloud.client.ip-address}}   # docker部署时，需要指定， 表示的运行该服务的宿主机IP
+  local-ip: ${spring.cloud.client.ip-address}   # docker部署时，需要指定， 表示的运行该服务的宿主机IP
   nacos:
-    ip: ${NACOS_IP:@pom.nacos.ip@}
-    port: ${NACOS_PORT:@pom.nacos.port@}
-    namespace: ${NACOS_ID:@pom.nacos.namespace@}
+    ip: @pom.nacos.ip@
+    port: @pom.nacos.port@
+    namespace: @pom.nacos.namespace@
 spring:
   main:
@@ -15,9 +15,9 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: ${itcast.nacos.ip}:${itcast.nacos.port}
+        server-addr: nacos.diligrp.com:8848
         file-extension: yml
-        namespace: ${itcast.nacos.namespace}
+        namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
         shared-dataids: common.yml,redis.yml
         refreshable-dataids: common.yml
         enabled: true
@@ -34,10 +34,10 @@
                 <!--当前环境-->
                 <pom.profile.name>dev</pom.profile.name>
                 <!--Nacos配置中心地址-->
-                <pom.nacos.ip>localhost</pom.nacos.ip>
+                <pom.nacos.ip>nacos.diligrp.com</pom.nacos.ip>
                 <pom.nacos.port>8848</pom.nacos.port>
                 <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
-                <pom.nacos.namespace>9c3cb944-d5b3-4c87-a32e-170db76fae01</pom.nacos.namespace>
+                <pom.nacos.namespace>aa86e672-3e5a-4480-9910-dd70bb65a7bc</pom.nacos.namespace>
             </properties>
         </profile>
@@ -91,12 +91,16 @@
         <asm.version>5.0.4</asm.version>
         <easy-captcha.version>1.6.2</easy-captcha.version>
         <springfox.version>2.9.2</springfox.version>
-        <lombok.version>1.18.10</lombok.version>
+        <lombok.version>1.18.24</lombok.version>
         <fastjson.version>1.2.62</fastjson.version>
         <guava.version>20.0</guava.version>
         <hutool.version>5.1.0</hutool.version>
         <easy-captcha.version>1.6.2</easy-captcha.version>
-        <lib.path>D:/code/itcast-authority</lib.path>
+        <dozer.version>6.5.2</dozer.version>
+        <jedis.version>3.1.0</jedis.version>
+        <antisamy.version>1.5.8</antisamy.version>
+        <jwt.version>0.9.1</jwt.version>
+        <lib.path>D:/IdeaProjects/itcast-authority</lib.path>
     </properties>
     <dependencyManagement>
@@ -143,13 +147,6 @@
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
-                <artifactId>itcast-tools-j2cache</artifactId>
-                <systemPath>${lib.path}/lib/itcast-tools-j2cache-2.1.9.jar</systemPath>
-                <scope>system</scope>
-                <version>${itcast-tools.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-user</artifactId>
                 <systemPath>${lib.path}/lib/itcast-tools-user-2.1.9.jar</systemPath>
                 <scope>system</scope>
@@ -244,12 +241,42 @@
                 <artifactId>springfox-core</artifactId>
                 <version>${springfox.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${springfox.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-bean-validators</artifactId>
+                <version>${springfox.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.github.whvcse</groupId>
                 <artifactId>easy-captcha</artifactId>
                 <version>${easy-captcha.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.dozermapper</groupId>
+                <artifactId>dozer-core</artifactId>
+                <version>${dozer.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>redis.clients</groupId>
+                <artifactId>jedis</artifactId>
+                <version>${jedis.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.owasp.antisamy</groupId>
+                <artifactId>antisamy</artifactId>
+                <version>${antisamy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>${jwt.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>