diff --git a/.gitignore b/.gitignore index 9a11415..b6d208a 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,9 @@ src/main/resources/conf/service.properties *.sql.backup db_backup/ +# ==================== Assembly 打包输出 ==================== +deploy/worklog-api/ + # ==================== 上传文件 ==================== uploads/ files/ diff --git a/deploy/scripts/start.sh b/deploy/scripts/start.sh index 35215aa..e37bd42 100755 --- a/deploy/scripts/start.sh +++ b/deploy/scripts/start.sh @@ -7,7 +7,7 @@ APP_NAME="worklog-api" APP_JAR="worklog-api-1.0.0.jar" APP_HOME="/opt/worklog/${APP_NAME}" -APP_JAR_PATH="${APP_HOME}/${APP_JAR}" +APP_JAR_PATH="${APP_HOME}/lib/${APP_JAR}" # 配置文件加载函数 load_properties() { diff --git a/worklog-api/pom.xml b/worklog-api/pom.xml index b86ff07..72c0bd5 100644 --- a/worklog-api/pom.xml +++ b/worklog-api/pom.xml @@ -124,6 +124,30 @@ + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.6.0 + + + src/main/assembly/assembly.xml + + ${project.basedir}/../deploy + false + worklog-api + + + + make-assembly + package + + single + + + + diff --git a/worklog-api/src/main/assembly/assembly.xml b/worklog-api/src/main/assembly/assembly.xml new file mode 100644 index 0000000..f248265 --- /dev/null +++ b/worklog-api/src/main/assembly/assembly.xml @@ -0,0 +1,76 @@ + + + + dist + + dir + + + + false + + + worklog-api + + + + + ${project.build.directory} + lib + + *.jar + + + *-sources.jar + *-javadoc.jar + + + + + + ${project.basedir}/../deploy/scripts + bin + + start.sh + stop.sh + restart.sh + status.sh + + 0755 + unix + + + + + ${project.basedir}/src/main/resources/conf + conf + + *.properties + *.example + + + + + + ${project.basedir}/src/main/resources + conf + + application.yml + bootstrap.yml + logback-spring.xml + + + + + + ${project.basedir}/../deploy/scripts + conf + + *.example + + + + + diff --git a/worklog-api/src/main/resources/conf/env.properties.example b/worklog-api/src/main/resources/conf/env.properties.example new file mode 100644 index 0000000..c8b1ce4 --- /dev/null +++ b/worklog-api/src/main/resources/conf/env.properties.example @@ -0,0 +1,38 @@ +# ==================================================== +# 统一环境配置文件模板 +# ==================================================== +# 说明: +# 1. 复制此文件为 env.properties 并填入实际值 +# 2. 此文件包含环境敏感配置,不提交到版本控制 +# ==================================================== + +# ==================== 数据库配置 ==================== +DB_HOST=localhost +DB_PORT=3306 +DB_NAME=worklog +DB_USER=worklog +DB_PASSWORD=Wlog@123 + +# ==================== Redis 配置 ==================== +REDIS_HOST=localhost +REDIS_PORT=6379 +REDIS_PASSWORD=zjf@123456 +REDIS_DATABASE=0 + +# ==================== Nacos 配置(可选)==================== +NACOS_SERVER_ADDR=localhost:8848 +NACOS_NAMESPACE=worklog-dev +NACOS_GROUP=DEFAULT_GROUP +NACOS_USERNAME=nacos +NACOS_PASSWORD=nacos + +# ==================== JVM 配置 ==================== +JVM_XMS=512m +JVM_XMX=1024m +JVM_METASPACE_SIZE=128m +JVM_MAX_METASPACE_SIZE=256m +JVM_GC_TYPE=G1GC +JVM_MAX_GC_PAUSE_MILLIS=200 + +# ==================== Spring 配置 ==================== +SPRING_PROFILES_ACTIVE=prod diff --git a/worklog-api/src/main/resources/conf/service.properties.example b/worklog-api/src/main/resources/conf/service.properties.example new file mode 100644 index 0000000..a282028 --- /dev/null +++ b/worklog-api/src/main/resources/conf/service.properties.example @@ -0,0 +1,38 @@ +# ==================================================== +# 服务个性化配置文件模板 +# ==================================================== +# 说明: +# 1. 复制此文件为 service.properties 并根据需要修改 +# 2. 此文件优先级高于 env.properties +# 3. 用于覆盖默认配置或添加服务特定配置 +# ==================================================== + +# ==================== Token 配置 ==================== +# Token 有效期(秒),默认 24 小时 +TOKEN_EXPIRE_TIME=86400 + +# Token 在 Redis 中的 Key 前缀 +TOKEN_PREFIX=auth:token: + +# ==================== 日志配置 ==================== +# 日志内容最大长度(汉字) +LOG_MAX_CONTENT_LENGTH=2000 + +# ==================== 文件上传配置 ==================== +# 是否启用本地文件上传 +UPLOAD_ENABLED=true +# 上传文件存储路径 +UPLOAD_BASE_PATH=./uploads +# 最大文件大小 +UPLOAD_MAX_FILE_SIZE=10MB +# 允许的文件扩展名 +UPLOAD_ALLOWED_EXTENSIONS=jpg,jpeg,png,gif,pdf,doc,docx,xls,xlsx + +# ==================== 腾讯云 COS 配置(可选)==================== +COS_ENABLED=false +COS_APP_ID=1308258046 +COS_SECRET_ID= +COS_SECRET_KEY= +COS_BUCKET_NAME= +COS_BUCKET_HOST= +COS_REGION=ap-beijing