From dc88984a8bc7d1ed8df2cf58b68149d3a925fca5 Mon Sep 17 00:00:00 2001
From: wangziqi <wangziqi@gongxue100.com>
Date: Sat, 1 Aug 2026 12:20:02 +0800
Subject: [PATCH] chore: replace devcontainer with Vben submodule and add
 tooling ignore rules

---
 .devcontainer/Dockerfile         | 17 ---------
 .devcontainer/devcontainer.json  | 28 ---------------
 .devcontainer/docker-compose.yml | 59 --------------------------------
 .gitignore                       |  8 ++++-
 yudao-ui/yudao-ui-admin-vben     |  2 +-
 5 files changed, 8 insertions(+), 106 deletions(-)
 delete mode 100644 .devcontainer/Dockerfile
 delete mode 100644 .devcontainer/devcontainer.json
 delete mode 100644 .devcontainer/docker-compose.yml

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index 597f1cd4..00000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/java:3-25-bookworm
-
-ARG INSTALL_MAVEN="true"
-ARG MAVEN_VERSION=""
-
-ARG INSTALL_GRADLE="false"
-ARG GRADLE_VERSION=""
-
-RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
-    && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
deleted file mode 100644
index a7d24137..00000000
--- a/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,28 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/java-postgres
-{
-	"features": {
-  "ghcr.io/devcontainers/features/git:1": {},
-  "ghcr.io/devcontainers/features/sshd:1": {}
- },
- "name": "Java & PostgreSQL",
-	"dockerComposeFile": "docker-compose.yml",
-	"service": "app",
-	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}"
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {}
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// This can be used to network with other containers or with the host.
-	// "forwardPorts": [5432],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "java -version",
-
-	// Configure tool-specific properties.
-	// "customizations": {},
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
deleted file mode 100644
index 4a7db768..00000000
--- a/.devcontainer/docker-compose.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-volumes:
-  postgres-data:
-
-services:
-  app:
-    container_name: javadev
-    build: 
-      context: .
-      dockerfile: Dockerfile
-    environment:
-      # NOTE: POSTGRES_DB/USER/PASSWORD should match values in db container
-        POSTGRES_PASSWORD: postgres
-        POSTGRES_USER: postgres
-        POSTGRES_DB: postgres
-        POSTGRES_HOSTNAME: db
-
-    volumes:
-      - ../..:/workspaces:cached
-      
-    # Overrides default command so things don't shut down after the process ends.
-    command: sleep infinity
-
-    # Use proper Docker networking instead of network_mode: service:db
-    # to ensure reliable DNS resolution in all environments
-    depends_on:
-      db:
-        condition: service_healthy
-    networks:
-      - app-network
-
-    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
-    # (Adding the "ports" property to this file will not forward from a Codespace.)
-
-  db:
-    container_name: postgresdb
-    image: postgres:latest
-    restart: unless-stopped
-    networks:
-      - app-network
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 30s
-    volumes:
-      - postgres-data:/var/lib/postgresql
-    environment:
-      # NOTE: POSTGRES_DB/USER/PASSWORD should match values in app container
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_USER: postgres
-      POSTGRES_DB: postgres
-
-    # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
-    # (Adding the "ports" property to this file will not forward from a Codespace.)
-
-networks:
-  app-network:
-    driver: bridge
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index b9d947fa..beb4dae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,15 @@
 
 target/
 !.mvn/wrapper/maven-wrapper.jar
+bin/
 
 .flattened-pom.xml
 
+######################################################################
+# Tooling caches
+
+.pnpm-store/
+
 ######################################################################
 # IDE
 
@@ -52,4 +58,4 @@ application-my.yaml
 
 /yudao-ui-app/unpackage/
 .DS_Store
-**/.DS_Store
\ No newline at end of file
+**/.DS_Store
diff --git a/yudao-ui/yudao-ui-admin-vben b/yudao-ui/yudao-ui-admin-vben
index 4c3c2fcb..15862e2b 160000
--- a/yudao-ui/yudao-ui-admin-vben
+++ b/yudao-ui/yudao-ui-admin-vben
@@ -1 +1 @@
-Subproject commit 4c3c2fcb7df713d18028783a40dfa0251a70a55a
+Subproject commit 15862e2b7d7c669eeb551f1df49559887a5d9001