pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-01-03 20:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

【合并v3.8.2 docker-compose优化配置】

Browse Source 
Merge remote-tracking branch 'origin/master' into springboot3

# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/pom.xml
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
#	jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile
#	jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
#	jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
#	jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
#	jeecg-boot/pom.xml
This commit is contained in:
JEECG
2025-08-01 10:54:33 +08:00
parent e00ffa2670 676fffa2c8
commit e70844ce61
8 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiController.java
View File

@ -382,7 +382,7 @@ public class OpenApiController extends JeecgController<OpenApi, OpenApiService>
SwaggerInfo info = new SwaggerInfo();
info.setDescription("OpenAPI 接口列表");
info.setVersion("3.8.1");
info.setVersion("3.8.2");
info.setTitle("OpenAPI 接口列表");
info.setTermsOfService("https://jeecg.com");

2
jeecg-boot/jeecg-module-system/jeecg-system-start/Dockerfile
View File

@ -13,4 +13,4 @@ EXPOSE 8080
#ADD ./src/main/resources/jeecg ./config/jeecg
ADD ./target/jeecg-system-start-3.8.2.jar ./
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.8.2.jar
CMD sleep 60;java -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.8.2.jar

4
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-docker.yml
View File

@ -197,9 +197,9 @@ jeecg:
# AIRag向量库
ai-rag:
embed-store:
host: 127.0.0.1
host: jeecg-boot-pgvector
port: 5432
database: postgres
database: vector_db
user: postgres
password: postgres
table: embeddings