feat & fix

feat: add password encoder fix: fix feign invoking with @RequestParam and parameter `value` is required in @PathVariable https://juejin.cn/post/6927469495132880903 https://blog.csdn.net/haishiyizhenfeng/article/details/80607003 https://zhuanlan.zhihu.com/p/162909888

Author: Zeemann Lin

activity/src/main/java/com/example/activity/api/ProviderApi.java

@@ -4,17 +4,18 @@
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 public interface ProviderApi {
  @GetMapping("/provider")
  ResponseResult provider();
 
- @GetMapping("/mysqlTest")
- ResponseResult mysqlTest();
+ @GetMapping("/insert")
+ ResponseResult insert();
 
- @GetMapping("/pageSearch")
- ResponseResult pageSelect();
+ @GetMapping("/listPage")
+ ResponseResult pageSelect(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize);
 
  @DeleteMapping("/delete/{id}")
- ResponseResult mysqlDelete(@PathVariable Long id);
+ ResponseResult mysqlDelete(@PathVariable(value = "id") Long id);
 }

activity/src/main/java/com/example/activity/config/MybatisPlusConfig.java

@@ -18,5 +18,5 @@ public MybatisPlusInterceptor mybatisPlusInterceptor() {
  interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
  return interceptor;
  }
- 
+
 }

activity/src/main/java/com/example/activity/controller/ProviderController.java

@@ -7,13 +7,15 @@
 import com.example.common.response.ResponseResult;
 import com.example.common.response.code.ErrorCode;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 
 @RestController
 @RequiredArgsConstructor
+@Slf4j
 public class ProviderController implements ProviderApi {
 
  private final UserInfoMapper userInfoMapper;
@@ -30,20 +32,24 @@ public ResponseResult provider(){
  }
 
  @Override
- public ResponseResult mysqlTest() {
- return ResponseResult.success(userInfoMapper.selectList(null));
+ public ResponseResult insert() {
+ UserInfo userInfo = new UserInfo();
+ userInfo.setUsername("aaaaaa");
+ userInfo.setPassword("asassasd");
+ userInfoMapper.insert(userInfo);
+ return ResponseResult.success();
  }
 
  @Override
- public ResponseResult pageSelect() {
- Page<UserInfo> page = new Page<>(1, 10);
- userInfoMapper.selectPage(page,null);
- return ResponseResult.success(page.getRecords());
+ public ResponseResult pageSelect(Integer pageNo, Integer pageSize) {
+ Page<UserInfo> page = new Page<>(pageNo, pageSize);
+ userInfoMapper.selectPage(page, null);
+ return ResponseResult.success(page);
 
  }
 
  @Override
- public ResponseResult mysqlDelete(@PathVariable Long id) {
+ public ResponseResult mysqlDelete(Long id) {
  int status = userInfoMapper.deleteById(id);
  if(status == 1){
  return ResponseResult.success();

auth/pom.xml

@@ -55,6 +55,16 @@
  <artifactId>spring-cloud-loadbalancer</artifactId>
  </dependency>
 
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-oauth2</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ </dependency>
+
  <dependency>
  <groupId>org.springframework.cloud</groupId>
  <artifactId>spring-cloud-starter-bootstrap</artifactId>

common/pom.xml

@@ -23,6 +23,14 @@
  <groupId>com.fasterxml.jackson.core</groupId>
  <artifactId>jackson-databind</artifactId>
  </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ </dependency>
 
  </dependencies>
 

common/src/main/java/com/example/common/config/PasswordEncoderConfig.java

@@ -0,0 +1,14 @@
+package com.example.common.config;
+
+import com.example.common.utils.PasswordEncoderUtil;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+public class PasswordEncoderConfig {
+ @Bean
+ @ConditionalOnMissingBean
+ public PasswordEncoder passwordEncoder(){
+ return PasswordEncoderUtil.getDelegatingPasswordEncoder("bcrypt");
+ }
+}

common/src/main/java/com/example/common/utils/PasswordEncoderUtil.java

@@ -0,0 +1,32 @@
+package com.example.common.utils;
+
+import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
+import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
+import org.springframework.util.Assert;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * List of password encoders
+ * @author ZELIN7
+ */
+public class PasswordEncoderUtil {
+ public static PasswordEncoder getDelegatingPasswordEncoder(String encodingId) {
+ Map<String, PasswordEncoder> encoders = new HashMap<>();
+ encoders.put("bcrypt", new BCryptPasswordEncoder());
+ encoders.put("pbkdf2", new Pbkdf2PasswordEncoder());
+ encoders.put("scrypt", new SCryptPasswordEncoder());
+ encoders.put("argon2", new Argon2PasswordEncoder());
+
+ Assert.isTrue(encoders.containsKey(encodingId), encodingId + " is not found in idToPasswordEncoder");
+
+ DelegatingPasswordEncoder delegatingPasswordEncoder = new DelegatingPasswordEncoder(encodingId, encoders);
+ delegatingPasswordEncoder.setDefaultPasswordEncoderForMatches(encoders.get(encodingId));
+ return delegatingPasswordEncoder;
+ }
+}

pom.xml

@@ -26,6 +26,9 @@
  <lombok.version>1.18.22</lombok.version>
  <mysql.version>8.0.29</mysql.version>
  <hutool.version>5.8.15</hutool.version>
+ <security-oauth2.version>2.2.5.RELEASE</security-oauth2.version>
+ <security-core.version>5.7.5</security-core.version>
+ <autoconfigure.version>2.6.3</autoconfigure.version>
  </properties>
 
 
@@ -82,6 +85,21 @@
  <artifactId>mysql-connector-java</artifactId>
  <version>${mysql.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-oauth2</artifactId>
+ <version>${security-oauth2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ <version>${autoconfigure.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${security-core.version}</version>
+ </dependency>
  </dependencies>
  </dependencyManagement>