diff --git a/Jenkinsfile b/Jenkinsfile index 51921b2..94e0c61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -192,8 +192,8 @@ services: - "30001:30001" environment: - server.port=30001 - - spring.cloud.nacos.discovery.server-addr=nacos-server:8848 - - spring.cloud.nacos.config.server-addr=nacos-server:8848 + - spring.cloud.nacos.discovery.server-addr=nacos:8848 + - spring.cloud.nacos.config.server-addr=nacos:8848 - spring.datasource.url=jdbc:mysql://host.docker.internal:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj @@ -212,8 +212,8 @@ services: - "30002:30002" environment: - server.port=30002 - - spring.cloud.nacos.discovery.server-addr=nacos-server:8848 - - spring.cloud.nacos.config.server-addr=nacos-server:8848 + - spring.cloud.nacos.discovery.server-addr=nacos:8848 + - spring.cloud.nacos.config.server-addr=nacos:8848 - spring.datasource.url=jdbc:mysql://host.docker.internal:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj @@ -231,8 +231,8 @@ services: - "30003:30003" environment: - server.port=30003 - - spring.cloud.nacos.discovery.server-addr=nacos-server:8848 - - spring.cloud.nacos.config.server-addr=nacos-server:8848 + - spring.cloud.nacos.discovery.server-addr=nacos:8848 + - spring.cloud.nacos.config.server-addr=nacos:8848 - spring.datasource.url=jdbc:mysql://host.docker.internal:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj @@ -253,8 +253,8 @@ services: - "33333:30000" environment: - server.port=30000 - - spring.cloud.nacos.discovery.server-addr=nacos-server:8848 - - spring.cloud.nacos.config.server-addr=nacos-server:8848 + - spring.cloud.nacos.discovery.server-addr=nacos:8848 + - spring.cloud.nacos.config.server-addr=nacos:8848 - spring.cloud.gateway.routes[0].id=story-service - spring.cloud.gateway.routes[0].uri=lb://timeline-story - spring.cloud.gateway.routes[0].predicates[0]=Path=/story/** diff --git a/timeline-file-service/src/main/resources/application.properties b/timeline-file-service/src/main/resources/application.properties index 02aa80c..4ea0188 100644 --- a/timeline-file-service/src/main/resources/application.properties +++ b/timeline-file-service/src/main/resources/application.properties @@ -4,13 +4,13 @@ spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC spring.datasource.username=root spring.datasource.password=WoCloud@9ol7uj spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -# MinIO 配置 +# MinIO 配置 minio.endpoint=http://59.80.22.43:9000 minio.accessKey=9ttSGjvQxek2uKKlhpqI minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex minio.bucketName=timeline-test -# MyBatis 配置 +# MyBatis 配置 mybatis.mapper-locations=classpath:mapper/*.xml mybatis.type-aliases-package=com.timeline.file.entity @@ -22,7 +22,7 @@ spring.servlet.multipart.enabled=true spring.servlet.multipart.max-file-size=1000MB spring.servlet.multipart.max-request-size=1000MB -# Nacos配置 - 这些配置将被环境变量覆盖，但保留作为备用 +# Nacos配置 - 这些配置将被环境变量覆盖，但保留作为备用 #spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848} #spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} diff --git a/timeline-gateway-service/src/main/resources/application.properties b/timeline-gateway-service/src/main/resources/application.properties index 6264825..a435c95 100644 --- a/timeline-gateway-service/src/main/resources/application.properties +++ b/timeline-gateway-service/src/main/resources/application.properties @@ -5,7 +5,7 @@ server.port=30000 # Nacos配置 - 这些配置将被环境变量覆盖，但保留作为备用 #spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848} -#spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} +#spring.cloud.nacos.config.enabled=false # 使用Nacos服务发现进行路由 spring.cloud.gateway.routes[0].id=story-service diff --git a/timeline-story-service/src/main/resources/application.properties b/timeline-story-service/src/main/resources/application.properties index df1ca42..72f48a6 100644 --- a/timeline-story-service/src/main/resources/application.properties +++ b/timeline-story-service/src/main/resources/application.properties @@ -4,7 +4,7 @@ spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC spring.datasource.username=root spring.datasource.password=WoCloud@9ol7uj spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -# MyBatis 配置 +# MyBatis 配置 mybatis.configuration.log4j=true server.port=30001 spring.web.mvc.use-trailing-slash=true @@ -15,7 +15,7 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl logging.level.com.timeline.user.dao=DEBUG logging.level.org.mybatis=DEBUG -# LocalDateTime 序列化配置 +# LocalDateTime 序列化配置 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=UTC @@ -28,7 +28,7 @@ spring.data.redis.port=36379 spring.data.redis.password=123456 spring.data.redis.timeout=5000 -# Nacos配置 - 这些配置将被环境变量覆盖，但保留作为备用 +# Nacos配置 - 这些配置将被环境变量覆盖，但保留作为备用 #spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848} #spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} diff --git a/timeline-story-service/src/main/resources/bootstrap.properties b/timeline-story-service/src/main/resources/bootstrap.properties index fe09b66..56ca45f 100644 --- a/timeline-story-service/src/main/resources/bootstrap.properties +++ b/timeline-story-service/src/main/resources/bootstrap.properties @@ -1,6 +1,6 @@ # Nacos配置 spring.config.import=optional:nacos: -spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848} +spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:59.80.22.43:8848} spring.cloud.nacos.discovery.namespace=public spring.cloud.nacos.discovery.group=DEFAULT_GROUP @@ -10,7 +10,8 @@ spring.cloud.nacos.config.namespace=${spring.cloud.nacos.discovery.namespace} spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group} spring.cloud.nacos.config.file-extension=properties -# 如果需要从Nacos配置中心加载配置文件，取消下面的注释 +# 如果需要从Nacos配置中心加载配置文件，取下面的注释 spring.cloud.nacos.config.shared-configs[0].data-id=timeline-story.properties spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP -spring.cloud.nacos.config.shared-configs[0].refresh=true \ No newline at end of file +spring.cloud.nacos.config.shared-configs[0].refresh=true +# 只保留服务端状态，如果使用配置中心 diff --git a/timeline-user-service/src/main/resources/application.properties b/timeline-user-service/src/main/resources/application.properties index 7ff2834..cdcd520 100644 --- a/timeline-user-service/src/main/resources/application.properties +++ b/timeline-user-service/src/main/resources/application.properties @@ -2,13 +2,13 @@ spring.config.import=optional:nacos: spring.application.name=timeline-user server.port=30003 -# 数据库配置 +# 数据库配置 spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=WoCloud@9ol7uj spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -# MyBatis 配置 +# MyBatis 配置 mybatis.mapper-locations=classpath:mapper/*.xml mybatis.type-aliases-package=com.timeline.user.entity mybatis.configuration.mapUnderscoreToCamelCase=true @@ -16,35 +16,35 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl logging.level.com.timeline.user.dao=DEBUG logging.level.org.mybatis=DEBUG -# JWT 配置 +# JWT 配置 jwt.secret=6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a -# Access Token 过期时间（秒），默认15分钟 +# Access Token 过期时间（秒），默认15分钟 jwt.access-expiration=900 -# Refresh Token 过期时间（秒），默认7天 +# Refresh Token 过期时间（秒），默认7天 jwt.refresh-expiration=604800 -# 日志配置 +# 日志配置 logging.level.com.timeline.user=DEBUG -# Redis (本地默认配置，按需调整) +# Redis (本地默认配置，按需调整) spring.data.redis.host=127.0.0.1 spring.data.redis.port=36379 spring.data.redis.password=123456 spring.data.redis.timeout=5000 -# Nacos配置 - 这些配置将被环境变量覆盖，但保留作为备用 +# Nacos配置 - 这些配置将被环境变量覆盖，但保留作ä¸å¤‡ç”¨ #spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848} #spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} -# 连接池 +# 连接池 spring.datasource.hikari.maximum-pool-size=10 spring.datasource.hikari.minimum-idle=2 spring.datasource.hikari.idle-timeout=300000 -# 5分钟，低于 wait_timeout +# 5分钟，低于 wait_timeout spring.datasource.hikari.max-lifetime=1800000 -# 30分钟，低于 MySQL wait_timeout（默认8小时） +# 30分钟，低于 MySQL wait_timeout（默认8小时） spring.datasource.hikari.connection-timeout=30000 -# 获取连接超时 +# 获取连接超时 spring.datasource.hikari.keepalive-time=0 -# 如 MySQL wait_timeout 较短，可设 180000(3分钟) +# 如 MySQL wait_timeout 较短，可设 180000(3分钟) spring.datasource.hikari.validation-timeout=5000 \ No newline at end of file