Merge branch 'master' into dev/feat/partner1.6_20231226

This commit is contained in:
feng.li
2024-01-02 19:03:01 +08:00

View File

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