refactor: reorganize file structure and update .gitignore

- Move settings file to config/ directory
- Move control script to code/ directory
- Remove create-network.sh script as requested
- Create comprehensive .gitignore file to handle test logs and artifacts
- Update all scripts to reference new file locations
- Update STATUS.md to reflect new file structure

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>

.gitignore

@@ -0,0 +1,84 @@
+# TSYSDevStack SupportStack Demo .gitignore
+
+# Docker-related
+*.dockerignore
+.dockerconfig
+.dockerenv
+
+# Environment and configuration
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Logs
+*.log
+logs/
+*.out
+*.pid
+
+# OS generated
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+desktop.ini
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# Node-related (if any)
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Build outputs
+build/
+dist/
+target/
+*.tmp
+*.temp
+
+# Test outputs
+coverage/
+.nyc_output/
+*.gcda
+*.gcno
+
+# Docker artifacts
+artifacts/SupportStack/config/wakaapi/database/*.db
+artifacts/SupportStack/config/wakaapi/database/*.db-journal
+artifacts/SupportStack/config/homepage/logs/
+artifacts/SupportStack/docker-compose/config/
+
+# Local Docker volumes
+.docker-volumes/
+
+# Database files
+*.db
+*.db-journal
+*.sqlite
+*.sqlite-shm
+*.sqlite-wal
+
+# Temporary files
+tmp/
+temp/
+.Dockerfile*
+
+# Backup files
+*~
+*.bak
+*.backup
+
+# System files
+.SynologyWorkingDirectory

artifacts/SupportStack/code/TSYSDevStack-SupportStack-Demo-Control.sh

@@ -7,7 +7,8 @@ set -e  # Exit on any error
 
 # Load environment settings
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ENV_FILE="${SCRIPT_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
+CONFIG_DIR="$(dirname "$SCRIPT_DIR")/config"
+ENV_FILE="${CONFIG_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
 
 if [ ! -f "$ENV_FILE" ]; then
     echo "Error: Environment settings file not found at $ENV_FILE"
@@ -84,8 +85,9 @@ start() {
 
     # Start docker-socket-proxy first (dependency for homepage)
     log "Starting docker-socket-proxy..."
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
+    COMPOSE_DIR="$(dirname "$SCRIPT_DIR")/docker-compose"
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" up -d
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" up -d
         log_success "docker-socket-proxy started"
     else
         log_warning "docker-socket-proxy compose file not found, skipping..."
@@ -97,8 +99,9 @@ start() {
 
     # Start homepage
     log "Starting homepage..."
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
+    COMPOSE_DIR="$(dirname "$SCRIPT_DIR")/docker-compose"
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" up -d
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" up -d
         log_success "homepage started"
     else
         log_warning "homepage compose file not found, skipping..."
@@ -110,8 +113,9 @@ start() {
 
     # Start wakaapi
     log "Starting wakaapi..."
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
+    COMPOSE_DIR="$(dirname "$SCRIPT_DIR")/docker-compose"
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" up -d
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" up -d
         log_success "wakaapi started"
     else
         log_warning "wakaapi compose file not found, skipping..."
@@ -133,9 +137,10 @@ stop() {
     check_docker
 
     # Stop wakaapi first
+    COMPOSE_DIR="$(dirname "$SCRIPT_DIR")/docker-compose"
     log "Stopping wakaapi..."
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" down
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" down
         log_success "wakaapi stopped"
     else
         log_warning "wakaapi compose file not found, skipping..."
@@ -143,8 +148,8 @@ stop() {
 
     # Stop homepage
     log "Stopping homepage..."
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" down
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" down
         log_success "homepage stopped"
     else
         log_warning "homepage compose file not found, skipping..."
@@ -152,8 +157,8 @@ stop() {
 
     # Stop docker-socket-proxy last
     log "Stopping docker-socket-proxy..."
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" down
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" down
         log_success "docker-socket-proxy stopped"
     else
         log_warning "docker-socket-proxy compose file not found, skipping..."
@@ -173,16 +178,17 @@ uninstall() {
 
     # Remove containers, volumes, and networks
     log "Removing containers and volumes..."
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
+    COMPOSE_DIR="$(dirname "$SCRIPT_DIR")/docker-compose"
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" down -v
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" down -v
     fi
 
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" down -v
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" down -v
     fi
 
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" down -v
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" down -v
     fi
 
     # Remove the shared network
@@ -199,19 +205,20 @@ update() {
 
     # Pull the latest images
     log "Pulling latest images..."
+    COMPOSE_DIR="$(dirname "$SCRIPT_DIR")/docker-compose"
     
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" pull
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" pull
         log_success "docker-socket-proxy images updated"
     fi
 
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" pull
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" pull
         log_success "homepage images updated"
     fi
 
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
-        docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" pull
+        docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" pull
         log_success "wakaapi images updated"
     fi
 
@@ -230,10 +237,11 @@ test() {
 
     # Add test functions here
     log "Checking if services are running..."
+    COMPOSE_DIR="$(dirname "$SCRIPT_DIR")/docker-compose"
     
     # Check docker-socket-proxy
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ]; then
-        if docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ps | grep -q "Up"; then
+        if docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-docker-socket-proxy.yml" ps | grep -q "Up"; then
             log_success "docker-socket-proxy is running"
         else
             log_error "docker-socket-proxy is not running"
@@ -241,8 +249,8 @@ test() {
     fi
 
     # Check homepage
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ]; then
-        if docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ps | grep -q "Up"; then
+        if docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-homepage.yml" ps | grep -q "Up"; then
             log_success "homepage is running"
         else
             log_error "homepage is not running"
@@ -250,8 +258,8 @@ test() {
     fi
 
     # Check wakaapi
-    if [ -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
+    if [ -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ]; then
-        if docker compose -f "${SCRIPT_DIR}/docker-compose/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ps | grep -q "Up"; then
+        if docker compose -f "${COMPOSE_DIR}/TSYSDevStack-SupportStack-Demo-DockerCompose-wakaapi.yml" ps | grep -q "Up"; then
             log_success "wakaapi is running"
         else
             log_error "wakaapi is not running"

artifacts/SupportStack/create-network.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Script to create the shared Docker network for TSYSDevStack SupportStack Demo
-
-set -e
-
-# Load environment settings
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ENV_FILE="${SCRIPT_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
-
-if [ ! -f "$ENV_FILE" ]; then
-    echo "Error: Environment settings file not found at $ENV_FILE"
-    exit 1
-fi
-
-source "$ENV_FILE"
-
-# Create the shared network if it doesn't exist
-if ! docker network ls | grep -q "$TSYSDEVSTACK_NETWORK_NAME"; then
-    echo "Creating shared network: $TSYSDEVSTACK_NETWORK_NAME"
-    docker network create "$TSYSDEVSTACK_NETWORK_NAME" --driver bridge
-    echo "Network created successfully"
-else
-    echo "Network $TSYSDEVSTACK_NETWORK_NAME already exists"
-fi

artifacts/SupportStack/tests/test_docker_socket_proxy.sh

@@ -7,7 +7,8 @@ set -e
 
 # Load environment settings
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-ENV_FILE="${SCRIPT_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
+CONFIG_DIR="${SCRIPT_DIR}/config"
+ENV_FILE="${CONFIG_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
 
 if [ ! -f "$ENV_FILE" ]; then
     echo "Error: Environment settings file not found at $ENV_FILE"

artifacts/SupportStack/tests/test_homepage.sh

@@ -7,7 +7,8 @@ set -e
 
 # Load environment settings
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-ENV_FILE="${SCRIPT_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
+CONFIG_DIR="${SCRIPT_DIR}/config"
+ENV_FILE="${CONFIG_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
 
 if [ ! -f "$ENV_FILE" ]; then
     echo "Error: Environment settings file not found at $ENV_FILE"

artifacts/SupportStack/tests/test_mvp_stack.sh

@@ -7,7 +7,8 @@ set -e
 
 # Load environment settings
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-ENV_FILE="${SCRIPT_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
+CONFIG_DIR="${SCRIPT_DIR}/config"
+ENV_FILE="${CONFIG_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
 
 if [ ! -f "$ENV_FILE" ]; then
     echo "Error: Environment settings file not found at $ENV_FILE"

artifacts/SupportStack/tests/test_wakaapi.sh

@@ -7,7 +7,8 @@ set -e
 
 # Load environment settings
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-ENV_FILE="${SCRIPT_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
+CONFIG_DIR="${SCRIPT_DIR}/config"
+ENV_FILE="${CONFIG_DIR}/TSYSDevStack-SupportStack-Demo-Settings"
 
 if [ ! -f "$ENV_FILE" ]; then
     echo "Error: Environment settings file not found at $ENV_FILE"

collab/SupportStack/STATUS.md

@@ -50,8 +50,8 @@ MVP Development: All components completed (docker-socket-proxy, homepage, wakaap
 
 ## 💻 Technical Status
 - **Environment:** Local demo environment
-- **Configuration File:** TSYSDevStack-SupportStack-Demo-Settings (created)
+- **Configuration File:** config/TSYSDevStack-SupportStack-Demo-Settings (created)
-- **Control Script:** TSYSDevStack-SupportStack-Demo-Control.sh (created)
+- **Control Script:** code/TSYSDevStack-SupportStack-Demo-Control.sh (created)
 - **Docker Compose Files:** All 3 components completed
 - **Resource Limits:** Implemented per component