add

deploy/.env

@@ -9,4 +9,7 @@ TZ=Asia/Shanghai
 
 # pgAdmin配置
 PGADMIN_EMAIL=fish@fish.com
-PGADMIN_PASSWORD=12345678
+PGADMIN_PASSWORD=12345678
+
+# 网关端口
+GATEWAY_PORT=80

deploy/deploy.sh

@@ -7,86 +7,124 @@ GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 NC='\033[0m'  # 重置颜色
 
-# 步骤1：停止当前运行的 docker-compose 编排
-echo -e "${YELLOW}===== 第一步：停止当前 docker-compose 服务 ====="${NC}
-if [ -f "./docker-compose.yaml" ]; then
-    echo "正在停止现有服务..."
-    docker-compose -f ./docker-compose.yaml down
+COMPOSE_PROJECT_NAME="user_service"
+DOCKER_COMPOSE_FILE="./docker-compose.yaml"
+
+# 步骤1：停止指定名称的docker-compose编排
+echo -e "${YELLOW}===== 第一步：停止编排名称为 $COMPOSE_PROJECT_NAME 的服务 ====="${NC}
+if [ -f "$DOCKER_COMPOSE_FILE" ]; then
+    echo "正在停止服务..."
+    docker-compose -f "$DOCKER_COMPOSE_FILE" -p "$COMPOSE_PROJECT_NAME" down
     if [ $? -eq 0 ]; then
-        echo -e "${GREEN}现有 docker-compose 服务已成功停止${NC}"
+        echo -e "${GREEN}编排 $COMPOSE_PROJECT_NAME 已成功停止${NC}"
     else
-        echo -e "${RED}停止 docker-compose 服务失败！${NC}"
+        echo -e "${RED}停止编排 $COMPOSE_PROJECT_NAME 失败！${NC}"
         exit 1
     fi
 else
-    echo -e "${RED}错误：未找到当前目录下的 docker-compose.yaml 文件${NC}"
+    echo -e "${RED}错误：未找到 $DOCKER_COMPOSE_FILE 文件${NC}"
     exit 1
 fi
 
