Merge remote-tracking branch 'origin/develop' into develop

docker/copy-jar.sh

@@ -30,3 +30,6 @@ cp ./jar/ruoyi-modules-job.jar ./ruoyi/modules/job/jar
 echo "begin copy ruoyi-modules-gen "
 cp ./jar/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar
 
+echo "begin copy ruoyi-modules-gen "
+cp ./jar/apiport-exam.jar ./ruoyi/modules/exam/jar
+

docker/docker-compose.yml

@@ -1,10 +1,13 @@
-version : '2.2'
+version: '2.2'
 services:
   ruoyi-gateway:
     container_name: ruoyi-gateway
     build:
       context: ./ruoyi/gateway
       dockerfile: dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=${PROFILE:-prod}  # 默认prod环境
+      - TZ=Asia/Shanghai  # 时区设置
     ports:
       - "38080:8080"
   ruoyi-auth:
@@ -12,42 +15,79 @@ services:
     build:
       context: ./ruoyi/auth
       dockerfile: dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=${PROFILE:-prod}
+      - TZ=Asia/Shanghai
     ports:
       - "39200:9200"
+
   ruoyi-modules-system:
     container_name: ruoyi-modules-system
     build:
       context: ./ruoyi/modules/system
       dockerfile: dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=${PROFILE:-prod}
+      - TZ=Asia/Shanghai
     ports:
       - "39201:9201"
+    volumes:
+      - ./logs/system:/home/ruoyi/logs
+
   ruoyi-modules-gen:
     container_name: ruoyi-modules-gen
     build:
       context: ./ruoyi/modules/gen
       dockerfile: dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=${PROFILE:-prod}
+      - TZ=Asia/Shanghai
     ports:
       - "39202:9202"
+
   ruoyi-modules-job:
     container_name: ruoyi-modules-job
     build:
       context: ./ruoyi/modules/job
       dockerfile: dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=${PROFILE:-prod}
+      - TZ=Asia/Shanghai
     ports:
       - "39203:9203"
+
   ruoyi-modules-file:
     container_name: ruoyi-modules-file
     build:
       context: ./ruoyi/modules/file
       dockerfile: dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=${PROFILE:-prod}
+      - TZ=Asia/Shanghai
     ports:
       - "39300:9300"
     volumes:
       - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
+      - ./logs/file:/home/ruoyi/logs
+
   ruoyi-visual-monitor:
     container_name: ruoyi-visual-monitor
     build:
       context: ./ruoyi/visual/monitor
       dockerfile: dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=${PROFILE:-prod}
+      - TZ=Asia/Shanghai
     ports:
       - "39100:9100"
+
+  airport-exam:
+    container_name: airport-exam
+    build:
+      context: ./ruoyi/modules/exam
+      dockerfile: dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=${PROFILE:-prod}
+      - TZ=Asia/Shanghai
+    ports:
+      - "39212:9212"

docker/run.sh

@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# 颜色定义
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[0;33m'
+NC='\033[0m' # No Color
+
+# 默认环境配置
+DEFAULT_PROFILE="prod"
+
+# 使用说明
+usage() {
+    echo -e "${GREEN}Usage: sh run.sh [module] [profile]"
+    echo -e "示例:"
+    echo -e "  sh run.sh system          # 启动系统模块（默认 ${DEFAULT_PROFILE} 环境）"
+    echo -e "  sh run.sh gateway dev     # 启动网关模块（dev 环境）"
+    echo -e "  sh run.sh stopAll         # 停止所有服务${NC}"
+    echo -e "\n${YELLOW}可用模块:${NC}"
+    echo "  gateway   - API网关"
+    echo "  auth      - 认证中心"
+    echo "  system    - 系统模块"
+    echo "  job    - 系统模块"
+    echo "  file      - 文件服务"
+    echo "  gen      - 代码生成服务"
+    echo "  monitor   - 监控中心"
+    echo "  exam   - 考试服务"
+    echo -e "\n${YELLOW}管理命令:${NC}"
+    echo "  stopAll   - 停止所有服务"
+    echo "  rmAll     - 删除所有容器"
+    echo "  restart [module] [profile] - 重启指定模块"
+    exit 1
+}
+
+# 网关模块
+gateway() {
+    restart_service "ruoyi-gateway" "$1" "网关服务"
+}
+
+# 认证中心
+auth() {
+    restart_service "ruoyi-auth" "$1" "认证中心"
+}
+
+# 系统模块
+system() {
+    restart_service "ruoyi-modules-system" "$1" "系统模块"
+}
+# 定时任务
+job() {
+    restart_service "ruoyi-modules-job" "$1" "定时任务"
+}
+
+# 文件服务
+file() {
+    restart_service "ruoyi-modules-file" "$1" "文件服务"
+}
+
+# 文件服务
+gen() {
+    restart_service "ruoyi-modules-gen" "$1" "代码生成服务"
+}
+
+# 监控中心
+monitor() {
+    restart_service "ruoyi-visual-monitor" "$1" "监控中心"
+}
+
+# 考试服务
+exam() {
+    restart_service "airport-exam" "$1" "考试服务"
+}
+
+# 核心重启逻辑
+restart_service() {
+    local service=$1
+    local profile=${2:-$DEFAULT_PROFILE}
+    local service_name=$3
+
+    echo -e "${YELLOW}>>> 重启 ${service_name} ${service} [环境: ${profile}]...${NC}"
+
+    docker-compose stop $service
+    docker-compose rm -f $service
+    docker-compose build $service
+    # 传递环境变量
+    export PROFILE=$profile
+    docker-compose up -d $service
+
+    echo -e "${GREEN}✓ ${service_name} 启动完成${NC}"
+    echo -e "环境: ${YELLOW}${profile}${NC} | 容器状态:"
+    docker-compose ps | grep $service
+}
+
+# 停止所有服务
+stopAll() {
+    echo -e "${RED}>>> 停止所有服务...${NC}"
+    docker-compose stop
+}
+
+# 删除所有容器
+rmAll() {
+    echo -e "${RED}>>> 删除所有容器...${NC}"
+    docker-compose rm -f
+}
+
+# 重启指定模块
+restart() {
+    case "$1" in
+        "gateway") gateway "$2" ;;
+        "auth") auth "$2" ;;
+        "system") system "$2" ;;
+        "job") job "$2" ;;
+        "file") file "$2" ;;
+        "gen") gen "$2" ;;
+        "monitor") monitor "$2" ;;
+        "exam") exam "$2" ;;
+        *) echo -e "${RED}未知模块: $1${NC}"; usage ;;
+    esac
+}
+
+# 主逻辑
+case "$1" in
+    "gateway") gateway "$2" ;;
+    "auth") auth "$2" ;;
+    "system") system "$2" ;;
+    "job") job "$2" ;;
+    "file") file "$2" ;;
+    "gen") gen "$2" ;;
+    "exam") exam "$2" ;;
+    "monitor") monitor "$2" ;;
+    "stopAll") stopAll ;;
+    "rmAll") rmAll ;;
+    "restart") restart "$2" "$3" ;;
+    *) usage ;;
+esac

