将shortid改为6位
diff --git a/build.gradle b/build.gradle
index 8edfc1c..0445199 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,9 +16,6 @@
repositories {
mavenCentral()
maven {
- url "http://dl.bintray.com/snimavat/maven"
- }
- maven {
url "http://ykt-nx.supwisdom.com/repository/ecard-repo/"
credentials {
username 'ecard'
@@ -57,7 +54,6 @@
compile(
'net.sf.json-lib:json-lib:2.4:jdk15'
)
- compile "me.nimavat:shortid:1.0.1.RC1"
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
implementation 'org.springframework.boot:spring-boot-starter-web'
diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/ShortURLUtil.java b/src/main/java/com/supwisdom/dlpay/framework/util/ShortURLUtil.java
index 46c7586..b9b3a6e 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/util/ShortURLUtil.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/util/ShortURLUtil.java
@@ -2,11 +2,11 @@
import com.supwisdom.dlpay.framework.service.BusinessparaService;
import net.sf.json.JSONObject;
+import org.apache.commons.lang3.RandomStringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import me.nimavat.shortid.ShortId;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -27,7 +27,7 @@
}
public String doGetShortId() {
- return ShortId.generate();
+ return RandomStringUtils.random(6, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
}
public String doGetBaiduShortUrl(String longUrl) {
diff --git a/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
index 30ec5c1..c50a717 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
@@ -193,7 +193,11 @@
val savedTrans = collectdtlService.createNewTransdtl(trans)
//2.将流水号及认证地址返回给终端
//生成短id 将id与认证url的映射存入redis
- val shortId = shortURLUtil.doGetShortId()
+ var shortId: String
+ do{
+ shortId = shortURLUtil.doGetShortId()
+ val hasKey = redisTemplate.hasKey(Constants.REDISKEY_SHORTURL + shortId)
+ }while (hasKey)
redisTemplate.opsForValue().set(Constants.REDISKEY_SHORTURL + shortId, savedTrans.cobillno, 200, TimeUnit.SECONDS)
val url =
businessparaService.findByParakey(WaterBudinessConstants.waterAuthUrl).paraval + shortId