Преглед изворни кода

fix: 修复数据源配置和 JAR 打包问题

- 移除 maven-jar-plugin 的 application.properties 排除配置
- 将数据源配置从 Druid 格式改为标准 HikariCP 格式
- 添加 PostgreSQL 驱动和 spring-boot-starter-jdbc 依赖
- 支持环境变量配置数据库连接参数
何文松 пре 1 месец
родитељ
комит
2e0ece8490

+ 13 - 12
backend/lingyue-starter/pom.xml

@@ -92,6 +92,18 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+        <!-- PostgreSQL Driver -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
+        <!-- Spring Boot JDBC -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+
         <!-- Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -137,18 +149,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/logback.xml</exclude>
-                        <exclude>**/application*.yml</exclude>
-                        <exclude>**/application*.properties</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
+            <!-- 移除了 maven-jar-plugin 的排除配置,确保 application.properties 被打包 -->
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>

+ 27 - 15
backend/lingyue-starter/src/main/resources/application.properties

@@ -118,20 +118,32 @@ spring.autoconfigure.exclude=\
   org.springdoc.core.configuration.SpringDocConfiguration,\
   org.springdoc.webmvc.ui.SwaggerConfig
 
-# 数据库配置
-spring.datasource.druid.url=jdbc:postgresql://localhost:5432/lingyue_zhibao
-spring.datasource.druid.username=lingyue
-spring.datasource.druid.password=123123
-
-# Redis配置
-spring.data.redis.host=localhost
-spring.data.redis.port=6379
+# ============================================
+# 数据库配置(使用标准 HikariCP)
+# ============================================
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:lingyue_zhibao}
+spring.datasource.username=${DB_USERNAME:lingyue}
+spring.datasource.password=${DB_PASSWORD:123123}
+
+# HikariCP 连接池配置
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=30000
 
-# RabbitMQ配置
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=admin
-spring.rabbitmq.password=admin123
+# ============================================
+# Redis 配置
+# ============================================
+spring.data.redis.host=${REDIS_HOST:localhost}
+spring.data.redis.port=${REDIS_PORT:6379}
+spring.data.redis.password=${REDIS_PASSWORD:}
 
-# JWT配置
-jwt.secret=your-jwt-secret-key
+# ============================================
+# RabbitMQ 配置
+# ============================================
+spring.rabbitmq.host=${RABBITMQ_HOST:localhost}
+spring.rabbitmq.port=${RABBITMQ_PORT:5672}
+spring.rabbitmq.username=${RABBITMQ_USERNAME:admin}
+spring.rabbitmq.password=${RABBITMQ_PASSWORD:admin123}