suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/fix/partner1.5.3_20240103' into pre

Browse Source 
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java
This commit is contained in:
feng.li
2024-01-02 16:44:13 +08:00
parent a3070b0551 f430a79d63
commit 450a307f9b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java
View File

@@ -12,6 +12,8 @@ import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
import java.util.regex.Pattern;
import static com.cool.store.utils.CoolDateUtils.DATE_FORMAT_SEC;
/**
* @author zhangchenbiao
* @FileName: AesUtil
@@ -258,7 +260,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils {
//YYYY-MM-DD HH:mm:ss 转换成yyyyMMddHHmmss
//使用 YYMMDD 是错误的
//String format = DateUtil.format(DateUtil.parse(dateTime, "YYYY-MM-dd HH:mm:ss"), "YYMMDD");
String format = DateUtil.format(DateUtil.parse(dateTime, "yyyy-MM-dd HH:mm:ss"), "yyMMdd");
String format = DateUtil.format(DateUtil.parse(dateTime, DATE_FORMAT_SEC), "yyMMdd");
String numbers = RandomUtil.randomNumbers(4);
return format + numbers;
}