aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/3.0' into test/stable

Browse Source 
# Conflicts:
#	src/main/resources/application-prod.properties
This commit is contained in:
xupei
2024-01-30 10:50:18 +08:00
parent 533b54a768 33a096e382
commit 02d65b4fb2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker-compose.yml
View File

@@ -1,10 +1,10 @@
version: "3" version: "3"
services: services:
aida_back: aida_back:
container_name: stable-version-aida-back container_name: prod-version-aida-back
build: . build: .
# volumes: volumes:
# # 数据挂载 # 日志目录映射
# - /workspace/home/aida/file/:/workspace/home/aida/file/ - ./log:/log
ports: ports:
- "10086:5567" - "10010:5567"

3
src/main/resources/application-prod.properties
View File

@@ -1,10 +1,11 @@
server.port=5566 server.port=5567
#datasource #datasource
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true spring.datasource.url=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=QWa998345 spring.datasource.password=QWa998345
#spring.datasource.password=QWa998345
#security #security
spring.security.jwtSecret=JWTSECRET spring.security.jwtSecret=JWTSECRET