集成Authing，添加推荐功能

stanic-xyz · Jan 8, 2024 · e1c612c · e1c612c
1 parent c70a986
commit e1c612c
Show file tree

Hide file tree

Showing 55 changed files with 902 additions and 180 deletions.
diff --git a/qing-domain/readme.md b/qing-domain/readme.md
@@ -78,3 +78,44 @@
 | `utils`      | 工具包           | 工具函数封装                                            |
 | `--timer`    | timer         | 定时器接口封装                                           |
 | `--upload`   | oss           | oss接口封装                                           |
+
+### 快速执行
+
+#### 快速创建功能
+
+可以通过创建一下带注解的类，快速创建一个功能。待注解类完成后，执行`编译`命令即可实现简单的 CRUD 功能。
+注意功能创建好之后，尽量不要提交带注解的类到 Git 因为注解处理器会影响其他人的启动项目
+
+```java
+
+@GenVo
+@GenCreator
+@GenUpdater
+@GenQuery
+@GenCreateRequest
+@GenUpdateRequest
+@GenQueryRequest
+@GenResponse
+@GenRepository
+@GenService
+@GenServiceImpl
+@GenController
+@GenMapper
+@GenFeign(serverName = "stanic")
+@Getter
+@Setter
+@ToString
+@Entity
+@Table(name = "anime_recommend")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+public class Recommend extends BaseJpaAggregate {
+
+   @NotBlank(message = "名称不能为空")
+   @FieldDesc(description = "名称")
+   private String name;
+
+   @FieldDesc(description = "介绍")
+   private String instruction;
+
+}
+```
diff --git a/qing-domain/src/main/java/cn/chenyunlong/qing/aspect/HttpLogInterceptor.java b/qing-domain/src/main/java/cn/chenyunlong/qing/aspect/HttpLogInterceptor.java
@@ -0,0 +1,18 @@
+package cn.chenyunlong.qing.aspect;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+@Slf4j
+public class HttpLogInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        // 记录请求日志
+        log.info("用户访问地址:{}, 请求方式: {}，请求地址：{}", request.getRemoteAddr(), request.getMethod(), request.getServletPath());
+        log.info("----------------请求头.start.....");
+        return HandlerInterceptor.super.preHandle(request, response, handler);
+    }
+}
diff --git a/qing-domain/src/main/java/cn/chenyunlong/qing/config/WebMvcConfig.java b/qing-domain/src/main/java/cn/chenyunlong/qing/config/WebMvcConfig.java
@@ -13,12 +13,13 @@
 
 package cn.chenyunlong.qing.config;
 
+import cn.chenyunlong.qing.aspect.HttpLogInterceptor;
 import cn.chenyunlong.qing.infrastructure.config.properties.QingProperties;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
@@ -29,7 +30,6 @@
 @Slf4j
 @Configuration
 @RequiredArgsConstructor
-@ComponentScan(basePackages = {"cn.chenyunlong.common"})
 public class WebMvcConfig implements WebMvcConfigurer {
 
     private final QingProperties qingProperties;
@@ -46,4 +46,10 @@ public void addCorsMappings(CorsRegistry registry) {
             .allowedOriginPatterns("*")
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS");
     }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new HttpLogInterceptor());
+        WebMvcConfigurer.super.addInterceptors(registry);
+    }
 }
diff --git a/qing-domain/src/main/java/cn/chenyunlong/qing/config/security/SecurityConfig.java b/qing-domain/src/main/java/cn/chenyunlong/qing/config/security/SecurityConfig.java
@@ -15,6 +15,7 @@
 
 import cn.chenyunlong.qing.config.security.filter.MyAuthenticationProcessingFilter;
 import cn.chenyunlong.qing.config.security.jwt.MySecurityContextRepository;
+import cn.chenyunlong.qing.config.security.password.MyCustomDsl;
 import cn.chenyunlong.qing.config.security.utils.JwtTokenUtil;
 import cn.chenyunlong.security.base.extension.DummyUserContextAware;
 import cn.chenyunlong.security.base.extension.UserContextAware;
