From f6099d382f826e928d38945abf294fc51fb82f8f Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 15:50:16 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=20src/main/java/co/jp/ap?= =?UTF-8?q?p/repository/userRepository.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/jp/app/repository/userRepository.java | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 src/main/java/co/jp/app/repository/userRepository.java diff --git a/src/main/java/co/jp/app/repository/userRepository.java b/src/main/java/co/jp/app/repository/userRepository.java deleted file mode 100644 index a44931d..0000000 --- a/src/main/java/co/jp/app/repository/userRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package co.jp.app.repository; - - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.query.Param; - -import co.jp.app.entity.UserEntity; - -public interface userRepository extends JpaRepository { - - public default UserEntity getByName(@Param("name") String name) { - return getByName(name); - } - - public default UserEntity getByEmail(@Param("email")String email) { - return getByEmail(email); - } -} From b113c43959a22b28de277377718864ebcba7592c Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 15:58:45 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/co/jp/app/service/UserService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index 21d2db1..7af06bd 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -2,7 +2,6 @@ package co.jp.app.service; import java.util.Collection; import java.util.Collections; -import java.util.List; import co.jp.app.dto.RegistrationDto; import co.jp.app.entity.UserEntity; @@ -17,8 +16,6 @@ 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; @Service From b23ba3b92a3a955dcd1db65ece09e6afc83c4d8f Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 15:59:39 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/co/jp/app/service/UserService.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index f5b749d..7af06bd 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -1,15 +1,5 @@ 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; - -======= import java.util.Collection; import java.util.Collections; @@ -27,28 +17,16 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; ->>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6 @Service public class UserService implements UserDetailsService { -<<<<<<< HEAD - private final userRepository userEntityRepository; - - @Autowired - 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 From 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 16:02:18 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/co/jp/app/service/UserService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index 7af06bd..712b1fe 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -33,7 +33,7 @@ public class UserService implements UserDetailsService { public UserEntity registerNewUser(@NotNull RegistrationDto registrationDto) throws Exception { if (userRepository.existsByEmail(registrationDto.getEmail())) { - throw new Exception("エラー:メール:" + registrationDto.getEmail() + " はすでに登録されました。"); + throw new Exception("error: Email" + registrationDto.getEmail() + " had been used"); } UserEntity newUser = new UserEntity(); @@ -50,7 +50,7 @@ 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")); return new User( userEntity.getEmail(), @@ -59,7 +59,7 @@ public class UserService implements UserDetailsService { true, // accountNonExpired true, // credentialsNonExpired true, // accountNonLocked - authorities // 用户的权限集合 + authorities // role ); } } 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 5/7] 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 From 2617b4a5ae33b85f79b06cf497329f7f9bf8887b Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 16:39:08 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=BC=80=E6=94=BE?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/config/security/SecurityConfig.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) 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 131727c..a912e8c 100644 --- a/src/main/java/co/jp/app/config/security/SecurityConfig.java +++ b/src/main/java/co/jp/app/config/security/SecurityConfig.java @@ -21,11 +21,11 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic @Configuration public class SecurityConfig { - private final JwtAuthenticationFilter jwtAuthenticationFilter; + //private final JwtAuthenticationFilter jwtAuthenticationFilter; private final UserDetailsService userDetailsService; public SecurityConfig(@Lazy JwtAuthenticationFilter jwtAuthenticationFilter, @Lazy UserDetailsService userDetailsService) { - this.jwtAuthenticationFilter = jwtAuthenticationFilter; + //this.jwtAuthenticationFilter = jwtAuthenticationFilter; this.userDetailsService = userDetailsService; } @@ -47,16 +47,28 @@ public class SecurityConfig { return authenticationConfiguration.getAuthenticationManager(); } +// @Bean +// public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { +// http.csrf(AbstractHttpConfigurer::disable) +// .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) +// .authorizeHttpRequests(auth -> auth +// .requestMatchers("/api/user/login", "/api/user/register").permitAll() +// .anyRequest().authenticated() +// ) +// .authenticationProvider(authenticationProvider()) +// .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); +// +// return http.build(); +// } + @Bean + //暂时开放所有权限 public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.csrf(AbstractHttpConfigurer::disable) - .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests(auth -> auth - .requestMatchers("/api/user/login", "/api/user/register").permitAll() - .anyRequest().authenticated() - ) - .authenticationProvider(authenticationProvider()) - .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); + .anyRequest().permitAll() + ); return http.build(); } 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 7/7] =?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