From 61c87e40fbc5eacf18d659f4b7ae3a6573bb5259 Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Fri, 30 Jan 2026 16:59:11 +0800 Subject: [PATCH] f: port --- app/main/api/etc/main.dev.yaml | 4 +- deploy/script/gen_models.ps1 | 2 +- docker-compose.dev.yml | 14 +-- docker-compose.yml | 166 ++++++++++++++++----------------- 4 files changed, 93 insertions(+), 93 deletions(-) diff --git a/app/main/api/etc/main.dev.yaml b/app/main/api/etc/main.dev.yaml index da423cb..23fd0d9 100644 --- a/app/main/api/etc/main.dev.yaml +++ b/app/main/api/etc/main.dev.yaml @@ -1,9 +1,9 @@ Name: main Host: 0.0.0.0 Port: 8888 -DataSource: "tyass:5vg67b3UNHu8@tcp(127.0.0.1:21001)/tyass?charset=utf8mb4&parseTime=True&loc=Local" +DataSource: "tyass:5vg67b3UNHu8@tcp(127.0.0.1:27101)/tyass?charset=utf8mb4&parseTime=True&loc=Local" CacheRedis: - - Host: "127.0.0.1:21002" + - Host: "127.0.0.1:27102" Pass: "3m3WsgyCKWqz" # Redis 密码，如果未设置则留空 Type: "node" # 单节点模式 JwtAuth: diff --git a/deploy/script/gen_models.ps1 b/deploy/script/gen_models.ps1 index 2039f6a..4daa19e 100644 --- a/deploy/script/gen_models.ps1 +++ b/deploy/script/gen_models.ps1 @@ -1,7 +1,7 @@ # 设置输出编码为UTF-8 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 # 数据库连接信息 - 修改了URL格式 -$DB_URL = "tyass:5vg67b3UNHu8@(127.0.0.1:21001)/tyass" +$DB_URL = "tyass:5vg67b3UNHu8@(127.0.0.1:27101)/tyass" $OUTPUT_DIR = "./model" $TEMPLATE_DIR = "../template" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f06c97f..4d2b61a 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -11,13 +11,13 @@ services: MYSQL_USER: tyass MYSQL_PASSWORD: 5vg67b3UNHu8 ports: - - "21001:3306" + - "27101:3306" volumes: # 数据挂载 - Data mounting - ./data/mysql/data:/var/lib/mysql # 日志 command: - # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) + # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) # Modify the Mysql 8.0 default password strategy to the original strategy (MySQL8.0 to change its default strategy will cause the password to be unable to match) --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 @@ -32,7 +32,7 @@ services: image: redis:7.4.0 container_name: tyass_redis ports: - - "21002:6379" + - "27102:6379" environment: # 时区上海 - Time zone Shanghai (Change if needed) TZ: Asia/Shanghai @@ -49,12 +49,12 @@ services: image: hibiken/asynqmon:latest container_name: tyass_asynqmon ports: - - "21003:8080" + - "27103:8080" environment: - TZ=Asia/Shanghai command: - - '--redis-addr=tyass_redis:6379' - - '--redis-password=3m3WsgyCKWqz' + - "--redis-addr=tyass_redis:6379" + - "--redis-password=3m3WsgyCKWqz" restart: always networks: - tyass_net @@ -71,7 +71,7 @@ services: PMA_USER: tyass PMA_PASSWORD: 5vg67b3UNHu8 ports: - - "21004:80" + - "27104:80" depends_on: - mysql networks: diff --git a/docker-compose.yml b/docker-compose.yml index 09cd453..18ef920 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,91 +1,91 @@ version: "3" services: - mysql: - image: mysql:8.0.34 - container_name: tyass_mysql - environment: - # 时区上海 - Time zone Shanghai (Change if needed) - TZ: Asia/Shanghai - # root 密码 - root password - MYSQL_ROOT_PASSWORD: yfg87gyuYiy1 - MYSQL_DATABASE: tyass - MYSQL_USER: tyass - MYSQL_PASSWORD: 5vg67b3UNHu8 - ports: - - "21001:3306" - volumes: - # 数据挂载 - Data mounting - - ./data/mysql/data:/var/lib/mysql - # 日志 - command: - # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) - # Modify the Mysql 8.0 default password strategy to the original strategy (MySQL8.0 to change its default strategy will cause the password to be unable to match) - --default-authentication-plugin=mysql_native_password - --character-set-server=utf8mb4 - --collation-server=utf8mb4_general_ci - --explicit_defaults_for_timestamp=true - --lower_case_table_names=1 - privileged: true - restart: always - networks: - - tyass_net - - 1panel-network + mysql: + image: mysql:8.0.34 + container_name: tyass_mysql + environment: + # 时区上海 - Time zone Shanghai (Change if needed) + TZ: Asia/Shanghai + # root 密码 - root password + MYSQL_ROOT_PASSWORD: yfg87gyuYiy1 + MYSQL_DATABASE: tyass + MYSQL_USER: tyass + MYSQL_PASSWORD: 5vg67b3UNHu8 + ports: + - "27101:3306" + volumes: + # 数据挂载 - Data mounting + - ./data/mysql/data:/var/lib/mysql + # 日志 + command: + # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) + # Modify the Mysql 8.0 default password strategy to the original strategy (MySQL8.0 to change its default strategy will cause the password to be unable to match) + --default-authentication-plugin=mysql_native_password + --character-set-server=utf8mb4 + --collation-server=utf8mb4_general_ci + --explicit_defaults_for_timestamp=true + --lower_case_table_names=1 + privileged: true + restart: always + networks: + - tyass_net + - 1panel-network - redis: - image: redis:7.4.0 - container_name: tyass_redis - ports: - - "21002:6379" - environment: - # 时区上海 - Time zone Shanghai (Change if needed) - TZ: Asia/Shanghai - volumes: - # 数据文件 - data files - - ./data/redis/data:/data:rw - command: "redis-server --requirepass 3m3WsgyCKWqz --appendonly yes" - privileged: true - restart: always - networks: - - tyass_net + redis: + image: redis:7.4.0 + container_name: tyass_redis + ports: + - "27102:6379" + environment: + # 时区上海 - Time zone Shanghai (Change if needed) + TZ: Asia/Shanghai + volumes: + # 数据文件 - data files + - ./data/redis/data:/data:rw + command: "redis-server --requirepass 3m3WsgyCKWqz --appendonly yes" + privileged: true + restart: always + networks: + - tyass_net - asynqmon: - image: hibiken/asynqmon:latest - container_name: tyass_asynqmon - ports: - - "21003:8080" - environment: - - TZ=Asia/Shanghai - command: - - "--redis-addr=tyass_redis:6379" - - "--redis-password=3m3WsgyCKWqz" - restart: always - networks: - - tyass_net - depends_on: - - redis + asynqmon: + image: hibiken/asynqmon:latest + container_name: tyass_asynqmon + ports: + - "27103:8080" + environment: + - TZ=Asia/Shanghai + command: + - "--redis-addr=tyass_redis:6379" + - "--redis-password=3m3WsgyCKWqz" + restart: always + networks: + - tyass_net + depends_on: + - redis - main: - container_name: tyass_main - build: - context: . - dockerfile: app/main/api/Dockerfile - ports: - - "21004:8888" - volumes: - - ./data/authorization_docs:/app/data/authorization_docs:rw - environment: - - TZ=Asia/Shanghai - - ENV=production - depends_on: - - mysql - - redis - networks: - - tyass_net - restart: always + main: + container_name: tyass_main + build: + context: . + dockerfile: app/main/api/Dockerfile + ports: + - "27104:8888" + volumes: + - ./data/authorization_docs:/app/data/authorization_docs:rw + environment: + - TZ=Asia/Shanghai + - ENV=production + depends_on: + - mysql + - redis + networks: + - tyass_net + restart: always networks: - tyass_net: - driver: bridge - 1panel-network: - external: true + tyass_net: + driver: bridge + 1panel-network: + external: true