调整框架及订单模块

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/enums/DocumentEnum.java

@@ -1,21 +0,0 @@
-package com.tashow.cloud.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 文档地址
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum DocumentEnum {
-
-    REDIS_INSTALL("https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I4VCSJ", "Redis 安装文档"),
-    TENANT("https://doc.iocoder.cn", "SaaS 多租户文档");
-
-    private final String url;
-    private final String memo;
-
-}

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/date/LocalDateTimeUtils.java

@@ -177,6 +177,15 @@ public class LocalDateTimeUtils {
     public static Long between(LocalDateTime dateTime) {
         return LocalDateTimeUtil.between(dateTime, LocalDateTime.now(), ChronoUnit.DAYS);
     }
+    /**
+     * 获取指定日期到现在过了几天，如果指定日期在当前日期之后，获取结果为负
+     *
+     * @param dateTime 日期
+     * @return 相差天数
+     */
+    public static Long betweenWithNow(LocalDateTime dateTime) {
+        return LocalDateTimeUtil.between(dateTime, LocalDateTime.now(), ChronoUnit.SECONDS);
+    }
 
     /**
      * 获取今天的开始时间

tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/SecurityProperties.java

@@ -9,7 +9,7 @@ import jakarta.validation.constraints.NotNull;
 import java.util.Collections;
 import java.util.List;
 
-@ConfigurationProperties(prefix = "yudao.security")
+@ConfigurationProperties(prefix = "tashow.security")
 @Validated
 @Data
 public class SecurityProperties {

tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/WebSecurityConfigurerAdapter.java

@@ -138,7 +138,10 @@ public class WebSecurityConfigurerAdapter {
                     .requestMatchers(HttpMethod.PATCH, permitAllUrls.get(HttpMethod.PATCH).toArray(new String[0])).permitAll()
                     // 1.3 基于 tashow.security.permit-all-urls 无需认证
                     .requestMatchers(securityProperties.getPermitAllUrls().toArray(new String[0])).permitAll()
+
                 )
+                //app-api 不在security控制权限
+                .authorizeHttpRequests(c->c.requestMatchers(webProperties.getAppApi().getPrefix()+"/**").permitAll())
                 // ②：每个项目的自定义规则
                 .authorizeHttpRequests(c -> authorizeRequestsCustomizers.forEach(customizer -> customizer.customize(c)))
                 // ③：兜底规则，必须认证

tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/context/TenantContextHolder.java

@@ -1,7 +1,6 @@
 package com.tashow.cloud.tenant.core.context;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
-import com.tashow.cloud.common.enums.DocumentEnum;
 
 /**
  * 多租户上下文 Holder
@@ -37,8 +36,7 @@ public class TenantContextHolder {
     public static Long getRequiredTenantId() {
         Long tenantId = getTenantId();
         if (tenantId == null) {
-            throw new NullPointerException("TenantContextHolder 不存在租户编号！可参考文档："
-                + DocumentEnum.TENANT.getUrl());
+            throw new NullPointerException("TenantContextHolder 不存在租户编号！");
         }
         return tenantId;
     }

tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/web/config/WebAutoConfiguration.java

@@ -3,7 +3,6 @@ package com.tashow.cloud.web.web.config;
 import com.tashow.cloud.common.enums.WebFilterOrderEnum;
 import com.tashow.cloud.infraapi.api.logger.ApiErrorLogApi;
 import com.tashow.cloud.web.web.core.filter.CacheRequestBodyFilter;
-import com.tashow.cloud.web.web.core.filter.DemoFilter;
 import com.tashow.cloud.web.web.core.handler.GlobalExceptionHandler;
 import com.tashow.cloud.web.web.core.handler.GlobalResponseBodyHandler;
 import com.tashow.cloud.web.web.core.util.WebFrameworkUtils;
@@ -12,7 +11,6 @@ import jakarta.servlet.Filter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -104,15 +102,6 @@ public class WebAutoConfiguration implements WebMvcConfigurer {
         return createFilterBean(new CacheRequestBodyFilter(), WebFilterOrderEnum.REQUEST_BODY_CACHE_FILTER);
     }
 
-    /**
-     * 创建 DemoFilter Bean，演示模式
-     */
-    @Bean
-    @ConditionalOnProperty(value = "yudao.demo", havingValue = "true")
-    public FilterRegistrationBean<DemoFilter> demoFilter() {
-        return createFilterBean(new DemoFilter(), WebFilterOrderEnum.DEMO_FILTER);
-    }
-
     public static <T extends Filter> FilterRegistrationBean<T> createFilterBean(T filter, Integer order) {
         FilterRegistrationBean<T> bean = new FilterRegistrationBean<>(filter);
         bean.setOrder(order);

tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/web/core/filter/DemoFilter.java

@@ -1,35 +0,0 @@
-package com.tashow.cloud.web.web.core.filter;
-
-import cn.hutool.core.util.StrUtil;
-import com.tashow.cloud.common.pojo.CommonResult;
-import com.tashow.cloud.common.util.servlet.ServletUtils;
-import com.tashow.cloud.web.web.core.util.WebFrameworkUtils;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import static com.tashow.cloud.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY;
-
-
-/**
- * 演示 Filter，禁止用户发起写操作，避免影响测试数据
- *
- * @author 芋道源码
- */
-public class DemoFilter extends OncePerRequestFilter {
-
-    @Override
-    protected boolean shouldNotFilter(HttpServletRequest request) {
-        String method = request.getMethod();
-        return !StrUtil.equalsAnyIgnoreCase(method, "POST", "PUT", "DELETE")  // 写操作时，不进行过滤率
-                || WebFrameworkUtils.getLoginUserId(request) == null; // 非登录用户时，不进行过滤
-    }
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) {
-        // 直接返回 DEMO_DENY 的结果。即，请求不继续
-        ServletUtils.writeJSON(response, CommonResult.error(DEMO_DENY));
-    }
-
-}

tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/xss/config/TashowXssAutoConfiguration.java

@@ -22,8 +22,8 @@ import static com.tashow.cloud.web.web.config.WebAutoConfiguration.createFilterB
 
 @AutoConfiguration
 @EnableConfigurationProperties(XssProperties.class)
-@ConditionalOnProperty(prefix = "yudao.xss", name = "enable", havingValue = "true", matchIfMissing = true) // 设置为 false 时，禁用
-public class YudaoXssAutoConfiguration implements WebMvcConfigurer {
+@ConditionalOnProperty(prefix = "tashow.xss", name = "enable", havingValue = "true", matchIfMissing = true) // 设置为 false 时，禁用
+public class TashowXssAutoConfiguration implements WebMvcConfigurer {
 
     /**
      * Xss 清理者

tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/xss/config/XssProperties.java

@@ -12,7 +12,7 @@ import java.util.List;
  *
  * @author 芋道源码
  */
-@ConfigurationProperties(prefix = "yudao.xss")
+@ConfigurationProperties(prefix = "tashow.xss")
 @Validated
 @Data
 public class XssProperties {