Merge branch 'develop' into feature/order

# Conflicts:
#	tashow-module/pom.xml
#	tashow-module/tashow-module-infra/src/main/resources/application-local.yaml

tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java

@@ -11,6 +11,7 @@ public class SystemServerApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SystemServerApplication.class, args);
+        System.out.println("系统启动成功");
     }
 
 }

tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java

@@ -1,14 +1,15 @@
 package com.tashow.cloud.system.controller.admin.sms.vo.log;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
 import com.tashow.cloud.common.pojo.PageParam;
-import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
+import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 /** 管理后台 - 短信日志分页 Request VO */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -27,8 +28,8 @@ public class SmsLogPageReqVO extends PageParam {
   /** 发送状态，参见 SmsSendStatusEnum 枚举类 */
   private Integer sendStatus;
 
-  @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
   /** 发送时间 */
+  @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
   private LocalDateTime[] sendTime;
 
   /** 接收状态，参见 SmsReceiveStatusEnum 枚举类 */

tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/PermissionServiceImpl.java

@@ -240,7 +240,7 @@ public class PermissionServiceImpl implements PermissionService {
     }
 
     @Override
-    @Cacheable(value = RedisKeyConstants.USER_ROLE_ID_LIST, key = "#userId")
+//    @Cacheable(value = RedisKeyConstants.USER_ROLE_ID_LIST, key = "#userId")
     public Set<Long> getUserRoleIdListByUserIdFromCache(Long userId) {
         return getUserRoleIdListByUserId(userId);
     }

tashow-module/tashow-module-system/src/main/resources/application.yaml

@@ -10,7 +10,6 @@ spring:
       - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
       - optional:nacos:application.yaml # 加载【Nacos】通用的配置
       - optional:nacos:tenant.yaml # 加载【Nacos】通用的配置
-      - optional:nacos:application-login.yaml # 加载登录配置
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置