From 4f22296aa1be4c98ce8cd9b3d89c38211726134f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Wed, 10 Jun 2026 15:50:08 +0800 Subject: [PATCH] =?UTF-8?q?ci/cd=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- manifest/config/config-dev.yaml | 115 ----------------------------- manifest/config/config-master.yaml | 115 ----------------------------- 3 files changed, 1 insertion(+), 231 deletions(-) delete mode 100644 manifest/config/config-dev.yaml delete mode 100644 manifest/config/config-master.yaml diff --git a/go.mod b/go.mod index 7cb65b7..69a047e 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/tiger1103/gfast-token v1.0.10 ) -//replace gitea.com/red-future/common v0.0.19 => ../common +//replace gitea.com/red-future/common v0.0.23 => ../common require ( github.com/BurntSushi/toml v1.5.0 // indirect diff --git a/manifest/config/config-dev.yaml b/manifest/config/config-dev.yaml deleted file mode 100644 index 7cbbc02..0000000 --- a/manifest/config/config-dev.yaml +++ /dev/null @@ -1,115 +0,0 @@ -server: - name: "admin-go" - address: ":9001" - serverRoot: "resource/public" - dumpRouterMap: false - routeOverWrite: true - openapiPath: "/api.json" - swaggerPath: "/swagger" - NameToUriType: 3 - maxHeaderBytes: "20KB" - clientMaxBodySize: "50MB" - # Logging配置 - logPath: "resource/log/server" # 日志文件存储目录路径，建议使用绝对路径。默认为空，表示关闭 - logStdout: true # 日志是否输出到终端。默认为true - errorStack: true # 当Server捕获到异常时是否记录堆栈信息到日志中。默认为true - errorLogEnabled: true # 是否记录异常日志信息到日志中。默认为true - errorLogPattern: "error-{Ymd}.log" # 异常错误日志文件格式。默认为"error-{Ymd}.log" - accessLogEnabled: true # 是否记录访问日志。默认为false - accessLogPattern: "access-{Ymd}.log" # 访问日志文件格式。默认为"access-{Ymd}.log" - -logger: - path: "resource/log/run" - file: "{Y-m-d}.log" - level: "all" - stdout: true - -# Database. -database: - default: - - type: "pgsql" - host: "116.204.74.41" - port: "15432" - user: "postgres" - pass: "Bjang09@686^*^" - name: "admin" - role: "master" - maxIdle: "5" - maxOpen: "20" - maxLifetime: "60s" - charset : "utf8mb4" #数据库编码 - debug : true - dryRun : false #空跑 - - type: "pgsql" - host: "116.204.74.41" - port: "15432" - user: "postgres" - pass: "Bjang09@686^*^" - name: "admin" - role: "slave" - maxIdle: "5" - maxOpen: "20" - maxLifetime: "60s" - charset: "utf8mb4" #数据库编码 - debug: true - dryRun: false #空跑 -gfToken: - cacheKey: "gfToken:" - timeOut: 10800 - maxRefresh: 5400 - multiLogin: true - encryptKey: "49c54195e750b04e74a8429b17896586" - cacheModel: "redis" #缓存模式 memory OR redis OR dist - distPath: "./resource/data/distTokenDb" #使用磁盘缓存时配置数据缓存的目录 - excludePaths: - - "/api/v1/system/login" - - -# Redis 配置示例 -redis: - # 单实例配置 - default: - address: 116.204.74.41:6379 - db: 1 - idleTimeout: "60s" #连接最大空闲时间，使用时间字符串例如30s/1m/1d - maxConnLifetime: "90s" #连接最长存活时间，使用时间字符串例如30s/1m/1d - waitTimeout: "60s" #等待连接池连接的超时时间，使用时间字符串例如30s/1m/1d - dialTimeout: "30s" #TCP连接的超时时间，使用时间字符串例如30s/1m/1d - readTimeout: "30s" #TCP的Read操作超时时间，使用时间字符串例如30s/1m/1d - writeTimeout: "30s" #TCP的Write操作超时时间，使用时间字符串例如30s/1m/1d - maxActive: 100 - pass: "Bjang09@686^*^" - -system: - notCheckAuthAdminIds: [1] #无需验证后台权限的用户id - dataDir: "./resource/data" - cache: - model: "redis" #缓存模式 memory OR redis OR dist - distPath: "./resource/data/distCacheDb" #使用磁盘缓存时配置数据缓存的目录 - prefix: "gFastV3Cache:" #缓存前缀 - -#casbin配置 -casbin: - modelFile: "./resource/casbin/rbac_model.conf" - policyFile: "./resource/casbin/rbac_policy.csv" - - -# CLI. -gfcli: - gen: - dao: - - link: "mysql:gfast3:gfast333@tcp(192.168.0.212:3306)/gfast-v32" - tables: "tools_gen_table,tools_gen_table_column" - removePrefix: "gf_" - descriptionTag: true - noModelComment: true - path: "./internal/app/system" - -# 文件上传服务地址，与oss模块minio中的endpoint(filePrefix需要加http://)一致 -filePrefix: "http://172.17.0.3:9000" - -consul: - address: 116.204.74.41:8500 - -jaeger: #链路追踪 - addr: 116.204.74.41:4318 \ No newline at end of file diff --git a/manifest/config/config-master.yaml b/manifest/config/config-master.yaml deleted file mode 100644 index 27494e0..0000000 --- a/manifest/config/config-master.yaml +++ /dev/null @@ -1,115 +0,0 @@ -server: - name: "admin-go" - address: ":9001" - serverRoot: "resource/public" - dumpRouterMap: false - routeOverWrite: true - openapiPath: "/api.json" - swaggerPath: "/swagger" - NameToUriType: 3 - maxHeaderBytes: "20KB" - clientMaxBodySize: "50MB" - # Logging配置 - logPath: "resource/log/server" # 日志文件存储目录路径，建议使用绝对路径。默认为空，表示关闭 - logStdout: true # 日志是否输出到终端。默认为true - errorStack: true # 当Server捕获到异常时是否记录堆栈信息到日志中。默认为true - errorLogEnabled: true # 是否记录异常日志信息到日志中。默认为true - errorLogPattern: "error-{Ymd}.log" # 异常错误日志文件格式。默认为"error-{Ymd}.log" - accessLogEnabled: true # 是否记录访问日志。默认为false - accessLogPattern: "access-{Ymd}.log" # 访问日志文件格式。默认为"access-{Ymd}.log" - -logger: - path: "resource/log/run" - file: "{Y-m-d}.log" - level: "all" - stdout: true - -# Database. -database: - default: - - type: "pgsql" - host: "192.168.0.169" - port: "15432" - user: "postgres" - pass: "Bjang09@686^*^" - name: "admin" - role: "master" - maxIdle: "5" - maxOpen: "20" - maxLifetime: "60s" - charset : "utf8mb4" #数据库编码 - debug : true - dryRun : false #空跑 - - type: "pgsql" - host: "192.168.0.169" - port: "15432" - user: "postgres" - pass: "Bjang09@686^*^" - name: "admin" - role: "slave" - maxIdle: "5" - maxOpen: "20" - maxLifetime: "60s" - charset: "utf8mb4" #数据库编码 - debug: true - dryRun: false #空跑 -gfToken: - cacheKey: "gfToken:" - timeOut: 10800 - maxRefresh: 5400 - multiLogin: true - encryptKey: "49c54195e750b04e74a8429b17896586" - cacheModel: "redis" #缓存模式 memory OR redis OR dist - distPath: "./resource/data/distTokenDb" #使用磁盘缓存时配置数据缓存的目录 - excludePaths: - - "/api/v1/system/login" - - -# Redis 配置示例 -redis: - # 单实例配置 - default: - address: 192.168.0.169:6379 - db: 1 - idleTimeout: "60s" #连接最大空闲时间，使用时间字符串例如30s/1m/1d - maxConnLifetime: "90s" #连接最长存活时间，使用时间字符串例如30s/1m/1d - waitTimeout: "60s" #等待连接池连接的超时时间，使用时间字符串例如30s/1m/1d - dialTimeout: "30s" #TCP连接的超时时间，使用时间字符串例如30s/1m/1d - readTimeout: "30s" #TCP的Read操作超时时间，使用时间字符串例如30s/1m/1d - writeTimeout: "30s" #TCP的Write操作超时时间，使用时间字符串例如30s/1m/1d - maxActive: 100 - pass: "Bjang09@686^*^" - -system: - notCheckAuthAdminIds: [1] #无需验证后台权限的用户id - dataDir: "./resource/data" - cache: - model: "redis" #缓存模式 memory OR redis OR dist - distPath: "./resource/data/distCacheDb" #使用磁盘缓存时配置数据缓存的目录 - prefix: "gFastV3Cache:" #缓存前缀 - -#casbin配置 -casbin: - modelFile: "./resource/casbin/rbac_model.conf" - policyFile: "./resource/casbin/rbac_policy.csv" - - -# CLI. -gfcli: - gen: - dao: - - link: "mysql:gfast3:gfast333@tcp(192.168.0.212:3306)/gfast-v32" - tables: "tools_gen_table,tools_gen_table_column" - removePrefix: "gf_" - descriptionTag: true - noModelComment: true - path: "./internal/app/system" - -# 文件上传服务地址，与oss模块minio中的endpoint(filePrefix需要加http://)一致 -filePrefix: "http://172.17.0.3:9000" - -consul: - address: 192.168.0.169:8500 - -jaeger: #链路追踪 - addr: 192.168.0.169:4318 \ No newline at end of file