1 сар өмнө
parent
commit
b172cfedc3

+ 9 - 9
edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/config/MybatisPlusConfig.java

@@ -14,7 +14,7 @@ import java.sql.Driver;
 @Configuration
 public class MybatisPlusConfig {
     @Bean
-    @ConditionalOnClass(Driver.class)
+//    @ConditionalOnClass(Driver.class)
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
 
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
@@ -22,14 +22,14 @@ public class MybatisPlusConfig {
         interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
         return interceptor;
     }
-    @Bean
-    @ConditionalOnClass(org.postgresql.Driver.class)
-    public MybatisPlusInterceptor plusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new ProjectInterceptor());
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
-        return interceptor;
-    }
+//    @Bean
+//    @ConditionalOnClass(org.postgresql.Driver.class)
+//    public MybatisPlusInterceptor plusInterceptor() {
+//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+//        interceptor.addInnerInterceptor(new ProjectInterceptor());
+//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
+//        return interceptor;
+//    }
 
     @Bean
     public ConfigurationCustomizer configurationCustomizer() {

+ 1 - 1
edu-travel-oauth/src/main/java/edu/travel/config/AuthorizationServer.java

@@ -48,7 +48,7 @@ public class AuthorizationServer extends AuthorizationServerConfigurerAdapter {
     //密码编码器
     @Bean
     public PasswordEncoder passwordEncoder() {
-        return  new BCryptPasswordEncoder();
+        return  NoOpPasswordEncoder.getInstance();
     }
     //ClientDetailsService和AuthorizationCodeServices从数据库读取数据。
     //将客户端信息存储到数据库

+ 0 - 1
edu-travel-oauth/src/main/java/edu/travel/service/impl/UserServiceImpl.java

@@ -62,7 +62,6 @@ public class UserServiceImpl implements UserDetailsService {
         }
 
         List<SysRole> roleList = sysRoleService.getRoleListByUserId(tenant.getId());
-//        request.setAttribute("authorities", roleList);
         Set<String> collect = roleList.stream().map(SysRole::getName).collect(Collectors.toSet());
         String[] arr = new String[collect.size()];
         String[] array = collect.toArray(arr);

+ 1 - 1
edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/config/TokenConfig.java

@@ -21,7 +21,7 @@ public class TokenConfig {
     private String privateKey;
     @Bean
     public PasswordEncoder passwordEncoder(){
-        return new BCryptPasswordEncoder();
+        return NoOpPasswordEncoder.getInstance();
     }
     @Bean
     public TokenStore tokenStore() {