fix密码加密修改

edu-travel-common/edu-travel-common-datasource/pom.xml

@@ -21,6 +21,12 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

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

@@ -3,28 +3,35 @@ package edu.travel.config;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import edu.travel.datasource.ProjectInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.sql.Driver;
+
 @Configuration
 public class MybatisPlusConfig {
     @Bean
+    @ConditionalOnClass(Driver.class)
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
 
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         interceptor.addInnerInterceptor(new ProjectInterceptor());
         interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-//        interceptor.addInnerInterceptor(new QueryInterceptor2());
-//        interceptor.addInnerInterceptor(new QueryInterceptor3());
-//        interceptor.addInnerInterceptor(new QueryInterceptor4());
-//        interceptor.addInnerInterceptor(new QueryInterceptor5());
-//        interceptor.addInnerInterceptor(new QueryInterceptor6());
         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() {
         return configuration -> configuration.setUseDeprecatedExecutor(false);
     }

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

@@ -1,6 +1,5 @@
 package edu.travel.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import edu.travel.entity.EduTenant;
@@ -8,15 +7,12 @@ import edu.travel.entity.SysRole;
 import edu.travel.mapper.EduTenantMapper;
 import edu.travel.service.SysRoleService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.core.GrantedAuthority;
 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 org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -35,8 +31,6 @@ public class UserServiceImpl implements UserDetailsService {
     private RedisTemplate redisTemplate;
     @Autowired
     private SysRoleService sysRoleService;
-    @Autowired
-    private PasswordEncoder passwordEncoder;
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         if (StringUtils.isBlank(username)) {
@@ -62,13 +56,13 @@ public class UserServiceImpl implements UserDetailsService {
             if (code.equals(object.toString())){
                 redisTemplate.opsForValue().set(username+"_info", JSON.toJSONString(tenant));
 
-                return new User(tenant.getTenantPhone(),passwordEncoder.encode(code),new ArrayList<>() );
+                return new User(tenant.getTenantPhone(),code,new ArrayList<>() );
             }
             throw new UsernameNotFoundException("验证码错误");
         }
 
         List<SysRole> roleList = sysRoleService.getRoleListByUserId(tenant.getId());
-        request.setAttribute("authorities", roleList);
+//        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);

edu-travel-oauth/src/test/java/Pass.java

@@ -0,0 +1,8 @@
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+public class Pass {
+    public static void main(String[] args) {
+        String encode = new BCryptPasswordEncoder().encode("123456789");
+        System.out.println(encode);
+    }
+}