Merge remote-tracking branch 'origin/master' into cc_20250903_big_screen

# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java

coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java

@@ -26,6 +26,11 @@ public class CommonConstants {
 
     public static final int NORMAL_LOCK_TIMES = 60 * 1000;
 
+    /**
+     * 短期token过期时间，单位秒
+     */
+    public static final int SHORT_TERM_TOKEN_EXPIRE = 60 * 5;
+
     public static final int AN_HOUR_SECONDS = 3600;
     //十秒
     public static final int TEN_SECONDS = 10000;
@@ -55,6 +60,11 @@ public class CommonConstants {
 
     public static final String ZXJP_MINI_PROGRAM_LOGIN_FLAG = "zxjp_mini_program_login_flag:{0}";
 
+    /**
+     * 小程序短期token key
+     */
+    public static final String ZXJP_MIN_PROGRAM_SHORT_TERM_LOGIN_FLAG = "zxjp_mini_program_short_term_login_flag:{0}";
+
     public static final String ROOT_DEPT_ID_STR = "1";
 
     public static final Integer DEAL_RECORD_MAX_SIZE = 1000;

coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java

@@ -32,6 +32,9 @@ public enum RocketMqGroupEnum {
      */
     FEI_SHU_EVENT_LISTENER("fei_shu_event_listener", new ArrayList<>(Arrays.asList(RocketMqTagEnum.USER_EVENT, RocketMqTagEnum.AUTH_SCOPE_CHANGE, RocketMqTagEnum.DEPT_EVENT))),
 
+
+    STORE_USER_UPDATE("store_user_update",  new ArrayList<>(Arrays.asList(RocketMqTagEnum.STORE_USER_UPDATE)))
+
     ;
 
     private final String group;

coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java

@@ -18,6 +18,7 @@ public enum RocketMqTagEnum {
     ZXJP_CREATE_STORE("zxjp_create_store", "正新鸡排招商创建门店"),
     PARTNER_LICENSE_SYNC_QUEUE("partner_license_sync_queue", "招商证照信息同步"),
     BUSINESS_SYNC("business_sync", "工商食安信息同步"),
+    STORE_USER_UPDATE("store_user_update", "门店信息人员变更同步菜品");
     ;
 
 

coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java

@@ -35,6 +35,7 @@ public class CoolDateUtils {
     public static final String DATE_FORMAT_SEC_6 = "yyyy.MM.dd";
     public static final String DATE_FORMAT_SEC_7 = "yyyy/MM/dd HH:mm";
     public static final String DATE_FORMAT_SEC_8 = "yyyyMMdd";
+    public static final String DATE_FORMAT_SEC_9 = "yyyyMMddHHmmssSSS";
 
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
@@ -70,7 +71,7 @@ public class CoolDateUtils {
     }
 
     public static void main(String[] args) {
-        // 创建一个Date对象
+        //创建一个Date对象
         Date date = new Date();
 
         // 将Date对象转换为LocalDate对象
@@ -146,6 +147,13 @@ public class CoolDateUtils {
         return LocalDate.now().format(DATE_FORMATTER);
     }
 
+    public static final String getTodayMillis(){
+        DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DATE_FORMAT_SEC_9);
+        return LocalDateTime.now().format(DATE_FORMATTER);
+    }
+
+
+
     /**
      * 获取当前日期字符串 (yyyy-MM-dd)
      */

coolstore-partner-common/src/main/java/com/cool/store/utils/SignatureUtils.java

@@ -62,6 +62,8 @@ public class SignatureUtils {
                 .add(timeStamp)
                 .add(random)
                 .toString();
+
+        log.info("plainText:{}",plainText);
         // 签名算法
         Signature signature = Signature.getInstance("SHA256WithRSA");