@@ -48,6 +49,7 @@ public class SecurityConfig {
     private final JwtTokenUtil jwtTokenUtil;
     private final UserDetailsService userDetailsService;
     private final AuthingLoginConfigurer authingLoginConfigurer;
+    private final MyCustomDsl customPasswordDsl;
     private final AccessDeniedHandler accessDeniedHandler;
     private final AuthenticationEntryPoint authenticationEntryPoint;
 
@@ -59,29 +61,30 @@ UserContextAware dummyUserContext() {
 
     @Bean
     public SecurityFilterChain userLoginFilterChain(HttpSecurity http) throws Exception {
-        http.csrf().disable();
-        http.cors().disable();
-        http.authorizeHttpRequests()
-                .requestMatchers(
-                        authingProperties.getRedirectUrlPrefix(),
-                        "/swagger-ui/**",
-                        "/doc.html",
-                        "/v3/api-docs/**",
-                        "/login",
-                        "/favicon.ico",
-                        "/auth/passLogin",
-                        "api/authorize/authing/login")
-                .permitAll();
-        http.authorizeHttpRequests()
-                .anyRequest().hasRole("USER");
-        http.formLogin(formLogin -> formLogin.usernameParameter("username")
-                .loginProcessingUrl("/auth/passLogin")
-        );
-        http.addFilterAt(new MyAuthenticationProcessingFilter(), UsernamePasswordAuthenticationFilter.class);
-        http.logout().logoutSuccessUrl("/login.html");
-        http.securityContext(httpSecuritySecurityContextConfigurer ->
-                httpSecuritySecurityContextConfigurer.securityContextRepository(securityContextRepository()));
         http.apply(authingLoginConfigurer);
+        http.apply(customPasswordDsl);
+        http.securityMatcher("/**")
+                .authorizeHttpRequests(authorize -> {
+                    authorize.requestMatchers(
+                            authingProperties.getRedirectUrlPrefix(),
+                            "/swagger-ui/**",
+                            "/doc.html",
+                            "/v3/api-docs/**",
+                            "/login",
+                            "/favicon.ico",
+                            "/auth/passLogin",
+                            "/api/authorize/authing/login").permitAll();
+                    authorize.anyRequest().hasRole("USER");
+                })
+                .formLogin(formLogin -> formLogin.usernameParameter("username")
+                        .loginProcessingUrl("/auth/passLogin")
+                        .permitAll()
+                )
+                .addFilterBefore(new MyAuthenticationProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
+                .logout(logout -> logout.logoutSuccessUrl("/login.html"))
+                .securityContext(httpSecuritySecurityContextConfigurer ->
+                        httpSecuritySecurityContextConfigurer.securityContextRepository(securityContextRepository()))
+        ;
         http.exceptionHandling()
                 .accessDeniedHandler(accessDeniedHandler)
                 .authenticationEntryPoint(authenticationEntryPoint);

diff --git a/...ain/java/cn/chenyunlong/qing/config/security/filter/MyAuthenticationProcessingFilter.java b/...ain/java/cn/chenyunlong/qing/config/security/filter/MyAuthenticationProcessingFilter.java
@@ -71,10 +71,10 @@ private String resolveToken(HttpServletRequest request) {
         if (cookies == null) {
             return null;
         }
-        Optional<Cookie> zhangliToken =
+        Optional<Cookie> cookieOptional =
             Arrays.stream(cookies).filter(cookie -> cookie.getName().equals(AUTHORIZATION_COOKIES))
                 .findFirst();
-        return zhangliToken.map(Cookie::getValue).orElse(null);
+        return cookieOptional.map(Cookie::getValue).orElse(null);
     }
 
 }
diff --git a/...in/src/main/java/cn/chenyunlong/qing/config/security/jwt/MySecurityContextRepository.java b/...in/src/main/java/cn/chenyunlong/qing/config/security/jwt/MySecurityContextRepository.java
@@ -36,15 +36,14 @@ public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHold
         token = token.replaceFirst("Bearer ", "");
         // 拿到 用户名
         String username = jwtTokenUtil.getUserNameFromToken(token);
+        if (StrUtil.isBlank(username)) {
+            return securityContext;
+        }
         // 查询用户
         UserDetails user = userService.loadUserByUsername(username);
         if (user == null) {
             return securityContext;
         }
-        // 验证 token
-        if (!jwtTokenUtil.validateToken(token, user)) {
-            return securityContext;
-        }
         UsernamePasswordAuthenticationToken authenticationToken = UsernamePasswordAuthenticationToken.authenticated(user.getUsername(), user.getPassword(), user.getAuthorities());
         authenticationToken.setDetails(user);
         securityContext.setAuthentication(authenticationToken);

diff --git a/qing-domain/src/main/java/cn/chenyunlong/qing/config/security/password/MyCustomDsl.java b/qing-domain/src/main/java/cn/chenyunlong/qing/config/security/password/MyCustomDsl.java
@@ -0,0 +1,29 @@
+package cn.chenyunlong.qing.config.security.password;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class MyCustomDsl extends AbstractHttpConfigurer<MyCustomDsl, HttpSecurity> {
+
+    private final UserDetailsService userDetailsService;
+
+    @Override
+    public void init(HttpSecurity http) throws Exception {
+        // any method that adds another configurer
+        // must be done in the init method
+        http.csrf().disable();
+        http.formLogin();
+    }
+
+    @Override
+    public void configure(HttpSecurity http) throws Exception {
+//        myFilter.setFlag(flag);
+        http.addFilterBefore(new PasswordLoginFilter(), UsernamePasswordAuthenticationFilter.class);
+    }
+}
diff --git a/...omain/src/main/java/cn/chenyunlong/qing/config/security/password/PasswordLoginFilter.java b/...omain/src/main/java/cn/chenyunlong/qing/config/security/password/PasswordLoginFilter.java
@@ -3,18 +3,18 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import java.io.IOException;
 
 public class PasswordLoginFilter extends AbstractAuthenticationProcessingFilter {
 
-    public PasswordLoginFilter(AuthenticationManager authenticationManager) {
-        super("/auth/passLogin", authenticationManager);
+    public PasswordLoginFilter() {
+        super(new AntPathRequestMatcher("/auth/passLogin", "POST"));
     }
 
     @Override

diff --git a/qing-domain/src/main/java/cn/chenyunlong/qing/config/security/utils/JwtTokenUtil.java b/qing-domain/src/main/java/cn/chenyunlong/qing/config/security/utils/JwtTokenUtil.java
@@ -3,12 +3,11 @@
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
@@ -28,7 +27,6 @@ public class JwtTokenUtil {
     private String secret;
     private Long expiration;
     private String header = "jwt";
-    private static final Logger LOGGER = LoggerFactory.getLogger(JwtTokenUtil.class);
 
     /**
      * 根据负责生成JWT的token
@@ -51,8 +49,10 @@ private Claims getClaimsFromToken(String token) {
                     .setSigningKey(secret)
                     .parseClaimsJws(token)
                     .getBody();
+        } catch (ExpiredJwtException exception) {
+            log.info("JWT已过期:{},jwt:{}", exception.getMessage(), token);
         } catch (Exception e) {
-            LOGGER.info("JWT格式验证失败:{}", token);
+            log.info("JWT格式验证失败:{}", token);
         }
         return claims;
     }
@@ -157,9 +157,6 @@ private boolean tokenRefreshJustBefore(String token, int time) {
         Date created = claims.get(CLAIM_KEY_CREATED, Date.class);
         Date refreshDate = new Date();
         //刷新时间在创建时间的指定时间内
-        if (refreshDate.after(created) && refreshDate.before(DateUtil.offsetSecond(created, time))) {
-            return true;
-        }
-        return false;
+        return refreshDate.after(created) && refreshDate.before(DateUtil.offsetSecond(created, time));
     }
 }
diff --git a/...in/java/cn/chenyunlong/qing/domain/anime/attachement/controller/AttachmentController.java b/...in/java/cn/chenyunlong/qing/domain/anime/attachement/controller/AttachmentController.java
@@ -14,13 +14,15 @@
 import cn.chenyunlong.qing.domain.anime.attachement.dto.vo.AttachmentVO;
 import cn.chenyunlong.qing.domain.anime.attachement.mapper.AttachmentMapper;
 import cn.chenyunlong.qing.domain.anime.attachement.service.IAttachmentService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.stream.Collectors;
 
+@Tag(name = "附件管理")
 @RestController
 @Slf4j
 @RequestMapping("api/v1/attachment")

diff --git a/...rc/main/java/cn/chenyunlong/qing/domain/anime/district/controller/DistrictController.java b/...rc/main/java/cn/chenyunlong/qing/domain/anime/district/controller/DistrictController.java
@@ -14,13 +14,15 @@
 import cn.chenyunlong.qing.domain.anime.district.dto.vo.DistrictVO;
 import cn.chenyunlong.qing.domain.anime.district.mapper.DistrictConverter;
 import cn.chenyunlong.qing.domain.anime.district.service.IDistrictService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.stream.Collectors;
 
+@Tag(name = "地区管理")
 @RestController
 @Slf4j
 @RequestMapping("api/v1/district")

diff --git a/...nyunlong/qing/domain/episode/Episode.java → ...ng/qing/domain/anime/episode/Episode.java b/...nyunlong/qing/domain/episode/Episode.java → ...ng/qing/domain/anime/episode/Episode.java
@@ -11,7 +11,7 @@
  *
  */
 
-package cn.chenyunlong.qing.domain.episode;
+package cn.chenyunlong.qing.domain.anime.episode;
 
 import cn.chenyunlong.common.annotation.FieldDesc;
 import cn.chenyunlong.jpa.support.BaseJpaAggregate;

diff --git a/...episode/controller/EpisodeController.java → ...episode/controller/EpisodeController.java b/...episode/controller/EpisodeController.java → ...episode/controller/EpisodeController.java
@@ -1,25 +1,28 @@
-package cn.chenyunlong.qing.domain.episode.controller;
+package cn.chenyunlong.qing.domain.anime.episode.controller;
 
 import cn.chenyunlong.common.constants.CodeEnum;
 import cn.chenyunlong.common.model.JsonResult;
 import cn.chenyunlong.common.model.PageRequestWrapper;
 import cn.chenyunlong.common.model.PageResult;
-import cn.chenyunlong.qing.domain.episode.dto.creator.EpisodeCreator;
-import cn.chenyunlong.qing.domain.episode.dto.query.EpisodeQuery;
-import cn.chenyunlong.qing.domain.episode.dto.request.EpisodeCreateRequest;
-import cn.chenyunlong.qing.domain.episode.dto.request.EpisodeQueryRequest;
-import cn.chenyunlong.qing.domain.episode.dto.request.EpisodeUpdateRequest;
-import cn.chenyunlong.qing.domain.episode.dto.response.EpisodeResponse;
-import cn.chenyunlong.qing.domain.episode.dto.updater.EpisodeUpdater;
-import cn.chenyunlong.qing.domain.episode.dto.vo.EpisodeVO;
-import cn.chenyunlong.qing.domain.episode.mapper.EpisodeMapper;
-import cn.chenyunlong.qing.domain.episode.service.IEpisodeService;
-import java.util.stream.Collectors;
+import cn.chenyunlong.qing.domain.anime.episode.dto.creator.EpisodeCreator;
+import cn.chenyunlong.qing.domain.anime.episode.dto.query.EpisodeQuery;
+import cn.chenyunlong.qing.domain.anime.episode.dto.request.EpisodeCreateRequest;
+import cn.chenyunlong.qing.domain.anime.episode.dto.request.EpisodeQueryRequest;
+import cn.chenyunlong.qing.domain.anime.episode.dto.request.EpisodeUpdateRequest;
+import cn.chenyunlong.qing.domain.anime.episode.dto.response.EpisodeResponse;
+import cn.chenyunlong.qing.domain.anime.episode.dto.updater.EpisodeUpdater;
+import cn.chenyunlong.qing.domain.anime.episode.dto.vo.EpisodeVO;
+import cn.chenyunlong.qing.domain.anime.episode.mapper.EpisodeMapper;
+import cn.chenyunlong.qing.domain.anime.episode.service.IEpisodeService;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.stream.Collectors;
+
+@Tag(name = "单集管理")
 @RestController
 @Slf4j
 @RequestMapping("api/v1/episode")

diff --git a/...n/episode/dto/creator/EpisodeCreator.java → ...e/episode/dto/creator/EpisodeCreator.java b/...n/episode/dto/creator/EpisodeCreator.java → ...e/episode/dto/creator/EpisodeCreator.java
@@ -1,4 +1,4 @@
-package cn.chenyunlong.qing.domain.episode.dto.creator;
+package cn.chenyunlong.qing.domain.anime.episode.dto.creator;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

diff --git a/...omain/episode/dto/query/EpisodeQuery.java → ...anime/episode/dto/query/EpisodeQuery.java b/...omain/episode/dto/query/EpisodeQuery.java → ...anime/episode/dto/query/EpisodeQuery.java
@@ -1,4 +1,4 @@
-package cn.chenyunlong.qing.domain.episode.dto.query;
+package cn.chenyunlong.qing.domain.anime.episode.dto.query;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

diff --git a/...ode/dto/request/EpisodeCreateRequest.java → ...ode/dto/request/EpisodeCreateRequest.java b/...ode/dto/request/EpisodeCreateRequest.java → ...ode/dto/request/EpisodeCreateRequest.java
@@ -1,4 +1,4 @@
-package cn.chenyunlong.qing.domain.episode.dto.request;
+package cn.chenyunlong.qing.domain.anime.episode.dto.request;
 
 import cn.chenyunlong.common.model.Request;
 import io.swagger.v3.oas.annotations.media.Schema;