From 6d3f837d7cb6e7b33bf1e47f0da48e1d3d430799 Mon Sep 17 00:00:00 2001 From: z <22ad0414@gmail.com> Date: Mon, 12 May 2025 16:31:18 +0900 Subject: [PATCH] saved --- .../java/co/jp/app/service/UserService.java | 32 ++++++------------ target/classes/.gitignore | 2 ++ .../maven/co.jp.app/dog-2/pom.properties | 4 +-- .../jp/app/controller/uploadController.class | Bin 1109 -> 0 bytes .../jp/app/repository/uploadRepository.class | Bin 922 -> 0 bytes .../co/jp/app/repository/userRepository.class | Bin 885 -> 0 bytes .../co/jp/app/service/erraService.class | Bin 750 -> 0 bytes .../co/jp/app/service/userService.class | Bin 3788 -> 0 bytes 8 files changed, 15 insertions(+), 23 deletions(-) create mode 100644 target/classes/.gitignore delete mode 100644 target/classes/co/jp/app/controller/uploadController.class delete mode 100644 target/classes/co/jp/app/repository/uploadRepository.class delete mode 100644 target/classes/co/jp/app/repository/userRepository.class delete mode 100644 target/classes/co/jp/app/service/erraService.class delete mode 100644 target/classes/co/jp/app/service/userService.class diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index f52d7db..32b8220 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -1,22 +1,18 @@ 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 co.jp.app.repository.UserRepository; import jakarta.transaction.Transactional; -======= import java.util.Collection; import java.util.Collections; import java.util.List; import co.jp.app.dto.RegistrationDto; -import co.jp.app.entity.UserEntity; -import co.jp.app.repository.UserRepository; import org.jetbrains.annotations.NotNull; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -24,34 +20,27 @@ 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; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; import co.jp.app.entity.PetEntity; import co.jp.app.repository.UploadRepository; -import org.springframework.transaction.annotation.Transactional; ->>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6 @Service public class UserService implements UserDetailsService { -<<<<<<< HEAD - private final userRepository userEntityRepository; + private final UserRepository userEntityRepository; @Autowired - public UserService(userRepository userEntityRepository, PasswordEncoder passwordEncoder ) + public UserService(UserRepository userEntityRepository, PasswordEncoder passwordEncoder ) { this.userEntityRepository = userEntityRepository; this.passwordEncoder= passwordEncoder; - -======= + private final UserRepository userRepository; private final PasswordEncoder passwordEncoder; public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder) { this.userRepository = userRepository; this.passwordEncoder = passwordEncoder; ->>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6 } @Transactional @@ -75,16 +64,17 @@ public class UserService implements UserDetailsService { UserEntity userEntity = userRepository.findByEmail(email) .orElseThrow(() -> new UsernameNotFoundException(email + " not found")); - Collection authorities = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")); // 示例：给所有用户一个ROLE_USER权限 + Collection authorities = Collections + .singletonList(new SimpleGrantedAuthority("ROLE_USER")); // 示例：给所有用户一个ROLE_USER权限 return new User( userEntity.getEmail(), userEntity.getPassword(), - true, // enabled - true, // accountNonExpired - true, // credentialsNonExpired - true, // accountNonLocked - authorities // 用户的权限集合 + true, // enabled + true, // accountNonExpired + true, // credentialsNonExpired + true, // accountNonLocked + authorities // 用户的权限集合 ); } } diff --git a/target/classes/.gitignore b/target/classes/.gitignore new file mode 100644 index 0000000..09b187f --- /dev/null +++ b/target/classes/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/co/ diff --git a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties index 132537c..f3135a6 100644 --- a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties +++ b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties @@ -1,6 +1,6 @@ #Generated by Maven Integration for Eclipse -#Mon May 12 14:19:16 JST 2025 -m2e.projectLocation=C\:\\Users\\ichbi\\OneDrive\\\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\\dog-1 +#Mon May 12 15:57:02 JST 2025 +m2e.projectLocation=C\:\\Users\\Administrator\\git\\Dog-1 m2e.projectName=dog-1 groupId=co.jp.app artifactId=dog-2 diff --git a/target/classes/co/jp/app/controller/uploadController.class b/target/classes/co/jp/app/controller/uploadController.class deleted file mode 100644 index 90fe869b82dd9240cdf7486e5c1797e0f68629c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1109 zcmb7DZBG+H5Pr4=3Z=YQ-bF=Fq=4yK4T=;=8iJorA)*-Lr@iY^7LVJ@-d;)nl_o|K zP5c4=DC69YNLoSl0sXWOr?{tAW#tzDUJEY1m^C}LkI*|t|Qm!v+ zL7=U$N(T|cx}!~lN1;(cM|4^?Fs)t7?tQ9V~;&j)X36>LH@!> zQa4UnVi+$iJ6&$}Z88J-*RCAtRJz<%LH*)1dpfc&Xa()O-lp(l>T;B}qIg|5BHpf) z!!*NKS}C^5=QU$Q%TbZdV+un9V3;kS7kzo$#9R)y80P-5lmc#Jo?$Q&O{>g7E{LOLsQtajhvL(F@+v3#2PI{|u5r_GG z9UD(RSIOEYEerGJVclh98xM_MBLNoGjWJEU`vG)|I{>|HrS;Zy1!rZWi! zMlnKXp&dZlHPYy{VvIl%$YIjP>6>^D7GW|4bjg8HAPaF@^*DKhDyZMjFc43@~2K`HH`NVnzlE>^G# F`~otF9#;SW diff --git a/target/classes/co/jp/app/repository/uploadRepository.class b/target/classes/co/jp/app/repository/uploadRepository.class deleted file mode 100644 index 0bd85a949c41c3d8522393549d523615097c9589..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 922 zcmbVKO>fgc5Pj>Wb=m|PN*gF2N4^q?J#oRIQiVV&G9@B~`z9IO4X)Q(Z;HaN;tB`E znIDB1J70!G95{G)_IY;R+c)#`*SGHgp5d+!PvG9b$Wba)no3Kl$+R746uP5xYe<2AW+GwiCo4QwNqZ>@7-Za~q=h2K67 z`F*R65ZLLNu^rG$ojY*w_h>xMuLyiD37bww5dPO>bV@d^bhSisk~oUUazA+p1vdEG zf}1K0S(+1SH%{=d(0 yy~xXv1CE-EY_eTIYx15FIZ`)20DJ3Ju=}5E4+SRu4UGK>}1H&{9wXy*tUUb=cU8*IN|vr?|p_ zAHa`7Ja196RR{-rJofm#H_!g{`^QfrdO~+w6bZUNvT~A3mFLoNZVT6YHx=(VfyaK4IBfien98l0&%KrK6 z05=5fJWS@;10S&BN6B0l8?XILet@R^Y8eZS1?>+ZwZ7#l6jpdc`oU)6b#`rseE?_kA z86!lvi+l}PCmgjg)(h&;MeOXMB0^k!y!D+fMf9z@)5W}kGTfjmm^V*rs7D*fP>ubo oIKPH6Q{@2)tT;%=p;#u zQ%;*C6L{4&b|ACV>SSqNV^0;R@L zSD^gC^r?ap)+4N;BCy%k34PATJ+j{v=M}i$HnAFYmDS##U6$R2=0XmZdbwjJoNs+V zuET}r+51VWFHmo^j+TOmdvp`uys@W+-CTpf!w4%_t>O`OLp&CE@&A!Uc!F(#kn>G5 z1)9@|7BA%!xeL?(s{EuJS+2X%F}aQDqxKEfmbUoPFHoRy=YTT~CgUb4$=TAIsB^U? zek6iFE}1c8%i}%9fRV?_XO%t4Sn!U2A^K7L-k6cWgiW@iDFHQXvB$&5HjDV+cZ>mJ u_4p?q?ES`0fbZ-ESV(LY5<64cOu`HA;VDb)GkZm_rWh26hD{O!j=}?wrbVdDYObcc6?NA*xJ}yYDl(Ffs*)fn7PoQyK^UZW}*AR zgjrN*!D!l8gO9d}wNRTt8cZ~3=y(5(+g<5DVLW#hc39Z*2(gLA5BJW!ch2kn&N*|= z{PEZP0sy=VM?+9XV871P0bA87^ zDgy5@-mf|~H?96Yt|jRZ;}=kbp5msPR&~aynnFPabu}~L_(D(R*GsYq?2!bmmWvFX z)Mk$9GM*-II3C!<3+KMHfGkE}mt+r4(9pOvJvc#{I$LubG|gzWbY@Ua;COs}!+F|v znYzrTo-O7_kyXb`%XE(u=xf@Pq1)5f+(TerX9__|(jL<>dlU48WieNCO=dX+j+PYP zOEt?;`!ro5s%ixW^+d{LLnfyNUZmoEL?i^e5v9Pxt(-Gn4SPw|+&PO=hb0E7q3A4W zn+ad1VsnN@B%Kx|Tq8!t#K`X=Gb={sgm*VLHJ-aRDl*ezV|CWMy}najdk5Zd^r^iun-@Vli4AXNvG<7jKUX56vH6zV5doa}{kb7OP+s^}&pvR7@{-#Bj9)eksfLyorOlw2 zAblp~9lV_mH7Fu;B{y+D`zfL&<4NhHeUwv6r>z%l3~C3VmNeO!i3jtam5RBI)yCFp z>B6j}Ni=15<$md~ z!aZ+deLb+E#$$7_x zcoW^n)?#Cep@e~wN4$V121VDSl}U zLU@{`EMtZHs+Tjb8eSvt#p|e|9NxgW4Bjk=K7#vqaL5b3^*0_2 BUbz4O