diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/data/CreditCodeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/CreditCodeUtil.java
index 4c88a1adda..709e4cc4f8 100644
--- a/hutool-core/src/main/java/cn/hutool/v7/core/data/CreditCodeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/CreditCodeUtil.java
@@ -128,7 +128,7 @@ public class CreditCodeUtil {
 
 		//
 		for (int i = 0; i < 2; i++) {
-			final int num = RandomUtil.randomInt(BASE_CODE_ARRAY.length - 1);
+			final int num = RandomUtil.randomInt(BASE_CODE_ARRAY.length);
 			buf.append(Character.toUpperCase(BASE_CODE_ARRAY[num]));
 		}
 		for (int i = 2; i < 8; i++) {
@@ -136,7 +136,7 @@ public class CreditCodeUtil {
 			buf.append(BASE_CODE_ARRAY[num]);
 		}
 		for (int i = 8; i < 17; i++) {
-			final int num = RandomUtil.randomInt(BASE_CODE_ARRAY.length - 1);
+			final int num = RandomUtil.randomInt(BASE_CODE_ARRAY.length);
 			buf.append(BASE_CODE_ARRAY[num]);
 		}
 
diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/data/CreditCodeUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/CreditCodeUtilTest.java
index 150d8d0f13..2ddd640666 100644
--- a/hutool-core/src/test/java/cn/hutool/v7/core/data/CreditCodeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/CreditCodeUtilTest.java
@@ -16,7 +16,6 @@
 
 package cn.hutool.v7.core.data;
 
-import cn.hutool.v7.core.data.CreditCodeUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -44,7 +43,9 @@ public class CreditCodeUtilTest {
 
 	@Test
 	public void randomCreditCode() {
-		final String s = CreditCodeUtil.randomCreditCode();
-		Assertions.assertTrue(CreditCodeUtil.isCreditCode(s));
+		for (int i = 0; i < 100; i++) {
+			final String s = CreditCodeUtil.randomCreditCode();
+			Assertions.assertTrue(CreditCodeUtil.isCreditCode(s));
+		}
 	}
 }