diff --git a/.gitignore b/.gitignore index 55067e4..fed4971 100644 --- a/.gitignore +++ b/.gitignore @@ -40,17 +40,8 @@ logs/ *~.nib *.cache -# ==================== 配置文件(敏感信息)==================== -# 配置文件包含敏感信息,不提交到仓库 -application.yml -application-dev.yml -application-test.yml -application-prod.yml -bootstrap.yml - -# 实际配置文件(敏感信息,仅模板提交) -scripts/env.properties -worklog-api/src/main/resources/service.properties +# ==================== 配置文件 ==================== +# 本地私有仓库,配置文件可直接提交 # 数据库备份 *.sql.backup diff --git a/application-dev.yml.example b/application-dev.yml.example deleted file mode 100644 index 1b17f9b..0000000 --- a/application-dev.yml.example +++ /dev/null @@ -1,125 +0,0 @@ -# ==================================================== -# 工作日志服务平台 - 开发环境配置文件 -# ==================================================== -# 说明: -# 1. 复制本文件为 application-dev.yml -# 2. 根据本地实际环境修改配置 -# 3. 不要将 application-dev.yml 提交到代码仓库 -# ==================================================== - -server: - port: 8080 - servlet: - context-path: / - -spring: - application: - name: worklog-api - - # 环境配置 - profiles: - active: dev - - # 数据源配置 - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/worklog?useUnicode=true&characterEncoding=utf8mb4&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true - username: worklog - password: Wlog@123 - type: com.zaxxer.hikari.HikariDataSource - hikari: - minimum-idle: 5 - maximum-pool-size: 20 - auto-commit: true - idle-timeout: 600000 - max-lifetime: 1800000 - connection-timeout: 30000 - connection-test-query: SELECT 1 - - # Redis 配置 - data: - redis: - host: localhost - port: 6379 - password: zjf@123456 - database: 0 - timeout: 5000ms - lettuce: - pool: - max-active: 8 - max-wait: -1ms - max-idle: 8 - min-idle: 0 - - # Nacos 配置(在 bootstrap.yml 中配置) - cloud: - nacos: - discovery: - server-addr: localhost:8848 - username: nacos - password: nacos - namespace: worklog-dev - group: DEFAULT_GROUP - config: - server-addr: localhost:8848 - username: nacos - password: nacos - namespace: worklog-dev - file-extension: yml - group: DEFAULT_GROUP - -# MyBatis-Plus 配置 -mybatis-plus: - configuration: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl - global-config: - db-config: - id-type: ASSIGN_ID - logic-delete-field: deleted - logic-delete-value: 1 - logic-not-delete-value: 0 - mapper-locations: classpath*:/mapper/**/*.xml - type-aliases-package: com.wjbl.worklog.data.entity - -# 日志配置 -logging: - level: - root: INFO - com.wjbl.worklog: DEBUG - com.baomidou.mybatisplus: DEBUG - com.wjbl.worklog.data.mapper: DEBUG - file: - path: ./logs - pattern: - console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId:-}][%X{spanId:-}] %-5level %logger{50} - %msg%n' - file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId:-}][%X{spanId:-}] %-5level %logger{50} - %msg%n' - -# 腾讯云 COS 配置(可选,用于文件上传功能) -tencent: - cos: - enabled: false # 开发环境可以不启用 - app-id: 1308258046 - secret-id: AKIDukKfkY5LK2SbU6QTM7csugCSSDjzyiDS - secret-key: 0lHXYIn20jDRP7ZlhNnyub3GEwObZHjw - bucket-name: test-1308258046 - bucket-host: https://test-1308258046.cos.ap-beijing.myqcloud.com - region: ap-beijing - -# 应用配置 -worklog: - # Token 配置 - token: - expire-time: 86400 # Token 有效期(秒),默认 24 小时 - prefix: "auth:token:" - - # 日志内容限制 - log: - max-content-length: 2000 # 最大 2000 汉字 - - # 文件上传配置(如果不使用 COS) - upload: - enabled: true - base-path: ./uploads - max-file-size: 10MB - allowed-extensions: jpg,jpeg,png,gif,pdf,doc,docx,xls,xlsx diff --git a/bootstrap.yml.example b/bootstrap.yml.example deleted file mode 100644 index 717da07..0000000 --- a/bootstrap.yml.example +++ /dev/null @@ -1,35 +0,0 @@ -# ==================================================== -# 工作日志服务平台 - Bootstrap 配置文件 -# ==================================================== -# 说明: -# 1. 复制本文件为 bootstrap.yml -# 2. bootstrap.yml 在 application.yml 之前加载 -# 3. 主要用于配置 Nacos 配置中心和服务发现 -# ==================================================== - -spring: - application: - name: worklog-api - - # Nacos 配置中心 - cloud: - nacos: - # 服务发现配置 - discovery: - server-addr: localhost:8848 - username: nacos - password: nacos - namespace: worklog-dev - group: DEFAULT_GROUP - enabled: true - - # 配置中心 - config: - server-addr: localhost:8848 - username: nacos - password: nacos - namespace: worklog-dev - group: DEFAULT_GROUP - file-extension: yml - enabled: true - refresh-enabled: true diff --git a/scripts/env.properties.example b/scripts/env.properties similarity index 80% rename from scripts/env.properties.example rename to scripts/env.properties index b700e85..a1cee8a 100644 --- a/scripts/env.properties.example +++ b/scripts/env.properties @@ -1,17 +1,14 @@ # ==================================================== -# 工作日志服务平台 - 统一环境配置示例 -# 说明: -# 1. 复制本文件为 env.properties -# 2. 根据实际环境修改配置参数 -# 3. 敏感信息请勿提交到代码仓库 +# 工作日志服务平台 - 统一环境配置 +# 说明:所有服务共用的环境配置,包括数据库、缓存、注册中心等 # ==================================================== # ==================== 数据库配置 ==================== DB_HOST=localhost DB_PORT=3306 DB_NAME=worklog -DB_USERNAME=your_username -DB_PASSWORD=your_password +DB_USERNAME=worklog +DB_PASSWORD=Wlog@123 DB_URL=jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?useUnicode=true&characterEncoding=utf8mb4&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true # 连接池配置 @@ -24,7 +21,7 @@ DB_POOL_MAX_LIFETIME=1800000 # ==================== Redis 配置 ==================== REDIS_HOST=localhost REDIS_PORT=6379 -REDIS_PASSWORD=your_redis_password +REDIS_PASSWORD=zjf@123456 REDIS_DATABASE=0 REDIS_TIMEOUT=5000 @@ -48,11 +45,11 @@ FILE_STORAGE_PATH=./uploads # ==================== 腾讯云 COS 配置 ==================== COS_ENABLED=false -COS_APP_ID=your_app_id -COS_SECRET_ID=your_secret_id -COS_SECRET_KEY=your_secret_key -COS_BUCKET_NAME=your_bucket_name -COS_BUCKET_HOST=https://your_bucket.cos.region.myqcloud.com +COS_APP_ID=1308258046 +COS_SECRET_ID=AKIDukKfkY5LK2SbU6QTM7csugCSSDjzyiDS +COS_SECRET_KEY=0lHXYIn20jDRP7ZlhNnyub3GEwObZHjw +COS_BUCKET_NAME=test-1308258046 +COS_BUCKET_HOST=https://test-1308258046.cos.ap-beijing.myqcloud.com COS_REGION=ap-beijing # ==================== 日志配置 ==================== diff --git a/worklog-api/src/main/resources/application.yml.example b/worklog-api/src/main/resources/application.yml similarity index 98% rename from worklog-api/src/main/resources/application.yml.example rename to worklog-api/src/main/resources/application.yml index a603747..810cc8c 100644 --- a/worklog-api/src/main/resources/application.yml.example +++ b/worklog-api/src/main/resources/application.yml @@ -55,9 +55,9 @@ spring: group: DEFAULT_GROUP server: - port: 8080 + port: 8200 servlet: - context-path: / + context-path: /wlog # MyBatis-Plus 配置 mybatis-plus: diff --git a/worklog-api/src/main/resources/bootstrap.yml b/worklog-api/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..4453768 --- /dev/null +++ b/worklog-api/src/main/resources/bootstrap.yml @@ -0,0 +1,16 @@ +spring: + application: + name: worklog-api + + # Nacos 配置中心(可选,如果使用配置中心) + cloud: + nacos: + config: + server-addr: ${NACOS_SERVER_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:worklog-dev} + group: ${NACOS_GROUP:DEFAULT_GROUP} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} + file-extension: yml + # 是否启用 Nacos 配置中心(默认不启用) + enabled: false diff --git a/worklog-api/src/main/resources/service.properties.example b/worklog-api/src/main/resources/service.properties.example deleted file mode 100644 index 3d827f0..0000000 --- a/worklog-api/src/main/resources/service.properties.example +++ /dev/null @@ -1,32 +0,0 @@ -# ==================================================== -# 工作日志服务平台 - 服务个性化配置示例 -# 说明: -# 1. 复制本文件为 service.properties -# 2. 根据实际环境修改配置参数 -# 3. 可覆盖 env.properties 中的同名参数 -# ==================================================== - -# ==================== 服务基本信息 ==================== -# 服务名称 -APP_NAME=worklog-api - -# 实例名称(多租户场景使用,默认与 APP_NAME 相同) -INSTANCE_NAME=${APP_NAME} - -# 租户标识(多租户场景使用,用于路由,单租户留空) -TENANT_ID= - -# ==================== 服务端口配置 ==================== -# 服务端口(可覆盖 application.yml 中配置) -SERVER_PORT=8080 - -# ==================== 环境标识 ==================== -# 运行环境:dev-开发, test-测试, prod-生产 -SPRING_PROFILES_ACTIVE=prod - -# ==================== 个性化覆盖配置(可选) ==================== -# 如果当前服务需要使用不同的日志路径,可在此覆盖 -# LOG_PATH=/var/logs/worklog-api - -# 如果当前服务需要使用不同的日志级别,可在此覆盖 -# LOG_LEVEL_APP=INFO