diff --git a/capability/src/main/resources/bin/log.sh b/capability/src/main/resources/bin/log.sh new file mode 100644 index 00000000..74b49935 --- /dev/null +++ b/capability/src/main/resources/bin/log.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# Spring Boot 项目日志查看脚本 +LOG_HOME="/home/app/capability/logs" +LOG_FILE="${LOG_HOME}/running.log" + +# 查看实时日志 +if [ ! -f "${LOG_FILE}" ]; then + echo "日志文件不存在:${LOG_FILE}(可能项目未启动)" + exit 1 +fi +echo "正在查看实时运行日志(按 Ctrl+C 退出)... 日志路径:${LOG_FILE}" +tail -f "${LOG_FILE}" diff --git a/capability/src/main/resources/bin/restart.sh b/capability/src/main/resources/bin/restart.sh new file mode 100644 index 00000000..2a8c0852 --- /dev/null +++ b/capability/src/main/resources/bin/restart.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Spring Boot 项目重启脚本 + +echo "=== 开始重启项目 ===" +# 调用停止脚本 +./stop.sh +# 调用启动脚本 +./start.sh +echo "=== 重启操作完成 ===" diff --git a/capability/src/main/resources/bin/start.sh b/capability/src/main/resources/bin/start.sh new file mode 100644 index 00000000..6b7f161e --- /dev/null +++ b/capability/src/main/resources/bin/start.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# Spring Boot 项目启动脚本 +JAR_PATH="/home/app/capability" +JAR_NAME="capability-0.0.1-SNAPSHOT.jar" +FULL_JAR_PATH="${JAR_PATH}/${JAR_NAME}" + +# 与logback.xml保持一致的日志路径 +LOG_HOME="/home/app/capability/logs" +LOG_FILE="${LOG_HOME}/running.log" + +# JVM参数 +JVM_OPTS="-Xms512m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${LOG_HOME}/heapdump.hprof" + +# 检查Jar包是否存在 +check_jar_exists() { + if [ ! -f "${FULL_JAR_PATH}" ]; then + echo "ERROR: Jar包不存在!路径:${FULL_JAR_PATH}" + exit 1 + fi +} + +# 获取运行中的进程PID +get_running_pid() { + ps -ef | grep "${JAR_NAME}" | grep -v "grep" | awk '{print $2}' +} + +# 启动服务 +check_jar_exists + +PID=$(get_running_pid) +if [ -n "${PID}" ]; then + echo "项目已在运行中!PID: ${PID}" + exit 0 +fi + +# 确保日志目录存在 +if [ ! -d "${LOG_HOME}" ]; then + mkdir -p "${LOG_HOME}" + echo "日志目录不存在,已自动创建:${LOG_HOME}" +fi + +echo "正在启动项目..." + +# 启动项目,保留控制台输出 +nohup java ${JVM_OPTS} -Dspring.profiles.active=dev -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5007 -jar "${FULL_JAR_PATH}" > "${LOG_FILE}" 2>&1 & + + + + diff --git a/capability/src/main/resources/bin/status.sh b/capability/src/main/resources/bin/status.sh new file mode 100644 index 00000000..b045d50e --- /dev/null +++ b/capability/src/main/resources/bin/status.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# Spring Boot 项目状态查看脚本 +JAR_NAME="capability-0.0.1-SNAPSHOT.jar" +LOG_HOME="/home/app/capability/logs" +LOG_FILE="${LOG_HOME}/running.log" + +# 获取运行中的进程PID +get_running_pid() { + ps -ef | grep "${JAR_NAME}" | grep -v "grep" | awk '{print $2}' +} + + PID=$(get_running_pid) +if [ -n "${PID}" ]; then + echo "项目运行中!PID: ${PID}" + echo "日志文件路径:${LOG_FILE}" +else + echo "项目未在运行中" +fi diff --git a/capability/src/main/resources/bin/stop.sh b/capability/src/main/resources/bin/stop.sh new file mode 100644 index 00000000..b058a183 --- /dev/null +++ b/capability/src/main/resources/bin/stop.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# Spring Boot 项目停止脚本 +JAR_NAME="capability-0.0.1-SNAPSHOT.jar" + +# 获取运行中的进程PID +get_running_pid() { + ps -ef | grep "${JAR_NAME}" | grep -v "grep" | awk '{print $2}' +} + +# 停止服务 + PID=$(get_running_pid) +if [ -z "${PID}" ]; then + echo "项目未在运行中,无需停止" + exit 0 +fi + +echo "正在停止项目... PID: ${PID}" +kill -15 "${PID}" + + WAIT=0 +while [ ${WAIT} -lt 10 ]; do + if [ -z "$(get_running_pid)" ]; then + echo "项目已优雅停止" + exit 0 + fi + sleep 1 + WAIT=$((WAIT + 1)) +done + +echo "优雅停止超时,强制终止进程... PID: ${PID}" +kill -9 "${PID}" + +sleep 2 +if [ -z "$(get_running_pid)" ]; then + echo "项目已强制停止" +else + echo "ERROR: 进程终止失败!请手动检查:ps -ef | grep ${JAR_NAME}" + exit 1 +fi diff --git a/common/src/main/java/com/sdm/common/entity/enums/FilePermissionEnum.java b/common/src/main/java/com/sdm/common/entity/enums/FilePermissionEnum.java index 7b454171..b02c7237 100644 --- a/common/src/main/java/com/sdm/common/entity/enums/FilePermissionEnum.java +++ b/common/src/main/java/com/sdm/common/entity/enums/FilePermissionEnum.java @@ -4,9 +4,8 @@ public enum FilePermissionEnum { READ((byte) 0x01), WRITE((byte) 0x02), DELETE((byte) 0x04), - DOWNLOAD((byte) 0x08), - UPLOAD((byte) 0x10), - NONE((byte) -1), + UPLOAD((byte) 0x08), + DOWNLOAD((byte) 0x10), ZERO((byte) 0), ALL((byte) (READ.value | WRITE.value | DELETE.value | DOWNLOAD.value | UPLOAD.value)); byte value; diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java index 939bf278..ad4563a8 100644 --- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java @@ -2387,7 +2387,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { poolInfo.setTaskBaseInfoList(taskList); if(CollectionUtils.isNotEmpty(taskList)) { poolInfo.setSimulationPoolName(taskList.get(0).getPoolName()); - poolInfo.setSimulationPoolVersion(taskList.get(0).getPoolName()); + poolInfo.setSimulationPoolVersion(taskList.get(0).getVersion()); } poolInfos.add(poolInfo);