-# 步骤2：遍历 api_ 开头的目录并执行 release.sh
-echo -e "\n${YELLOW}===== 第二步：处理 api_ 开头的服务目录 ====="${NC}
-for dir in ./api_*/; do
-    # 提取目录名称（移除路径和末尾斜杠）
-    dir_name=$(basename "${dir%/}")
-    
-    # 步骤3：跳过 api_template 目录
-    if [ "$dir_name" = "api_template" ]; then
-        echo -e "${YELLOW}  跳过目录：$dir_name${NC}"
-        continue
-    fi
-    
-    # 检查目录是否有效
-    if [ ! -d "$dir" ]; then
-        echo -e "${RED}  警告：$dir 不是有效目录，已跳过${NC}"
-        continue
-    fi
-    
-    echo -e "\n处理目录：$dir_name"
-    # 进入目标目录
-    cd "$dir" || {
-        echo -e "${RED}  错误：无法进入目录 $dir_name${NC}"
+# 步骤2：进入images目录加载所有镜像
+echo -e "\n${YELLOW}===== 第二步：加载images目录下的所有镜像 ====="${NC}
+IMAGES_DIR="./images"
+if [ -d "$IMAGES_DIR" ]; then
+    cd "$IMAGES_DIR" || {
+        echo -e "${RED}错误：无法进入目录 $IMAGES_DIR${NC}"
         exit 1
     }
     
-    # 检查并执行 release.sh
-    if [ -f "release.sh" ]; then
-        # 添加执行权限
-        chmod +x release.sh
-        echo "  已为 release.sh 添加执行权限"
-        
-        # 执行脚本
-        echo "  正在执行 release.sh..."
-        ./release.sh
-        if [ $? -eq 0 ]; then
-            echo -e "  ${GREEN}release.sh 执行成功${NC}"
-        else
-            echo -e "  ${RED}release.sh 执行失败！${NC}"
-            exit 1
-        fi
+    # 遍历所有镜像文件（支持.tar和.tar.gz格式）
+    image_files=$(find . -type f -name "*.tar" -o -name "*.tar.gz")
+    if [ -z "$image_files" ]; then
+        echo -e "${YELLOW}警告：$IMAGES_DIR 目录下未找到镜像文件${NC}"
     else
-        echo -e "${YELLOW}  警告：目录 $dir_name 中未找到 release.sh，已跳过${NC}"
+        for file in $image_files; do
+            echo "处理镜像文件：$file"
+            
+            # 临时加载镜像并获取输出（修复判断逻辑）
+            temp_load_output=$(docker load -i "$file" 2>&1)
+            # 检查临时加载是否成功（通过返回码判断，而非输出内容）
+            if [ $? -ne 0 ]; then
+                echo -e "  ${RED}临时加载镜像 $file 失败：$temp_load_output${NC}"
+                exit 1
+            fi
+            
+            # 从输出中提取镜像ID（兼容不同格式的输出）
+            temp_image_id=$(echo "$temp_load_output" | awk '/Loaded image ID: / {print $4}')
+            # 如果未提取到ID，尝试从"Loaded image: 镜像名:标签"中获取标签
+            if [ -z "$temp_image_id" ]; then
+                image_tag=$(echo "$temp_load_output" | awk '/Loaded image: / {print $3}')
+                if [ -n "$image_tag" ]; then
+                    temp_image_id=$(docker images --format '{{.ID}}' "$image_tag" | head -n 1)
+                fi
+            fi
+            
+            # 再次检查是否获取到镜像ID
+            if [ -z "$temp_image_id" ]; then
+                echo -e "  ${RED}无法获取镜像 $file 的ID，加载失败${NC}"
+                exit 1
+            fi
+            
+            # 获取镜像标签
+            image_tags=$(docker image inspect --format '{{range .RepoTags}}{{.}} {{end}}' "$temp_image_id")
+            if [ -z "$image_tags" ]; then
+                echo -e "  ${YELLOW}警告：镜像 $file 没有标签信息，直接删除临时镜像${NC}"
+                docker rmi -f "$temp_image_id" >/dev/null 2>&1
+            else
+                # 先删除已存在的同名标签镜像
+                for tag in $image_tags; do
+                    if docker images --format '{{.Repository}}:{{.Tag}}' | grep -q "^$tag$"; then
+                        echo "  发现已存在镜像 $tag，正在删除..."
+                        if docker rmi -f "$tag" >/dev/null 2>&1; then
+                            echo -e "  ${GREEN}成功删除镜像 $tag${NC}"
+                        else
+                            echo -e "  ${RED}删除镜像 $tag 失败！${NC}"
+                            exit 1
+                        fi
+                    fi
+                done
+                
+                # 删除临时加载的镜像
+                docker rmi -f "$temp_image_id" >/dev/null 2>&1
+            fi
+            
+            # 正式加载镜像
+            echo "  正在加载镜像：$file"
+            load_output=$(docker load -i "$file" 2>&1)
+            if [ $? -eq 0 ]; then
+                echo -e "  ${GREEN}镜像 $file 加载成功：$load_output${NC}"
+            else
+                echo -e "  ${RED}镜像 $file 加载失败：$load_output${NC}"
+                exit 1
+            fi
+        done
     fi
     
-    # 返回上级目录，继续处理其他目录
+    # 返回根目录
     cd .. || {
-        echo -e "${RED}  错误：无法返回上级目录${NC}"
+        echo -e "${RED}错误：无法返回根目录${NC}"
         exit 1
     }
-done
+else
+    echo -e "${RED}错误：未找到 $IMAGES_DIR 目录${NC}"
+    exit 1
+fi
 
-# 步骤4：启动新的 docker-compose 编排
-echo -e "\n${YELLOW}===== 第三步：启动新的 docker-compose 服务 ====="${NC}
-if [ -f "./docker-compose.yaml" ]; then
+# 步骤3：启动指定名称的docker-compose编排
+echo -e "\n${YELLOW}===== 第三步：启动编排名称为 $COMPOSE_PROJECT_NAME 的服务 ====="${NC}
+if [ -f "$DOCKER_COMPOSE_FILE" ]; then
     echo "正在启动服务..."
-    docker-compose -f ./docker-compose.yaml up -d
+    docker-compose -f "$DOCKER_COMPOSE_FILE" -p "$COMPOSE_PROJECT_NAME" up -d
     if [ $? -eq 0 ]; then
-        echo -e "${GREEN}docker-compose 服务启动成功！${NC}"
+        echo -e "${GREEN}编排 $COMPOSE_PROJECT_NAME 启动成功！${NC}"
     else
-        echo -e "${RED}启动 docker-compose 服务失败！${NC}"
+        echo -e "${RED}启动编排 $COMPOSE_PROJECT_NAME 失败！${NC}"
         exit 1
     fi
 else
-    echo -e "${RED}错误：未找到当前目录下的 docker-compose.yaml 文件${NC}"
+    echo -e "${RED}错误：未找到 $DOCKER_COMPOSE_FILE 文件${NC}"
     exit 1
 fi
 

deploy/docker-compose.yaml

@@ -0,0 +1,122 @@
+services:
+  pgadmin:
+    image: dpage/pgadmin4:9.5.0
+    container_name: user_pgadmin
+    ports:
+    - 20001:80
+    environment:
+      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL}
+      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
+      TZ: ${TZ}
+    volumes:
+    - ./shared_data/data4pgadmin:/var/lib/pgadmin
+    networks:
+    - user-network
+    depends_on:
+    - postgres
+  postgres:
+    image: postgres:17.4-alpine
+    container_name: user_db
+    restart: always
+    entrypoint:
+    - /scripts/db-lanuch-entrypoint.sh
+    environment:
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${DB_NAME}
+      TZ: ${TZ}
+    volumes:
+    - ./shared_data/user_db:/var/lib/postgresql/data
+    - ./sql:/docker-entrypoint-initdb.d
+    - ./scripts:/scripts
+    networks:
+    - user-network
+  user_login:
+    image: user-login-api:1.0.0
+    container_name: api_user_login
+    restart: always
+    depends_on:
+    - postgres
+    networks:
+    - user-network
+    environment:
+      DB_HOST: postgres
+      DB_PORT: ${DB_PORT}
+      DB_USER: ${DB_USER}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_NAME: ${DB_NAME}
+      TZ: ${TZ}
+  user_update_account:
+    image: user-update-account-api:1.0.0
+    container_name: api_user_update_account
+    restart: always
+    depends_on:
+    - postgres
+    networks:
+    - user-network
+    environment:
+      DB_HOST: postgres
+      DB_PORT: ${DB_PORT}
+      DB_USER: ${DB_USER}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_NAME: ${DB_NAME}
+      TZ: ${TZ}
+  user_gateway:
+    image: user-gateway-api:1.0.0
+    container_name: api_user_gateway
+    restart: always
+    ports:
+    - 20000:80
+    networks:
+    - user-network
+    environment:
+      GATEWAY_PORT: ${GATEWAY_PORT}
+  user_update_password:
+    image: user-update-password-api:1.0.0
+    container_name: api_user_update_password
+    restart: always
+    depends_on:
+    - postgres
+    networks:
+    - user-network
+    environment:
+      DB_HOST: postgres
+      DB_PORT: ${DB_PORT}
+      DB_USER: ${DB_USER}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_NAME: ${DB_NAME}
+      TZ: ${TZ}
+  user_register:
+    image: user-register-api:1.0.0
+    container_name: api_user_register
+    restart: always
+    depends_on:
+    - postgres
+    networks:
+    - user-network
+    environment:
+      DB_HOST: postgres
+      DB_PORT: ${DB_PORT}
+      DB_USER: ${DB_USER}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_NAME: ${DB_NAME}
+      TZ: ${TZ}
+  user_delete:
+    image: user-delete-api:1.0.0
+    container_name: api_user_delete
+    restart: always
+    depends_on:
+    - postgres
+    networks:
+    - user-network
+    environment:
+      DB_HOST: postgres
+      DB_PORT: ${DB_PORT}
+      DB_USER: ${DB_USER}
+      DB_PASSWORD: ${DB_PASSWORD}
+      DB_NAME: ${DB_NAME}
+      TZ: ${TZ}
+networks:
+  user-network:
+    driver: bridge
+volumes: {}