From f888dedfcd70310a8cdb8cab376fc1dc13baba0e Mon Sep 17 00:00:00 2001 From: kaon Date: Wed, 14 May 2025 14:38:23 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=86=8D=E5=82=B3=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/dogtestbyadmin/UserServiceTest.class | Bin 1838 -> 3623 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/target/test-classes/co/jp/app/dogtestbyadmin/UserServiceTest.class b/target/test-classes/co/jp/app/dogtestbyadmin/UserServiceTest.class index 7c79a19c420fe01bf362b516ace4e5d017e6a6f5..005cf9362070f161064ab1a5360e6cf2a7d741f9 100644 GIT binary patch literal 3623 zcmbVO`F9)D75<*>WQ;TrV-g@?35y$S2Qm=Sw2ABx+Y!aBVh78yOVScX(z86aG$Uq4 zcHF&X>k8eVdkZbl{@9*20n>AO`g2eJrk;NHN!E<)#O>h+>CL;_yZ5`xd;j{+NB;mY zjz3xGQ5Y@<&Pu~^8x5xtRAU{*r46@I_k8DKq{E^P*SxZxC)q-u!oZ5V<~lXkuR61( z6YV3Fg?$Y-iq?a$lK0C&MTZJ!j9AnNJ-@mXx^+$NsuSsQGxXvOryOoH zsJ^Aq!i6@6QkHmWgznlVBsn63G8vJ{6VR9`xGyE94b8;SVpDkUnCE-( z8HL{Akp+dmDZ-gSFAmwb6L&F`g6Hd*X1%1td6&5{2`Rg^1vm6$-zN6O%N~<8nmTRw z8sgD=A{}3BC_H44Txrq|XQkQjVjZ#wJ!euc1)j1(hZssyOoGZb2s3yPhi(Cj z&c!`h#B|||@J4Km;wW+EsrkC=)f5g47m^|_#!@=Dk%fLdMjWL4Ma{AC zxTslFn_*e?<2Vr>yD(8KF3!%KGp0}2_@u~WDYI2r7CxnLXSc^&dCcHs%hl6125`G< zN96B>1t#J^w^BQ=8MdhjZ^FhP?vO2Y#^ER&5?@im6**DST#%>w9l)(Z%Z(&j4_9U9gAgF2AxA7b0xCI#j-?OnI;AaW`R;6W8gKwd(FeXQQ+!1Ia z0Gn~IHWO9h(R9#L%Pwc*i%l{$Lr+j|ca3-%+Src+lJ?j}6KjMoa@RO8j-)Mh;7e?@ zNfxdu+>_MGj%hW>yXs3ezKpNXP1ldsW$qtl?cEUB2_s+<@HHD>$2Z!rw&)7^;a&A^ zVs(3dSw1)DK31J{P9bnB(u|WE^6ztc$e4HQrHVWBxWah12cEwcl+BIdOm{wKeRJcb zA@9KTYF9VUFNeXpOyn%Sjqh6cj>02pV0JNY<9qmitEeWzYO_w{WjIdX;8cQ`7*gm) zDdFslfQrSS8J6|ao?IgP1(9O%q&Oz!pm5UUWP1shf*^JTW~UtZvA!BRMRU)ymt!-b zSgl5J=N&>}?MHk`IC=T1EPC;>Ts>wyY^iNMF1pnPc#Z<2Cl;tSAScSb-Z-!0<)9K} z@H70v!q0h$CG{*YtZJuV5=}vO$t}x!$i^@6E5ck)NDBW>H%D8uW&9b}uheujR0x9A zW+S(==~9#~#rchfPK*El%+`^+>!ypMZF$PA)r!2fbNlw_k0PIF#TX&ZA;<{(_104K|5xb`?1d83uZ#jSh zxDWSp1rAfWr{mfKq==!v(shw@NB@oopZfq0U&GMo-!L?IU=v@Zb`sPe9RW_^ z0pxI&FQn)3RLb!y9ml`MW|{|l0T$Z!Av delta 200 zcmZ23vyPAJ)W2Q(7#J9A83HzP?PV4bE=ese2}(`REG|hc@=GlbElw?({D|3gawNO- zu`qSSBFDtw1(auE Z@Md5K(n3I%50Lf+>h+6eU`%H42LKL)BtrlI From cd98de921304749ff6bf4bd830354a5e6c883287 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 14 May 2025 14:56:01 +0900 Subject: [PATCH 2/2] revert c4ddec8775c4759f1739955c0578360c35bc1f1c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert ごめんね --- src/main/java/co/jp/app/common/ApiResponse.java | 4 ---- .../jp/app/config/security/SecurityConfig.java | 7 +++++-- .../filter/JwtAuthenticationFilter.java | 17 +++++++++++------ .../app/exception/GlobalExceptionHandler.java | 8 +++----- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/main/java/co/jp/app/common/ApiResponse.java b/src/main/java/co/jp/app/common/ApiResponse.java index 8935c64..e31a684 100644 --- a/src/main/java/co/jp/app/common/ApiResponse.java +++ b/src/main/java/co/jp/app/common/ApiResponse.java @@ -2,13 +2,9 @@ package co.jp.app.common; public class ApiResponse { - //状态判定 private boolean success; - //状况码 private int code; - //状态信息 private String message; - //数据 private T data; private ApiResponse(ResultCode resultCode, T data) { diff --git a/src/main/java/co/jp/app/config/security/SecurityConfig.java b/src/main/java/co/jp/app/config/security/SecurityConfig.java index b0af187..3bbfdd4 100644 --- a/src/main/java/co/jp/app/config/security/SecurityConfig.java +++ b/src/main/java/co/jp/app/config/security/SecurityConfig.java @@ -1,6 +1,9 @@ package co.jp.app.config.security; +<<<<<<< HEAD +======= import co.jp.app.config.security.filter.JwtAuthenticationFilter; +>>>>>>> 2aae88278c46cf937380317aae1f9d229bcb3c37 import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; @@ -10,12 +13,12 @@ import org.springframework.security.authentication.dao.DaoAuthenticationProvider import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +import co.jp.app.config.security.filter.JwtAuthenticationFilter; @Configuration public class SecurityConfig { diff --git a/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java b/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java index 2156dd0..802300b 100644 --- a/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java @@ -1,12 +1,7 @@ package co.jp.app.config.security.filter; -import co.jp.app.service.JwtService; import java.io.IOException; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.context.annotation.Lazy; + import org.springframework.lang.NonNull; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; @@ -16,6 +11,16 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +<<<<<<< HEAD +import co.jp.app.service.JwtService; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + + +======= +>>>>>>> 2aae88278c46cf937380317aae1f9d229bcb3c37 @Component public class JwtAuthenticationFilter extends OncePerRequestFilter { diff --git a/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java b/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java index 0482aaf..4b34f1f 100644 --- a/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java +++ b/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java @@ -1,14 +1,11 @@ package co.jp.app.exception; -import co.jp.app.common.ApiResponse; -import co.jp.app.common.ResultCode; -import co.jp.app.exception.BusinessException; +import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.userdetails.UsernameNotFoundException; @@ -18,7 +15,8 @@ import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import java.util.stream.Collectors; +import co.jp.app.common.ApiResponse; +import co.jp.app.common.ResultCode; @RestControllerAdvice public class GlobalExceptionHandler {