docker/ruoyi/modules/exam/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/airport-exam.jar /home/ruoyi/airport-exam.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","airport-exam.jar"]

docker/ruoyi/modules/exam/jar/readme.txt

@@ -0,0 +1 @@
+存放系统模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/gen/dockerfile

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
 # 复制jar文件到路径
 COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar
 # 启动代码生成服务
-ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"]
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","ruoyi-modules-gen.jar"]

ruoyi-auth/src/main/resources/bootstrap.yml

@@ -9,5 +9,5 @@ spring:
     name: ruoyi-auth
   profiles:
     # 环境配置
-    active: dev
+    active: local
 

ruoyi-modules/airport-exam/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,22 @@
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.3.222:8848
+        username: nacos
+        password: nacos
+        namespace: local
+      config:
+        # 配置中心地址
+        username: nacos
+        password: nacos
+        server-addr: 192.168.3.222:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: local
+

ruoyi-modules/airport-exam/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,19 @@
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.3.222:8848
+        username: nacos
+        password: nacos
+      config:
+        # 配置中心地址
+        username: nacos
+        password: nacos
+        server-addr: 192.168.3.222:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

ruoyi-modules/airport-exam/src/main/resources/bootstrap.yml

@@ -9,4 +9,4 @@ spring:
     name: airport-exam
   profiles:
     # 环境配置
-    active: dev
+    active: local

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,20 @@
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.3.222:8848
+        username: nacos
+        password: nacos
+      config:
+        username: nacos
+        password: nacos
+        # 配置中心地址
+        server-addr: 192.168.3.222:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,22 @@
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.3.222:8848
+        username: nacos
+        password: nacos
+        namespace: local
+      config:
+        # 配置中心地址
+        username: nacos
+        password: nacos
+        server-addr: 192.168.3.222:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: local
+

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,19 @@
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.3.222:8848
+        username: nacos
+        password: nacos
+      config:
+        # 配置中心地址
+        username: nacos
+        password: nacos
+        server-addr: 192.168.3.222:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml

@@ -9,21 +9,5 @@ spring:
     name: ruoyi-file
   profiles:
     # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.3.222:8848
-        username: nacos
-        password: nacos
-      config:
-        # 配置中心地址
-        server-addr: 192.168.3.222:8848
-        username: nacos
-        password: nacos
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    active: local
+

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-local.yml

@@ -7,7 +7,7 @@ spring:
         server-addr: 192.168.3.222:8848
         username: nacos
         password: nacos
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
+        namespace: local
       config:
         # 配置中心地址
         username: nacos
@@ -18,5 +18,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
+        namespace: local
 

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -9,4 +9,4 @@ spring:
     name: ruoyi-gen
   profiles:
     # 环境配置
-    active: dev
+    active: local

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,20 @@
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.3.222:8848
+        username: nacos
+        password: nacos
+      config:
+        username: nacos
+        password: nacos
+        # 配置中心地址
+        server-addr: 192.168.3.222:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,22 @@
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.3.222:8848
+        username: nacos
+        password: nacos
+        namespace: local
+      config:
+        # 配置中心地址
+        username: nacos
+        password: nacos
+        server-addr: 192.168.3.222:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: local
+

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,19 @@
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.3.222:8848
+        username: nacos
+        password: nacos
+      config:
+        # 配置中心地址
+        username: nacos
+        password: nacos
+        server-addr: 192.168.3.222:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -9,21 +9,5 @@ spring:
     name: ruoyi-job
   profiles:
     # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.3.222:8848
-        username: nacos
-        password: nacos
-      config:
-        # 配置中心地址
-        server-addr: 192.168.3.222:8848
-        username: nacos
-        password: nacos
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    active: local
+

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -9,4 +9,4 @@ spring:
     name: ruoyi-system
   profiles:
     # 环境配置
-    active: dev
+    active: local

ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml

@@ -9,5 +9,5 @@ spring:
     name: ruoyi-monitor
   profiles:
     # 环境配置
-    active: dev
+    active: local