v0.0.4 release. 修复获取方法参数名错误：'arg0,arg1,argN...'。使用 DefaultParameterNa…

…meDiscoverer 获取正确的参数名。
dustlight-cn · Dec 24, 2020 · 365fbf1 · 365fbf1
1 parent b76cdfb
commit 365fbf1
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>captcha-core</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 </dependency>
 ```
 

diff --git a/captcha-core/pom.xml b/captcha-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>captcha-core</artifactId>

diff --git a/captcha-core/src/main/java/cn/dustlight/captcha/Util.java b/captcha-core/src/main/java/cn/dustlight/captcha/Util.java
@@ -1,25 +1,28 @@
 package cn.dustlight.captcha;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.core.DefaultParameterNameDiscoverer;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class Util {
 
+    private static final DefaultParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
+
     public static <T> T getBean(BeanFactory factory, String name, Class<? extends T> clazz) {
         return factory.getBean(name, clazz);
     }
 
     public static Map<String, Object> getParameters(Method method, Object[] arguments) {
+        String[] names;
+        if (arguments == null || (names = parameterNameDiscoverer.getParameterNames(method)) == null)
+            return Collections.EMPTY_MAP;
         Map<String, Object> parameters = new LinkedHashMap<>();
-        if (method.getParameterCount() > 0) {
-            Parameter[] parameters1 = method.getParameters();
-            for (int i = 0, len = Math.min(arguments.length, parameters1.length); i < len; i++)
-                parameters.put(parameters1[i].getName(), arguments[i]);
-        }
+        for (int i = 0, len = Math.min(names.length, arguments.length); i < len; i++)
+            parameters.put(names[i], arguments[i]);
         return parameters;
     }
 }
diff --git a/extensions/email-sender/README.md b/extensions/email-sender/README.md
@@ -12,7 +12,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>email-sender</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 </dependency>
 ```
 

diff --git a/extensions/email-sender/pom.xml b/extensions/email-sender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>email-sender</artifactId>

diff --git a/extensions/reCAPTCHA/README.md b/extensions/reCAPTCHA/README.md
@@ -13,7 +13,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>recaptcha</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 </dependency>
 ```
 

diff --git a/extensions/reCAPTCHA/pom.xml b/extensions/reCAPTCHA/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>recaptcha</artifactId>

diff --git a/extensions/redis-store/README.md b/extensions/redis-store/README.md
@@ -11,7 +11,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>redis-store</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 </dependency>
 ```
 

diff --git a/extensions/redis-store/pom.xml b/extensions/redis-store/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>redis-store</artifactId>

diff --git a/extensions/tencent-sms/README.md b/extensions/tencent-sms/README.md
@@ -20,7 +20,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>tencent-sms</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
 </dependency>
 ```
 

diff --git a/extensions/tencent-sms/pom.xml b/extensions/tencent-sms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.3</version>
+        <version>0.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>tencent-sms</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>captcha</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <name>captcha</name>
     <description>CAPTCHA service parent project for Spring Boot</description>