From 264b9a528a75c419723ae27116a426b24fb56b08 Mon Sep 17 00:00:00 2001 From: z <22ad0414@gmail.com> Date: Mon, 12 May 2025 17:21:40 +0900 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/co/jp/app/service/UserService.java | 53 +++--------------- .../app/config/security/SecurityConfig.class | Bin 6966 -> 5328 bytes 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index c059f05..5dbfd72 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -1,20 +1,8 @@ package co.jp.app.service; -<<<<<<< HEAD -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; - -import co.jp.app.entity.UserEntity; -import co.jp.app.repository.UserRepository; -import jakarta.transaction.Transactional; - -======= ->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e import java.util.Collection; import java.util.Collections; -import co.jp.app.dto.RegistrationDto; import org.jetbrains.annotations.NotNull; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -22,28 +10,17 @@ import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; - -<<<<<<< HEAD -import co.jp.app.entity.PetEntity; -import co.jp.app.repository.UploadRepository; -======= +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; ->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e + +import co.jp.app.dto.RegistrationDto; +import co.jp.app.entity.UserEntity; +import co.jp.app.repository.UserRepository; @Service public class UserService implements UserDetailsService { -<<<<<<< HEAD - private final UserRepository userEntityRepository; - - @Autowired - public UserService(UserRepository userEntityRepository, PasswordEncoder passwordEncoder ) - { - this.userEntityRepository = userEntityRepository; - this.passwordEncoder= passwordEncoder; - -======= ->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e private final UserRepository userRepository; private final PasswordEncoder passwordEncoder; @@ -73,29 +50,17 @@ public class UserService implements UserDetailsService { UserEntity userEntity = userRepository.findByEmail(email) .orElseThrow(() -> new UsernameNotFoundException(email + " not found")); -<<<<<<< HEAD Collection authorities = Collections - .singletonList(new SimpleGrantedAuthority("ROLE_USER")); // 示例：给所有用户一个ROLE_USER权限 -======= - Collection authorities = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")); ->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e + .singletonList(new SimpleGrantedAuthority("ROLE_USER")); return new User( userEntity.getEmail(), userEntity.getPassword(), -<<<<<<< HEAD true, // enabled true, // accountNonExpired true, // credentialsNonExpired true, // accountNonLocked - authorities // 用户的权限集合 -======= - true, // enabled - true, // accountNonExpired - true, // credentialsNonExpired - true, // accountNonLocked - authorities // role ->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e + authorities // role ); } -} +} \ No newline at end of file diff --git a/target/classes/co/jp/app/config/security/SecurityConfig.class b/target/classes/co/jp/app/config/security/SecurityConfig.class index fb3a4d7ef463e7e1fb1d0ff8298a9eca9df01178..d5567d79a3384ed2d3878a563eb9067253cae66c 100644 GIT binary patch delta 1260 zcmaJ&uAtMtuREi_a?Y5DAfA5Z(Lf5h_k45Fn~K1}z$XYM`cboVW{zG*gIewcX< zU?Z;IG`b!?OtFyHgoX+Rd1-UT4FC3^Sty#i88eDb|uE&C@N3MF|7_> zhLFV{$w59LcPkAHX)1{F2eOa1xS~D-_3(;iiHRT3#2b}E{$>+3SRlZJiDme4>W*@Q zHLPN&I%=J=lEYRZpX@wyFgH3jG*U3oinSWnFyy%vO!B*~wH_1eu%4kNpBv*$4NkpQ zhnU)Cq8-2RO?t}Rfi4Z53|pyVC4Z)eHoB#j- literal 6966 zcmcgx>3bW+9e&5LBU@}@#c2X0kftUyJ|J7%BtVp=*osppDBxO-sRMI2XAkSJEy)KwPrRC)o%tQ_@0`iM|F`rW zfKTCH5wr;Oq-}jRuN(Qip0=%NGpiS5y6BkhqMix{32#1vR)N^8v0&&q!^-LpPtD4- zD{%AdC3mps&PdBO(}ru>))_PBN=M*Ca&6kv-WvVf>U-k?UB!ZQPD|G?bA^<27R1AU&i03Usyqdl((NWEz>C$Ky%Pf6 zV@0AiFDJ}`IhB*6hSG`H4O*7%dRP_&?p~D_jpfSAu5K(Z)sx1RMe5g@uro4>ZRpg{ zftbLyp5BQL5K;|o*sew&(GWqqKxfjl=plgUMER#-t#9 zb>OP@6-p61FWnhCv#b*Lcjk>kffmaQTWN|&4|$-ccU9$kV^cmyA%MD-oa7iY>7OCL(8*BX(cIDk%py+&0?j5_v$>8X6Ck;>H@_3F?H z=}_210%z+ATSF*g*!pS1UY%YPcc4=}4r}N^ufU#ybXP`?z;I6kgEbL?y%SOTV84ca z*splrt>FlC`W|`KpeZoeh+zW{QDLSjC_?B29;~mzdT^ry?x|jX-mr|U^6fVo3GQdx ziukQ26r|&#@GagTh-&B#R(WP1FBORnUrx)sO5lYEjtlHA=lbO@QQU_U z5!^43t?PS1DcJ($G{kXI;FhecsWQtz4{s`>%KGoG#;FQo0kgi-Y@Nci#7%y6Ow1Uj zCGgz39qE#s(x-}MjtQrrkGO6=%+8HGMQse%`c>SMA>PG?VMs#)rv*CF#e!?kn^#yZ z1{y&hz>)~JIPoaXU?hUi2#l=LgVxka!&#hT-AfmoX@RGjgR4TM2H~^Pv};O2pxC4+ z70+vUNC~y8APWVCl<#KqY?8Xr;xGBEhB39oOCYvGK$WS++TKV}2@Q9J)u~i3TpTy7m3pqN6fO zs@A0wUMW)_p44XTJ3n6?RR<7 z@u)~Aif8ea2%ZyoVUyt!N?ujtHl&$`ui|S|!SM@apf}^~aL=O^iP+bc$$ypH{B?oc zhoq0pTySzxT*V6-Uc^gGXL;$&o9!z)Kqmsmgq`b>6{<{O<=W%~mFmBcbL^L^Q3EvWreyve97&v^#7b z{3tr2{9NGps>&1V+RLIa_B_T!EjDD^E;EOb_b+bPfc_Xijo>G|r7DMzX)V}uk~dAN zo8UrY+DN;$!&?0_yvBnIZ?D2Bf&Zu;E$qdDoj&mq!^-4j;ZV}H=Zg8tmMsX|wKk5k zMpQ1ZqFVQ(&$9mB%488xP8hjd%5-JCb31;-nqH|=(ChV1#PEwKevRKo@Ed^(o6Rg! z$_iM!M` zukUIR{8QlZ&045_mF7ih^HI&58ZP!q1&?{Wu;p>P1zqa4mZL6pSIgfBzjQ!d?B2w; z9W8v-IPjl4IGW@pwY9VFI(GK;U&F4xyRKpPTbyda9zMI!%IAJQZzHAKv6FX|dpUE^ z--erU3*Sh<<1D<9;@yHnYypoVT#&= z7<#EjpT}vhPa)vcP5?fEd&r$P7x*M$I7<4hd^@&6llwWVxVQC}aBrEBuZCVhylok^ zHvXT=DQ;6(wF$l`oIZ^Q>hifl=oO!V{v`|oB@8d&LG_zl!o%u!l&YpmxIpE1b$zac zi;qyE$KS_PS*U%Un;fM{k6{;%Q-BjV$ZNAc%Am~aqcE^6=m0X1WkEAQEULnjQ_6^^ zDUfHxzPB+`f~EXto992i_QyP;p%Gma`F(+Z<(W$!MFw|3ahi_fnZK{?U0j*m*7a0s zvbF2WRO^}dakYf!OZbL2_-2{cPR}Qg)7|c+Iq$3B*^O`GJ5@Z@%y&7{itq8+g6}Vz z^9OwYA^((z|D1on#OwH@H~JIaz+b)5oA?{v!8NYh#}y^~9ZQ7pS=_+8g!3wY--Gx+ DvNYsa