diff --git a/pom.xml b/pom.xml index 37a83ae..5ac4035 100644 --- a/pom.xml +++ b/pom.xml @@ -389,6 +389,14 @@ ${skipITs} + + + + integration-test + verify + + + diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index bb8dfc8..c972e8e 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -61,6 +61,7 @@ public class MybatisPlusConfig { } } // return getLoginUserTenantId(); + // 兜底租户：仅供未携带 TenantId/Domain 头的内部调用；审批请求必须由客户端显式携带租户头。 return new LongValue(10150); } diff --git a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java index f8ebadc..095aec8 100644 --- a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java @@ -35,6 +35,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { http.authorizeRequests() .antMatchers(HttpMethod.OPTIONS, "/**") .permitAll() + // 审批接口必须登录；方法级 @PreAuthorize 再校验具体权限 + .antMatchers("/api/approval/**") + .authenticated() .antMatchers(HttpMethod.GET, "/api/file/**","/**", "/api/captcha", "/") .permitAll() .antMatchers( diff --git a/src/test/java/com/gxwebsoft/generator/BookingGenerator.java b/tools/codegen/BookingGenerator.java similarity index 100% rename from src/test/java/com/gxwebsoft/generator/BookingGenerator.java rename to tools/codegen/BookingGenerator.java diff --git a/src/test/java/com/gxwebsoft/generator/CmsGenerator.java b/tools/codegen/CmsGenerator.java similarity index 100% rename from src/test/java/com/gxwebsoft/generator/CmsGenerator.java rename to tools/codegen/CmsGenerator.java diff --git a/src/test/java/com/gxwebsoft/generator/OaGenerator.java b/tools/codegen/OaGenerator.java similarity index 100% rename from src/test/java/com/gxwebsoft/generator/OaGenerator.java rename to tools/codegen/OaGenerator.java diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/tools/codegen/ShopGenerator.java similarity index 100% rename from src/test/java/com/gxwebsoft/generator/ShopGenerator.java rename to tools/codegen/ShopGenerator.java diff --git a/src/test/java/com/gxwebsoft/generator/SysGenerator.java b/tools/codegen/SysGenerator.java similarity index 100% rename from src/test/java/com/gxwebsoft/generator/SysGenerator.java rename to tools/codegen/SysGenerator.java diff --git a/src/test/java/com/gxwebsoft/generator/ThinkGenerator.java b/tools/codegen/ThinkGenerator.java similarity index 100% rename from src/test/java/com/gxwebsoft/generator/ThinkGenerator.java rename to tools/codegen/ThinkGenerator.java diff --git a/src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java b/tools/codegen/engine/BeetlTemplateEnginePlus.java similarity index 100% rename from src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java rename to tools/codegen/engine/BeetlTemplateEnginePlus.java diff --git a/src/test/java/com/gxwebsoft/generator/templates/components.edit.vue.btl b/tools/codegen/templates/components.edit.vue.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/components.edit.vue.btl rename to tools/codegen/templates/components.edit.vue.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/components.search.vue.btl b/tools/codegen/templates/components.search.vue.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/components.search.vue.btl rename to tools/codegen/templates/components.search.vue.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl b/tools/codegen/templates/controller.java.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/controller.java.btl rename to tools/codegen/templates/controller.java.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl b/tools/codegen/templates/entity.java.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/entity.java.btl rename to tools/codegen/templates/entity.java.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/index.ts.btl b/tools/codegen/templates/index.ts.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/index.ts.btl rename to tools/codegen/templates/index.ts.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl b/tools/codegen/templates/index.vue.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/index.vue.btl rename to tools/codegen/templates/index.vue.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl b/tools/codegen/templates/mapper.java.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl rename to tools/codegen/templates/mapper.java.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl b/tools/codegen/templates/mapper.xml.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl rename to tools/codegen/templates/mapper.xml.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/model.ts.btl b/tools/codegen/templates/model.ts.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/model.ts.btl rename to tools/codegen/templates/model.ts.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/param.java.btl b/tools/codegen/templates/param.java.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/param.java.btl rename to tools/codegen/templates/param.java.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/service.java.btl b/tools/codegen/templates/service.java.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/service.java.btl rename to tools/codegen/templates/service.java.btl diff --git a/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl b/tools/codegen/templates/serviceImpl.java.btl similarity index 100% rename from src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl rename to tools/codegen/templates/serviceImpl.java.btl