From 342bdd2e38ef3e2f629d9ff430fbfaca7532f4f2 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Mon, 4 Aug 2025 18:14:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90issues/8666=E3=80=91=E5=8D=87?= =?UTF-8?q?=E7=BA=A7mybatisPlus=E5=90=8ESqlServer=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E4=BD=BF=E7=94=A8OFFSET=20=EF=BC=9F=20ROWS=20FETCH=20NEXT=20?= =?UTF-8?q?=EF=BC=9F=20ROWS=20ONLY=EF=BC=8C=E6=97=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E5=AF=BC=E8=87=B4online?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index fbfe31a53..fc5b13c48 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -256,7 +256,7 @@ org.jeecgframework.boot hibernate-re - 3.8.2-GA + 3.8.2 From a760f94b94985534274d16ccb278b562cddb329d Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Thu, 7 Aug 2025 13:51:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3pgvector=E5=90=91?= =?UTF-8?q?=E9=87=8F=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?2000=E7=BB=B4=E5=BA=A6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml index 4476b2e12..97145e7bc 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml +++ b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml @@ -151,9 +151,9 @@ - dev.langchain4j + org.jeecgframework langchain4j-pgvector - ${langchain4j.version} + 0.35.0 From 781d61e96e8be649190ecbac3f020326d2a427ef Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Thu, 7 Aug 2025 18:02:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?swagger=E8=AF=B7=E6=B1=82=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E6=B2=A1=E6=9C=89X-Access-Token=20#8676?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/config/Swagger3Config.java | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java index 2410db456..1878b5827 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java @@ -60,29 +60,29 @@ public class Swagger3Config implements WebMvcConfigurer { return method -> method.isAnnotationPresent(Operation.class); } - //TODO 暂时注释掉，for：【issues/8638】springboot3分支，knife4j不能正确显示文档，但是swagger-ui和v3/api-docs正常 #8638 -// @Bean -// public GlobalOpenApiCustomizer globalOpenApiCustomizer() { -// return openApi -> { -// // 全局添加鉴权参数 -// if (openApi.getPaths() != null) { -// openApi.getPaths().forEach((path, pathItem) -> { -// //log.debug("path: {}", path); -// // 检查当前路径是否在排除列表中 -// boolean isExcluded = excludedPaths.stream().anyMatch( -// excludedPath -> excludedPath.equals(path) || (excludedPath.endsWith("**") && path.startsWith(excludedPath.substring(0, excludedPath.length() - 2))) -// ); -// -// if (!isExcluded) { -// // 接口添加鉴权参数 -// pathItem.readOperations().forEach(operation -> -// operation.addSecurityItem(new SecurityRequirement().addList(CommonConstant.X_ACCESS_TOKEN)) -// ); -// } -// }); -// } -// }; -// } + @Bean + public GlobalOpenApiCustomizer globalOpenApiCustomizer() { + return openApi -> { + // 全局添加鉴权参数 + if (openApi.getPaths() != null) { + openApi.getPaths().forEach((path, pathItem) -> { + //log.info("path: {}", path); + // 检查当前路径是否在排除列表中 + boolean isExcluded = excludedPaths.stream().anyMatch( + excludedPath -> excludedPath.equals(path) || (excludedPath.endsWith("**") && path.startsWith(excludedPath.substring(0, excludedPath.length() - 2))) + ); + + if (!isExcluded) { + //log.info(" 接口添加默认X_ACCESS_TOKEN: {}", path); + // 接口添加鉴权参数 + pathItem.readOperations().forEach(operation -> + operation.addSecurityItem(new SecurityRequirement().addList(CommonConstant.X_ACCESS_TOKEN)) + ); + } + }); + } + }; + } @Bean public OpenAPI customOpenAPI() { @@ -91,11 +91,15 @@ public class Swagger3Config implements WebMvcConfigurer { .title("JeecgBoot 后台服务API接口文档") .version("3.8.1") .contact(new Contact().name("北京国炬信息技术有限公司").url("www.jeccg.com").email("jeecgos@163.com")) - .description( "后台API接口") + .description("后台API接口") .termsOfService("NO terms of service") .license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html"))) .addSecurityItem(new SecurityRequirement().addList(CommonConstant.X_ACCESS_TOKEN)) .components(new Components().addSecuritySchemes(CommonConstant.X_ACCESS_TOKEN, - new SecurityScheme().name(CommonConstant.X_ACCESS_TOKEN).type(SecurityScheme.Type.HTTP))); + new SecurityScheme() + .name(CommonConstant.X_ACCESS_TOKEN) + .type(SecurityScheme.Type.APIKEY) + .in(SecurityScheme.In.HEADER) // 关键：指定为 header + )); } } \ No newline at end of file