From f1069603428110f0709e53f3553770f6591bc98f Mon Sep 17 00:00:00 2001 From: Echo <1711788888@qq.com> Date: Fri, 10 Apr 2026 15:38:58 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=B8=85=E7=90=86=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 10 +- SECURITY.md | 5 - .../server/gva-server-configmap.yaml | 8 +- .../server/gva-server-deployment.yaml | 2 +- server/Dockerfile | 14 +- server/api/v1/common/enter.go | 2 +- .../api/v1/common/exa_attachment_category.go | 8 +- .../api/v1/common/exa_breakpoint_continue.go | 10 +- .../api/v1/common/exa_file_upload_download.go | 10 +- server/api/v1/enter.go | 4 +- server/api/v1/system/enter.go | 2 +- server/api/v1/system/mcp.go | 10 +- server/api/v1/system/sys_api.go | 14 +- server/api/v1/system/sys_api_token.go | 8 +- server/api/v1/system/sys_authority.go | 12 +- server/api/v1/system/sys_authority_btn.go | 6 +- server/api/v1/system/sys_captcha.go | 6 +- server/api/v1/system/sys_casbin.go | 10 +- server/api/v1/system/sys_dictionary.go | 8 +- server/api/v1/system/sys_dictionary_detail.go | 20 +- server/api/v1/system/sys_error.go | 8 +- server/api/v1/system/sys_export_template.go | 40 +- server/api/v1/system/sys_initdb.go | 6 +- server/api/v1/system/sys_jwt_blacklist.go | 8 +- server/api/v1/system/sys_login_log.go | 10 +- server/api/v1/system/sys_menu.go | 14 +- server/api/v1/system/sys_operation_record.go | 12 +- server/api/v1/system/sys_params.go | 8 +- server/api/v1/system/sys_system.go | 10 +- server/api/v1/system/sys_user.go | 26 +- server/api/v1/system/sys_version.go | 16 +- server/cmd/mcp/config.go | 4 +- server/cmd/mcp/config.yaml | 4 - server/cmd/mcp/logger.go | 2 +- server/cmd/mcp/main.go | 4 +- server/config.docker.yaml | 16 +- server/core/internal/zap_core.go | 17 +- server/core/server.go | 8 +- server/core/viper.go | 4 +- server/core/zap.go | 18 +- server/docs/docs.go | 2 +- server/global/global.go | 4 +- server/go.mod | 42 +- server/go.sum | 286 +------- server/initialize/db_list.go | 4 +- server/initialize/ensure_tables.go | 6 +- server/initialize/gorm.go | 6 +- server/initialize/gorm_biz.go | 2 +- server/initialize/gorm_mssql.go | 6 +- server/initialize/gorm_mysql.go | 6 +- server/initialize/gorm_oracle.go | 6 +- server/initialize/gorm_pgsql.go | 6 +- server/initialize/gorm_sqlite.go | 6 +- server/initialize/init.go | 2 +- server/initialize/internal/gorm.go | 2 +- .../initialize/internal/gorm_logger_writer.go | 4 +- server/initialize/mongo.go | 6 +- server/initialize/other.go | 4 +- server/initialize/redis.go | 4 +- server/initialize/register_init.go | 4 +- server/initialize/reload.go | 2 +- server/initialize/router.go | 10 +- server/initialize/router_biz.go | 2 +- server/initialize/timer.go | 4 +- server/initialize/validator.go | 2 +- server/main.go | 6 +- server/mcp/api_creator.go | 6 +- server/mcp/api_lister.go | 4 +- server/mcp/client/client_test.go | 13 +- server/mcp/context.go | 2 +- server/mcp/dictionary_generator.go | 2 +- server/mcp/dictionary_http.go | 4 +- server/mcp/dictionary_query.go | 2 +- server/mcp/http_client.go | 2 +- server/mcp/menu_creator.go | 2 +- server/mcp/menu_lister.go | 2 +- server/mcp/server.go | 2 +- server/mcp/standalone_manager.go | 2 +- server/middleware/casbin_rbac.go | 6 +- server/middleware/cors.go | 4 +- server/middleware/error.go | 6 +- server/middleware/jwt.go | 6 +- server/middleware/limit_ip.go | 4 +- server/middleware/operation.go | 6 +- .../model/common/exa_attachment_category.go | 2 +- .../model/common/exa_breakpoint_continue.go | 2 +- .../model/common/exa_file_upload_download.go | 2 +- .../response/exa_breakpoint_continue.go | 2 +- .../response/exa_file_upload_download.go | 2 +- server/model/system/request/sys_api.go | 10 +- server/model/system/request/sys_api_token.go | 6 +- .../system/request/sys_dictionary_detail.go | 4 +- server/model/system/request/sys_error.go | 13 +- .../system/request/sys_export_template.go | 4 +- server/model/system/request/sys_init.go | 2 +- server/model/system/request/sys_login_log.go | 4 +- server/model/system/request/sys_menu.go | 4 +- .../system/request/sys_operation_record.go | 4 +- server/model/system/request/sys_params.go | 2 +- server/model/system/request/sys_user.go | 4 +- server/model/system/request/sys_version.go | 12 +- server/model/system/response/sys_api.go | 2 +- server/model/system/response/sys_authority.go | 2 +- server/model/system/response/sys_casbin.go | 2 +- server/model/system/response/sys_menu.go | 2 +- server/model/system/response/sys_system.go | 2 +- server/model/system/response/sys_user.go | 2 +- server/model/system/response/sys_version.go | 4 +- server/model/system/sys_api.go | 2 +- server/model/system/sys_api_token.go | 2 +- server/model/system/sys_base_menu.go | 40 +- server/model/system/sys_dictionary.go | 2 +- server/model/system/sys_dictionary_detail.go | 2 +- server/model/system/sys_error.go | 2 +- server/model/system/sys_export_template.go | 2 +- server/model/system/sys_jwt_blacklist.go | 2 +- server/model/system/sys_login_log.go | 16 +- server/model/system/sys_menu_btn.go | 2 +- server/model/system/sys_operation_record.go | 2 +- server/model/system/sys_params.go | 2 +- server/model/system/sys_system.go | 2 +- server/model/system/sys_user.go | 4 +- server/model/system/sys_version.go | 10 +- server/resource/function/api.go.tpl | 20 - server/resource/function/api.js.tpl | 13 - server/resource/function/server.go.tpl | 14 - server/resource/package/readme.txt.tpl | 7 - server/resource/package/server/api/api.go.tpl | 260 ------- .../resource/package/server/api/enter.go.tpl | 4 - .../package/server/model/model.go.tpl | 75 -- .../server/model/request/request.go.tpl | 39 - .../package/server/router/enter.go.tpl | 4 - .../package/server/router/router.go.tpl | 42 -- .../package/server/service/enter.go.tpl | 4 - .../package/server/service/service.go.tpl | 213 ------ server/resource/package/web/api/api.js.tpl | 130 ---- server/resource/package/web/view/form.vue.tpl | 274 ------- .../resource/package/web/view/table.vue.tpl | 694 ------------------ server/router/common/enter.go | 2 +- server/router/enter.go | 4 +- server/router/system/enter.go | 2 +- server/router/system/sys_api.go | 8 +- server/router/system/sys_api_token.go | 4 +- server/router/system/sys_authority.go | 4 +- server/router/system/sys_casbin.go | 2 +- server/router/system/sys_dictionary.go | 2 +- server/router/system/sys_dictionary_detail.go | 2 +- server/router/system/sys_error.go | 34 +- server/router/system/sys_export_template.go | 4 +- server/router/system/sys_login_log.go | 4 +- server/router/system/sys_menu.go | 2 +- server/router/system/sys_params.go | 2 +- server/router/system/sys_system.go | 2 +- server/router/system/sys_user.go | 2 +- server/router/system/sys_version.go | 2 +- .../service/common/exa_attachment_category.go | 4 +- .../service/common/exa_breakpoint_continue.go | 4 +- .../common/exa_file_upload_download.go | 8 +- server/service/enter.go | 4 +- server/service/system/jwt_black_list.go | 4 +- server/service/system/mcp.go | 2 +- server/service/system/sys_api.go | 8 +- server/service/system/sys_api_token.go | 8 +- server/service/system/sys_authority.go | 10 +- server/service/system/sys_authority_btn.go | 8 +- server/service/system/sys_base_menu.go | 4 +- server/service/system/sys_casbin.go | 6 +- server/service/system/sys_dictionary.go | 6 +- .../service/system/sys_dictionary_detail.go | 12 +- server/service/system/sys_error.go | 6 +- server/service/system/sys_export_template.go | 10 +- server/service/system/sys_initdb.go | 4 +- server/service/system/sys_initdb_mssql.go | 8 +- server/service/system/sys_initdb_mysql.go | 8 +- server/service/system/sys_initdb_pgsql.go | 8 +- server/service/system/sys_initdb_sqlite.go | 8 +- server/service/system/sys_login_log.go | 8 +- server/service/system/sys_menu.go | 6 +- server/service/system/sys_operation_record.go | 8 +- server/service/system/sys_params.go | 6 +- server/service/system/sys_system.go | 8 +- server/service/system/sys_user.go | 10 +- server/service/system/sys_version.go | 6 +- server/source/common/file_upload_download.go | 4 +- server/source/system/api.go | 4 +- server/source/system/api_ignore.go | 4 +- server/source/system/authorities_menus.go | 4 +- server/source/system/authority.go | 6 +- server/source/system/casbin.go | 2 +- server/source/system/dictionary.go | 4 +- server/source/system/dictionary_detail.go | 4 +- server/source/system/excel_template.go | 4 +- server/source/system/menu.go | 4 +- server/source/system/user.go | 6 +- server/task/clearTable.go | 3 +- server/utils/ast/ast.go | 2 +- server/utils/ast/ast_gorm.go | 2 +- server/utils/ast/ast_init_test.go | 2 +- server/utils/ast/ast_rollback.go | 2 +- server/utils/ast/ast_test.go | 2 +- server/utils/ast/package_enter_test.go | 14 +- .../utils/ast/package_initialize_gorm_test.go | 18 +- .../ast/package_initialize_router_test.go | 10 +- server/utils/ast/package_module_enter_test.go | 10 +- server/utils/ast/plugin_enter_test.go | 13 +- server/utils/ast/plugin_gen_test.go | 13 +- .../utils/ast/plugin_initialize_gorm_test.go | 15 +- .../ast/plugin_initialize_router_test.go | 13 +- server/utils/ast/plugin_initialize_v2_test.go | 9 +- server/utils/captcha/redis.go | 2 +- server/utils/casbin_util.go | 2 +- server/utils/claims.go | 6 +- server/utils/directory.go | 2 +- server/utils/fmt_plus.go | 2 +- server/utils/json_test.go | 14 +- server/utils/jwt.go | 4 +- server/utils/server.go | 18 +- server/utils/validator_test.go | 2 +- web-admin/eslint.config.js | 6 + web-admin/src/App.tsx | 58 +- web-admin/vite.config.ts | 30 + 221 files changed, 686 insertions(+), 2801 deletions(-) delete mode 100644 SECURITY.md delete mode 100644 server/resource/function/api.go.tpl delete mode 100644 server/resource/function/api.js.tpl delete mode 100644 server/resource/function/server.go.tpl delete mode 100644 server/resource/package/readme.txt.tpl delete mode 100644 server/resource/package/server/api/api.go.tpl delete mode 100644 server/resource/package/server/api/enter.go.tpl delete mode 100644 server/resource/package/server/model/model.go.tpl delete mode 100644 server/resource/package/server/model/request/request.go.tpl delete mode 100644 server/resource/package/server/router/enter.go.tpl delete mode 100644 server/resource/package/server/router/router.go.tpl delete mode 100644 server/resource/package/server/service/enter.go.tpl delete mode 100644 server/resource/package/server/service/service.go.tpl delete mode 100644 server/resource/package/web/api/api.js.tpl delete mode 100644 server/resource/package/web/view/form.vue.tpl delete mode 100644 server/resource/package/web/view/table.vue.tpl diff --git a/Makefile b/Makefile index 9135c9a..490df4c 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,10 @@ SHELL = /bin/bash BUILD_IMAGE_SERVER = golang:1.22 #请选择node版本 BUILD_IMAGE_WEB = node:20 +#当前启用的管理后台前端目录 +WEB_DIR ?= web-admin #项目名称 -PROJECT_NAME = github.com/flipped-aurora/gin-vue-admin/server +PROJECT_NAME = git.echol.cn/loser/Go-Web-Template/server #配置文件目录 CONFIG_FILE = config.yaml #镜像仓库命名空间 @@ -41,12 +43,12 @@ build-image-server: build-local: if [ -d "build" ];then rm -rf build; else echo "OK!"; fi \ && if [ -f "/.dockerenv" ];then echo "OK!"; else make build-web-local && make build-server-local; fi \ - && mkdir build && cp -r web/dist build/ && cp server/server build/ && cp -r server/resource build/resource + && mkdir build && cp -r $(WEB_DIR)/dist build/ && cp server/server build/ && cp -r server/resource build/resource #本地环境打包前端 build-web-local: - @cd web/ && if [ -d "dist" ];then rm -rf dist; else echo "OK!"; fi \ - && yarn config set registry http://mirrors.cloud.tencent.com/npm/ && yarn install && yarn build + @cd $(WEB_DIR)/ && if [ -d "dist" ];then rm -rf dist; else echo "OK!"; fi \ + && if [ -f "package-lock.json" ]; then npm ci && npm run build; else yarn config set registry http://mirrors.cloud.tencent.com/npm/ && yarn install && yarn build; fi #本地环境打包后端 build-server-local: diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index db76aea..0000000 --- a/SECURITY.md +++ /dev/null @@ -1,5 +0,0 @@ -# Security Policy - -## Reporting a Vulnerability - -Please report security issues to qimiaojiangjizhao@gmail.com diff --git a/deploy/kubernetes/server/gva-server-configmap.yaml b/deploy/kubernetes/server/gva-server-configmap.yaml index fb889fb..e75b5c7 100644 --- a/deploy/kubernetes/server/gva-server-configmap.yaml +++ b/deploy/kubernetes/server/gva-server-configmap.yaml @@ -11,7 +11,7 @@ metadata: version: gva-vue3 data: config.yaml: | - # github.com/flipped-aurora/gin-vue-admin/server Global Configuration + # git.echol.cn/loser/Go-Web-Template/server Global Configuration # jwt configuration jwt: @@ -23,7 +23,7 @@ data: zap: level: 'info' format: 'console' - prefix: '[github.com/flipped-aurora/gin-vue-admin/server]' + prefix: '[git.echol.cn/loser/Go-Web-Template/server]' director: 'log' link-name: 'latest_log' show-line: true @@ -66,7 +66,7 @@ data: img-height: 80 # mysql connect configuration - # 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://www.github.com/flipped-aurora/gin-vue-admin/server.com/docs/first） + # 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://www.git.echol.cn/loser/Go-Web-Template/server.com/docs/first） mysql: path: '' config: '' @@ -126,7 +126,7 @@ data: secret-id: 'xxxxxxxx' secret-key: 'xxxxxxxx' base-url: 'https://gin.vue.admin' - path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server' + path-prefix: 'git.echol.cn/loser/Go-Web-Template/server' # excel configuration excel: diff --git a/deploy/kubernetes/server/gva-server-deployment.yaml b/deploy/kubernetes/server/gva-server-deployment.yaml index 7da9d20..b0cc15c 100644 --- a/deploy/kubernetes/server/gva-server-deployment.yaml +++ b/deploy/kubernetes/server/gva-server-deployment.yaml @@ -29,7 +29,7 @@ spec: - containerPort: 8888 name: http volumeMounts: - - mountPath: /go/src/github.com/flipped-aurora/gin-vue-admin/server/config.docker.yaml + - mountPath: /go/src/git.echol.cn/loser/Go-Web-Template/server/config.docker.yaml name: config subPath: config.yaml - mountPath: /etc/localtime diff --git a/server/Dockerfile b/server/Dockerfile index 69cb44d..c905f6b 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,6 +1,6 @@ FROM golang:alpine as builder -WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server +WORKDIR /go/src/git.echol.cn/loser/Go-Web-Template/server COPY . . RUN go env -w GO111MODULE=on \ @@ -18,14 +18,14 @@ ENV TZ=Asia/Shanghai RUN apk update && apk add --no-cache tzdata openntpd \ && ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server +WORKDIR /go/src/git.echol.cn/loser/Go-Web-Template/server -COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/server ./ -COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/resource ./resource/ -COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/config.docker.yaml ./ +COPY --from=0 /go/src/git.echol.cn/loser/Go-Web-Template/server/server ./ +COPY --from=0 /go/src/git.echol.cn/loser/Go-Web-Template/server/resource ./resource/ +COPY --from=0 /go/src/git.echol.cn/loser/Go-Web-Template/server/config.docker.yaml ./ -# 挂载目录：如果使用了sqlite数据库，容器命令示例：docker run -d -v /宿主机路径/gva.db:/go/src/github.com/flipped-aurora/gin-vue-admin/server/gva.db -p 8888:8888 --name gva-server-v1 gva-server:1.0 -# VOLUME ["/go/src/github.com/flipped-aurora/gin-vue-admin/server"] +# 挂载目录：如果使用了sqlite数据库，容器命令示例：docker run -d -v /宿主机路径/gva.db:/go/src/git.echol.cn/loser/Go-Web-Template/server/gva.db -p 8888:8888 --name gva-server-v1 gva-server:1.0 +# VOLUME ["/go/src/git.echol.cn/loser/Go-Web-Template/server"] EXPOSE 8888 ENTRYPOINT ./server -c config.docker.yaml diff --git a/server/api/v1/common/enter.go b/server/api/v1/common/enter.go index 1537608..d061751 100644 --- a/server/api/v1/common/enter.go +++ b/server/api/v1/common/enter.go @@ -1,6 +1,6 @@ package common -import "github.com/flipped-aurora/gin-vue-admin/server/service" +import "git.echol.cn/loser/Go-Web-Template/server/service" type ApiGroup struct { AttachmentCategoryApi diff --git a/server/api/v1/common/exa_attachment_category.go b/server/api/v1/common/exa_attachment_category.go index ee4da81..45123dd 100644 --- a/server/api/v1/common/exa_attachment_category.go +++ b/server/api/v1/common/exa_attachment_category.go @@ -1,10 +1,10 @@ package common import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - commonModel "github.com/flipped-aurora/gin-vue-admin/server/model/common" - common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/global" + commonModel "git.echol.cn/loser/Go-Web-Template/server/model/common" + common "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/common/exa_breakpoint_continue.go b/server/api/v1/common/exa_breakpoint_continue.go index 6012c78..b4d7299 100644 --- a/server/api/v1/common/exa_breakpoint_continue.go +++ b/server/api/v1/common/exa_breakpoint_continue.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "github.com/flipped-aurora/gin-vue-admin/server/global" - commonModel "github.com/flipped-aurora/gin-vue-admin/server/model/common" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - commonRes "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + commonModel "git.echol.cn/loser/Go-Web-Template/server/model/common" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + commonRes "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/common/exa_file_upload_download.go b/server/api/v1/common/exa_file_upload_download.go index aa3d778..cfb220a 100644 --- a/server/api/v1/common/exa_file_upload_download.go +++ b/server/api/v1/common/exa_file_upload_download.go @@ -1,11 +1,11 @@ package common import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - commonModel "github.com/flipped-aurora/gin-vue-admin/server/model/common" - commonReq "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - commonRes "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/global" + commonModel "git.echol.cn/loser/Go-Web-Template/server/model/common" + commonReq "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + commonRes "git.echol.cn/loser/Go-Web-Template/server/model/common/response" "github.com/gin-gonic/gin" "go.uber.org/zap" "strconv" diff --git a/server/api/v1/enter.go b/server/api/v1/enter.go index 47292f2..ea2b2eb 100644 --- a/server/api/v1/enter.go +++ b/server/api/v1/enter.go @@ -1,8 +1,8 @@ package v1 import ( - "github.com/flipped-aurora/gin-vue-admin/server/api/v1/common" - "github.com/flipped-aurora/gin-vue-admin/server/api/v1/system" + "git.echol.cn/loser/Go-Web-Template/server/api/v1/common" + "git.echol.cn/loser/Go-Web-Template/server/api/v1/system" ) var ApiGroupApp = new(ApiGroup) diff --git a/server/api/v1/system/enter.go b/server/api/v1/system/enter.go index d77fc00..035a2b1 100644 --- a/server/api/v1/system/enter.go +++ b/server/api/v1/system/enter.go @@ -1,6 +1,6 @@ package system -import "github.com/flipped-aurora/gin-vue-admin/server/service" +import "git.echol.cn/loser/Go-Web-Template/server/service" type ApiGroup struct { DBApi diff --git a/server/api/v1/system/mcp.go b/server/api/v1/system/mcp.go index 7eb597d..76c1c7e 100644 --- a/server/api/v1/system/mcp.go +++ b/server/api/v1/system/mcp.go @@ -3,11 +3,11 @@ package system import ( "strings" - "github.com/flipped-aurora/gin-vue-admin/server/global" - mcpTool "github.com/flipped-aurora/gin-vue-admin/server/mcp" - "github.com/flipped-aurora/gin-vue-admin/server/mcp/client" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + mcpTool "git.echol.cn/loser/Go-Web-Template/server/mcp" + "git.echol.cn/loser/Go-Web-Template/server/mcp/client" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/server/api/v1/system/sys_api.go b/server/api/v1/system/sys_api.go index 97a07b0..0fea513 100644 --- a/server/api/v1/system/sys_api.go +++ b/server/api/v1/system/sys_api.go @@ -1,13 +1,13 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_api_token.go b/server/api/v1/system/sys_api_token.go index 14582d8..3ed628d 100644 --- a/server/api/v1/system/sys_api_token.go +++ b/server/api/v1/system/sys_api_token.go @@ -1,10 +1,10 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - sysReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + sysReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_authority.go b/server/api/v1/system/sys_authority.go index 1a4c101..bf80b79 100644 --- a/server/api/v1/system/sys_authority.go +++ b/server/api/v1/system/sys_authority.go @@ -1,12 +1,12 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_authority_btn.go b/server/api/v1/system/sys_authority_btn.go index 94f02a0..9db19a7 100644 --- a/server/api/v1/system/sys_authority_btn.go +++ b/server/api/v1/system/sys_authority_btn.go @@ -1,9 +1,9 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_captcha.go b/server/api/v1/system/sys_captcha.go index b9f2110..f8d59a6 100644 --- a/server/api/v1/system/sys_captcha.go +++ b/server/api/v1/system/sys_captcha.go @@ -3,9 +3,9 @@ package system import ( "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" "github.com/gin-gonic/gin" "github.com/mojocn/base64Captcha" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_casbin.go b/server/api/v1/system/sys_casbin.go index c1bf548..e5d90aa 100644 --- a/server/api/v1/system/sys_casbin.go +++ b/server/api/v1/system/sys_casbin.go @@ -1,11 +1,11 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_dictionary.go b/server/api/v1/system/sys_dictionary.go index 9673e7f..e5cf3c3 100644 --- a/server/api/v1/system/sys_dictionary.go +++ b/server/api/v1/system/sys_dictionary.go @@ -1,10 +1,10 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_dictionary_detail.go b/server/api/v1/system/sys_dictionary_detail.go index 6be069f..15d4647 100644 --- a/server/api/v1/system/sys_dictionary_detail.go +++ b/server/api/v1/system/sys_dictionary_detail.go @@ -3,11 +3,11 @@ package system import ( "strconv" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) @@ -172,7 +172,7 @@ func (s *DictionaryDetailApi) GetDictionaryTreeList(c *gin.Context) { } else { id = uint(idUint64) } - + list, err := dictionaryDetailService.GetDictionaryTreeList(id) if err != nil { global.GVA_LOG.Error("获取失败!", zap.Error(err)) @@ -197,7 +197,7 @@ func (s *DictionaryDetailApi) GetDictionaryTreeListByType(c *gin.Context) { response.FailWithMessage("字典类型不能为空", c) return } - + list, err := dictionaryDetailService.GetDictionaryTreeListByType(dictType) if err != nil { global.GVA_LOG.Error("获取失败!", zap.Error(err)) @@ -223,7 +223,7 @@ func (s *DictionaryDetailApi) GetDictionaryDetailsByParent(c *gin.Context) { response.FailWithMessage(err.Error(), c) return } - + list, err := dictionaryDetailService.GetDictionaryDetailsByParent(req) if err != nil { global.GVA_LOG.Error("获取失败!", zap.Error(err)) @@ -248,7 +248,7 @@ func (s *DictionaryDetailApi) GetDictionaryPath(c *gin.Context) { response.FailWithMessage("字典详情ID不能为空", c) return } - + var id uint if idUint64, err := strconv.ParseUint(idStr, 10, 32); err != nil { response.FailWithMessage("字典详情ID格式错误", c) @@ -256,7 +256,7 @@ func (s *DictionaryDetailApi) GetDictionaryPath(c *gin.Context) { } else { id = uint(idUint64) } - + path, err := dictionaryDetailService.GetDictionaryPath(id) if err != nil { global.GVA_LOG.Error("获取失败!", zap.Error(err)) diff --git a/server/api/v1/system/sys_error.go b/server/api/v1/system/sys_error.go index 966cd50..405e4c7 100644 --- a/server/api/v1/system/sys_error.go +++ b/server/api/v1/system/sys_error.go @@ -1,10 +1,10 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_export_template.go b/server/api/v1/system/sys_export_template.go index 604309d..98512c3 100644 --- a/server/api/v1/system/sys_export_template.go +++ b/server/api/v1/system/sys_export_template.go @@ -7,13 +7,13 @@ import ( "sync" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/service" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/service" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) @@ -61,21 +61,21 @@ var sysExportTemplateService = service.ServiceGroupApp.SystemServiceGroup.SysExp // @Success 200 {object} response.Response{data=map[string]string} "获取成功" // @Router /sysExportTemplate/previewSQL [get] func (sysExportTemplateApi *SysExportTemplateApi) PreviewSQL(c *gin.Context) { - templateID := c.Query("templateID") - if templateID == "" { - response.FailWithMessage("模板ID不能为空", c) - return - } + templateID := c.Query("templateID") + if templateID == "" { + response.FailWithMessage("模板ID不能为空", c) + return + } - // 直接复用导出接口的参数组织方式：使用 URL Query，其中 params 为内部编码的查询字符串 - queryParams := c.Request.URL.Query() + // 直接复用导出接口的参数组织方式：使用 URL Query，其中 params 为内部编码的查询字符串 + queryParams := c.Request.URL.Query() - if sqlPreview, err := sysExportTemplateService.PreviewSQL(templateID, queryParams); err != nil { - global.GVA_LOG.Error("获取失败!", zap.Error(err)) - response.FailWithMessage("获取失败", c) - } else { - response.OkWithData(gin.H{"sql": sqlPreview}, c) - } + if sqlPreview, err := sysExportTemplateService.PreviewSQL(templateID, queryParams); err != nil { + global.GVA_LOG.Error("获取失败!", zap.Error(err)) + response.FailWithMessage("获取失败", c) + } else { + response.OkWithData(gin.H{"sql": sqlPreview}, c) + } } // CreateSysExportTemplate 创建导出模板 diff --git a/server/api/v1/system/sys_initdb.go b/server/api/v1/system/sys_initdb.go index 5f740c6..7e6db67 100644 --- a/server/api/v1/system/sys_initdb.go +++ b/server/api/v1/system/sys_initdb.go @@ -1,9 +1,9 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "go.uber.org/zap" "github.com/gin-gonic/gin" diff --git a/server/api/v1/system/sys_jwt_blacklist.go b/server/api/v1/system/sys_jwt_blacklist.go index f66c155..75b75c3 100644 --- a/server/api/v1/system/sys_jwt_blacklist.go +++ b/server/api/v1/system/sys_jwt_blacklist.go @@ -1,10 +1,10 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_login_log.go b/server/api/v1/system/sys_login_log.go index 6a6b391..001cbeb 100644 --- a/server/api/v1/system/sys_login_log.go +++ b/server/api/v1/system/sys_login_log.go @@ -1,11 +1,11 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_menu.go b/server/api/v1/system/sys_menu.go index 0802708..5d8f6fb 100644 --- a/server/api/v1/system/sys_menu.go +++ b/server/api/v1/system/sys_menu.go @@ -1,13 +1,13 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_operation_record.go b/server/api/v1/system/sys_operation_record.go index c88511f..144309c 100644 --- a/server/api/v1/system/sys_operation_record.go +++ b/server/api/v1/system/sys_operation_record.go @@ -1,12 +1,12 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_params.go b/server/api/v1/system/sys_params.go index 45fb1df..34e21c5 100644 --- a/server/api/v1/system/sys_params.go +++ b/server/api/v1/system/sys_params.go @@ -1,10 +1,10 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_system.go b/server/api/v1/system/sys_system.go index 6dabb0a..40b3fe6 100644 --- a/server/api/v1/system/sys_system.go +++ b/server/api/v1/system/sys_system.go @@ -1,11 +1,11 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go index 12b2849..1ff5daf 100644 --- a/server/api/v1/system/sys_user.go +++ b/server/api/v1/system/sys_user.go @@ -4,14 +4,14 @@ import ( "strconv" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "github.com/redis/go-redis/v9" "go.uber.org/zap" @@ -108,11 +108,11 @@ func (b *BaseApi) TokenNext(c *gin.Context, user system.SysUser) { } // 记录登录成功日志 loginLogService.CreateLoginLog(system.SysLoginLog{ - Username: user.Username, - Ip: c.ClientIP(), - Agent: c.Request.UserAgent(), - Status: true, - UserID: user.ID, + Username: user.Username, + Ip: c.ClientIP(), + Agent: c.Request.UserAgent(), + Status: true, + UserID: user.ID, ErrorMessage: "登录成功", }) if !global.GVA_CONFIG.System.UseMultipoint { diff --git a/server/api/v1/system/sys_version.go b/server/api/v1/system/sys_version.go index 1e22808..edbb884 100644 --- a/server/api/v1/system/sys_version.go +++ b/server/api/v1/system/sys_version.go @@ -8,12 +8,12 @@ import ( "strconv" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) @@ -302,7 +302,7 @@ func (sysVersionApi *SysVersionApi) ExportVersion(c *gin.Context) { Status: dict.Status, Desc: dict.Desc, } - + // 处理字典详情数据，清除ID和时间戳字段 cleanDetails := make([]system.SysDictionaryDetail, 0, len(dict.SysDictionaryDetails)) for _, detail := range dict.SysDictionaryDetails { @@ -317,7 +317,7 @@ func (sysVersionApi *SysVersionApi) ExportVersion(c *gin.Context) { cleanDetails = append(cleanDetails, cleanDetail) } cleanDict.SysDictionaryDetails = cleanDetails - + processedDicts = append(processedDicts, cleanDict) } diff --git a/server/cmd/mcp/config.go b/server/cmd/mcp/config.go index dd644c4..c0ecf2d 100644 --- a/server/cmd/mcp/config.go +++ b/server/cmd/mcp/config.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" "gopkg.in/yaml.v3" ) diff --git a/server/cmd/mcp/config.yaml b/server/cmd/mcp/config.yaml index 84fd082..6f34e0d 100644 --- a/server/cmd/mcp/config.yaml +++ b/server/cmd/mcp/config.yaml @@ -8,7 +8,3 @@ mcp: auth_header: x-token request_timeout: 15 -autocode: - root: ../../.. - server: server - web: web/src diff --git a/server/cmd/mcp/logger.go b/server/cmd/mcp/logger.go index ebeaf7c..08e2936 100644 --- a/server/cmd/mcp/logger.go +++ b/server/cmd/mcp/logger.go @@ -1,7 +1,7 @@ package main import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "go.uber.org/zap" ) diff --git a/server/cmd/mcp/main.go b/server/cmd/mcp/main.go index ef7c353..8854a82 100644 --- a/server/cmd/mcp/main.go +++ b/server/cmd/mcp/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/global" - mcpTool "github.com/flipped-aurora/gin-vue-admin/server/mcp" + "git.echol.cn/loser/Go-Web-Template/server/global" + mcpTool "git.echol.cn/loser/Go-Web-Template/server/mcp" _ "go.uber.org/automaxprocs" "go.uber.org/zap" ) diff --git a/server/config.docker.yaml b/server/config.docker.yaml index 42d1124..999ee87 100644 --- a/server/config.docker.yaml +++ b/server/config.docker.yaml @@ -1,4 +1,4 @@ -# github.com/flipped-aurora/gin-vue-admin/server Global Configuration +# git.echol.cn/loser/Go-Web-Template/server Global Configuration # jwt configuration jwt: @@ -10,7 +10,7 @@ jwt: zap: level: info format: console - prefix: "[github.com/flipped-aurora/gin-vue-admin/server]" + prefix: "[git.echol.cn/loser/Go-Web-Template/server]" director: log show-line: true encode-level: LowercaseColorLevelEncoder @@ -176,14 +176,6 @@ local: path: uploads/file store-path: uploads/file -# autocode configuration -autocode: - web: web/src - root: "" # root 自动适配项目根目录, 请不要手动配置,他会在项目加载的时候识别出根路径 - server: server - module: 'github.com/flipped-aurora/gin-vue-admin/server' - ai-path: "" # AI服务路径 - # qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址) qiniu: zone: ZoneHuaDong @@ -220,7 +212,7 @@ tencent-cos: secret-id: your-secret-id secret-key: your-secret-key base-url: https://gin.vue.admin - path-prefix: github.com/flipped-aurora/gin-vue-admin/server + path-prefix: git.echol.cn/loser/Go-Web-Template/server # aws s3 configuration (minio compatible) aws-s3: @@ -232,7 +224,7 @@ aws-s3: secret-id: your-secret-id secret-key: your-secret-key base-url: https://gin.vue.admin - path-prefix: github.com/flipped-aurora/gin-vue-admin/server + path-prefix: git.echol.cn/loser/Go-Web-Template/server # cloudflare r2 configuration cloudflare-r2: diff --git a/server/core/internal/zap_core.go b/server/core/internal/zap_core.go index 3a95dac..c321435 100644 --- a/server/core/internal/zap_core.go +++ b/server/core/internal/zap_core.go @@ -3,11 +3,10 @@ package internal import ( "context" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service" - astutil "github.com/flipped-aurora/gin-vue-admin/server/utils/ast" - "github.com/flipped-aurora/gin-vue-admin/server/utils/stacktrace" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service" + "git.echol.cn/loser/Go-Web-Template/server/utils/stacktrace" "go.uber.org/zap" "go.uber.org/zap/zapcore" "os" @@ -106,14 +105,8 @@ func (z *ZapCore) Write(entry zapcore.Entry, fields []zapcore.Field) error { stack := entry.Stack if stack != "" { info = fmt.Sprintf("%s \n 调用栈：%s", info, stack) - // 解析最终业务调用方，并提取其方法源码 if frame, ok := stacktrace.FindFinalCaller(stack); ok { - fnName, fnSrc, sLine, eLine, exErr := astutil.ExtractFuncSourceByPosition(frame.File, frame.Line) - if exErr == nil { - info = fmt.Sprintf("%s \n 最终调用方法:%s:%d (%s lines %d-%d)\n----- 产生日志的方法代码如下 -----\n%s", info, frame.File, frame.Line, fnName, sLine, eLine, fnSrc) - } else { - info = fmt.Sprintf("%s \n 最终调用方法:%s:%d (%s) | extract_err=%v", info, frame.File, frame.Line, fnName, exErr) - } + info = fmt.Sprintf("%s \n 最终调用方法:%s:%d", info, frame.File, frame.Line) } } diff --git a/server/core/server.go b/server/core/server.go index 84a7f07..b15db54 100644 --- a/server/core/server.go +++ b/server/core/server.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/initialize" - mcpTool "github.com/flipped-aurora/gin-vue-admin/server/mcp" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/initialize" + mcpTool "git.echol.cn/loser/Go-Web-Template/server/mcp" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "go.uber.org/zap" ) diff --git a/server/core/viper.go b/server/core/viper.go index 48b23e3..76b3db0 100644 --- a/server/core/viper.go +++ b/server/core/viper.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/flipped-aurora/gin-vue-admin/server/core/internal" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/core/internal" + "git.echol.cn/loser/Go-Web-Template/server/global" "github.com/fsnotify/fsnotify" "github.com/gin-gonic/gin" "github.com/spf13/viper" diff --git a/server/core/zap.go b/server/core/zap.go index 09aa165..66aee8e 100644 --- a/server/core/zap.go +++ b/server/core/zap.go @@ -1,13 +1,13 @@ package core import ( - "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/core/internal" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/utils" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" - "os" + "fmt" + "git.echol.cn/loser/Go-Web-Template/server/core/internal" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/utils" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" + "os" ) // Zap 获取 zap.Logger @@ -24,8 +24,8 @@ func Zap() (logger *zap.Logger) { core := internal.NewZapCore(levels[i]) cores = append(cores, core) } - // 构建基础 logger（错误级别的入库逻辑已在自定义 ZapCore 中处理） - logger = zap.New(zapcore.NewTee(cores...)) + // 构建基础 logger（错误级别的入库逻辑已在自定义 ZapCore 中处理） + logger = zap.New(zapcore.NewTee(cores...)) // 启用 Error 及以上级别的堆栈捕捉，确保 entry.Stack 可用 opts := []zap.Option{zap.AddStacktrace(zapcore.ErrorLevel)} if global.GVA_CONFIG.Zap.ShowLine { diff --git a/server/docs/docs.go b/server/docs/docs.go index e5fc176..7785372 100644 --- a/server/docs/docs.go +++ b/server/docs/docs.go @@ -3,7 +3,7 @@ package docs import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "github.com/swaggo/swag" ) diff --git a/server/global/global.go b/server/global/global.go index 97b57c4..bfa1878 100644 --- a/server/global/global.go +++ b/server/global/global.go @@ -8,14 +8,14 @@ import ( "github.com/gin-gonic/gin" "github.com/qiniu/qmgo" - "github.com/flipped-aurora/gin-vue-admin/server/utils/timer" + "git.echol.cn/loser/Go-Web-Template/server/utils/timer" "github.com/songzhibin97/gkit/cache/local_cache" "golang.org/x/sync/singleflight" "go.uber.org/zap" - "github.com/flipped-aurora/gin-vue-admin/server/config" + "git.echol.cn/loser/Go-Web-Template/server/config" "github.com/redis/go-redis/v9" "github.com/spf13/viper" diff --git a/server/go.mod b/server/go.mod index 308d285..d9d3535 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module github.com/flipped-aurora/gin-vue-admin/server +module git.echol.cn/loser/Go-Web-Template/server go 1.24.0 @@ -6,30 +6,23 @@ toolchain go1.24.2 require ( github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible + github.com/aws/aws-sdk-go v1.55.8 github.com/aws/aws-sdk-go-v2 v1.41.2 - github.com/aws/aws-sdk-go-v2/config v1.32.10 - github.com/aws/aws-sdk-go-v2/credentials v1.19.10 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.3 github.com/aws/aws-sdk-go-v2/service/s3 v1.96.1 github.com/casbin/casbin/v2 v2.103.0 github.com/casbin/gorm-adapter/v3 v3.32.0 github.com/dzwvip/gorm-oracle v0.1.2 github.com/fsnotify/fsnotify v1.8.0 - github.com/gin-contrib/sse v1.0.0 github.com/gin-gonic/gin v1.10.0 github.com/glebarez/sqlite v1.11.0 github.com/go-sql-driver/mysql v1.8.1 - github.com/goccy/go-json v0.10.4 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/google/uuid v1.6.0 github.com/gookit/color v1.5.4 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.24.9+incompatible - github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible github.com/mark3labs/mcp-go v0.41.1 - github.com/mholt/archives v0.1.1 github.com/minio/minio-go/v7 v7.0.84 github.com/mojocn/base64Captcha v1.3.8 - github.com/otiai10/copy v1.14.1 github.com/pkg/errors v0.9.1 github.com/qiniu/go-sdk/v7 v7.25.2 github.com/qiniu/qmgo v1.1.9 @@ -53,11 +46,9 @@ require ( golang.org/x/sys v0.32.0 golang.org/x/text v0.24.0 gopkg.in/yaml.v3 v3.0.1 - gorm.io/datatypes v1.2.5 gorm.io/driver/mysql v1.5.7 gorm.io/driver/postgres v1.5.11 gorm.io/driver/sqlserver v1.5.4 - gorm.io/gen v0.3.26 gorm.io/gorm v1.25.12 ) @@ -65,29 +56,18 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/BurntSushi/toml v1.4.0 // indirect github.com/KyleBanks/depth v1.2.1 // indirect - github.com/STARRY-S/zip v0.2.1 // indirect github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 // indirect - github.com/andybalholm/brotli v1.1.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.9 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18 // indirect - github.com/aws/aws-sdk-go-v2/service/signin v1.0.6 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.30.11 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.41.7 // indirect github.com/aws/smithy-go v1.24.1 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/bmatcuk/doublestar/v4 v4.8.0 // indirect - github.com/bodgit/plumbing v1.3.0 // indirect - github.com/bodgit/sevenzip v1.6.0 // indirect - github.com/bodgit/windows v1.0.1 // indirect github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.12.7 // indirect github.com/bytedance/sonic/loader v0.2.3 // indirect @@ -97,11 +77,11 @@ require ( github.com/cloudwego/base64x v0.1.5 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/emirpasic/gods v1.12.0 // indirect github.com/gabriel-vasile/mimetype v1.4.8 // indirect github.com/gammazero/toposort v0.1.1 // indirect + github.com/gin-contrib/sse v1.0.0 // indirect github.com/glebarez/go-sqlite v1.22.0 // indirect github.com/go-ini/ini v1.67.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect @@ -112,15 +92,13 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.24.0 // indirect + github.com/goccy/go-json v0.10.4 // indirect github.com/gofrs/flock v0.12.1 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/invopop/jsonschema v0.13.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect @@ -129,11 +107,11 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.18.0 // indirect github.com/klauspost/cpuid/v2 v2.2.9 // indirect - github.com/klauspost/pgzip v1.2.6 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect github.com/magiconair/properties v1.8.9 // indirect @@ -141,7 +119,6 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/microsoft/go-mssqldb v1.8.0 // indirect github.com/minio/md5-simd v1.1.2 // indirect - github.com/minio/minlz v1.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -149,10 +126,7 @@ require ( github.com/montanaflynn/stats v0.7.1 // indirect github.com/mozillazg/go-httpheader v0.4.0 // indirect github.com/ncruces/go-strftime v0.1.9 // indirect - github.com/nwaples/rardecode/v2 v2.1.0 // indirect - github.com/otiai10/mint v1.6.3 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect - github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect @@ -163,19 +137,16 @@ require ( github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sijms/go-ora/v2 v2.7.17 // indirect - github.com/sorairolake/lzip-go v0.3.5 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.12.0 // indirect github.com/spf13/cast v1.7.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/therootcompany/xz v1.0.1 // indirect github.com/thoas/go-funk v0.7.0 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.9.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - github.com/ulikunitz/xz v0.5.12 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect @@ -187,17 +158,14 @@ require ( github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.uber.org/multierr v1.11.0 // indirect - go4.org v0.0.0-20230225012048-214862532bf5 // indirect golang.org/x/arch v0.13.0 // indirect golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect golang.org/x/image v0.23.0 // indirect - golang.org/x/mod v0.22.0 // indirect golang.org/x/net v0.35.0 // indirect golang.org/x/time v0.9.0 // indirect golang.org/x/tools v0.29.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gorm.io/hints v1.1.2 // indirect gorm.io/plugin/dbresolver v1.5.3 // indirect modernc.org/fileutil v1.3.0 // indirect modernc.org/libc v1.61.9 // indirect diff --git a/server/go.sum b/server/go.sum index 875014e..3333930 100644 --- a/server/go.sum +++ b/server/go.sum @@ -1,20 +1,3 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= @@ -38,73 +21,33 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= -github.com/STARRY-S/zip v0.2.1 h1:pWBd4tuSGm3wtpoqRZZ2EAwOmcHK6XFf7bU9qcJXyFg= -github.com/STARRY-S/zip v0.2.1/go.mod h1:xNvshLODWtC4EJ702g7cTYn13G53o1+X9BWnPFpcWV4= github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 h1:7dONQ3WNZ1zy960TmkxJPuwoolZwL7xKtpcM04MBnt4= github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82/go.mod h1:nLnM0KdK1CmygvjpDUO6m1TjSsiQtL61juhNsvV/JVI= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= -github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= -github.com/aws/aws-sdk-go-v2 v1.41.2 h1:LuT2rzqNQsauaGkPK/7813XxcZ3o3yePY0Iy891T2ls= +github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk= github.com/aws/aws-sdk-go-v2 v1.41.2/go.mod h1:IvvlAZQXvTXznUPfRVfryiG1fbzE2NGK6m9u39YQ+S4= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5 h1:zWFmPmgw4sveAYi1mRqG+E/g0461cJ5M4bJ8/nc6d3Q= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5/go.mod h1:nVUlMLVV8ycXSb7mSkcNu9e3v/1TJq2RTlrPwhYWr5c= -github.com/aws/aws-sdk-go-v2/config v1.32.10 h1:9DMthfO6XWZYLfzZglAgW5Fyou2nRI5CuV44sTedKBI= -github.com/aws/aws-sdk-go-v2/config v1.32.10/go.mod h1:2rUIOnA2JaiqYmSKYmRJlcMWy6qTj1vuRFscppSBMcw= -github.com/aws/aws-sdk-go-v2/credentials v1.19.10 h1:EEhmEUFCE1Yhl7vDhNOI5OCL/iKMdkkYFTRpZXNw7m8= -github.com/aws/aws-sdk-go-v2/credentials v1.19.10/go.mod h1:RnnlFCAlxQCkN2Q379B67USkBMu1PipEEiibzYN5UTE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18 h1:Ii4s+Sq3yDfaMLpjrJsqD6SmG/Wq/P5L/hw2qa78UAY= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18/go.mod h1:6x81qnY++ovptLE6nWQeWrpXxbnlIex+4H4eYYGcqfc= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.3 h1:+mQ8NQBh7B7c2FBtppRnwkrmuwFON1XQQ+5yblomZKk= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.3/go.mod h1:u67RKh3BRmS4FYLH+rN3N4T5fqpd9m2ttAwBJYEdosU= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18 h1:F43zk1vemYIqPAwhjTjYIz0irU2EY7sOb/F5eJ3HuyM= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18/go.mod h1:w1jdlZXrGKaJcNoL+Nnrj+k5wlpGXqnNrKoP22HvAug= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18 h1:xCeWVjj0ki0l3nruoyP2slHsGArMxeiiaoPN5QZH6YQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18/go.mod h1:r/eLGuGCBw6l36ZRWiw6PaZwPXb6YOj+i/7MizNl5/k= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk= -github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18 h1:eZioDaZGJ0tMM4gzmkNIO2aAoQd+je7Ug7TkvAzlmkU= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18/go.mod h1:CCXwUKAJdoWr6/NcxZ+zsiPr6oH/Q5aTooRGYieAyj4= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5 h1:CeY9LUdur+Dxoeldqoun6y4WtJ3RQtzk0JMP2gfUay0= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5/go.mod h1:AZLZf2fMaahW5s/wMRciu1sYbdsikT/UHwbUjOdEVTc= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.9 h1:IJRzQTvdpjHRPItx9gzNcz7Y1F+xqAR+xiy9rr5ZYl8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.9/go.mod h1:Kzm5e6OmNH8VMkgK9t+ry5jEih4Y8whqs+1hrkxim1I= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18 h1:LTRCYFlnnKFlKsyIQxKhJuDuA3ZkrDQMRYm6rXiHlLY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18/go.mod h1:XhwkgGG6bHSd00nO/mexWTcTjgd6PjuvWQMqSn2UaEk= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18 h1:/A/xDuZAVD2BpsS2fftFRo/NoEKQJ8YTnJDEHBy2Gtg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18/go.mod h1:hWe9b4f+djUQGmyiGEeOnZv69dtMSgpDRIvNMvuvzvY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.96.1 h1:giB30dEeoar5bgDnkE0q+z7cFjcHaCjulpmPVmuKR84= github.com/aws/aws-sdk-go-v2/service/s3 v1.96.1/go.mod h1:071TH4M3botFLWDbzQLfBR7tXYi7Fs2RsXSiH7nlUlY= -github.com/aws/aws-sdk-go-v2/service/signin v1.0.6 h1:MzORe+J94I+hYu2a6XmV5yC9huoTv8NRcCrUNedDypQ= -github.com/aws/aws-sdk-go-v2/service/signin v1.0.6/go.mod h1:hXzcHLARD7GeWnifd8j9RWqtfIgxj4/cAtIVIK7hg8g= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.11 h1:7oGD8KPfBOJGXiCoRKrrrQkbvCp8N++u36hrLMPey6o= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.11/go.mod h1:0DO9B5EUJQlIDif+XJRWCljZRKsAFKh3gpFz7UnDtOo= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15 h1:edCcNp9eGIUDUCrzoCu1jWAXLGFIizeqkdkKgRlJwWc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15/go.mod h1:lyRQKED9xWfgkYC/wmmYfv7iVIM68Z5OQ88ZdcV1QbU= -github.com/aws/aws-sdk-go-v2/service/sts v1.41.7 h1:NITQpgo9A5NrDZ57uOWj+abvXSb83BbyggcUBVksN7c= -github.com/aws/aws-sdk-go-v2/service/sts v1.41.7/go.mod h1:sks5UWBhEuWYDPdwlnRFn1w7xWdH29Jcpe+/PJQefEs= -github.com/aws/smithy-go v1.24.1 h1:VbyeNfmYkWoxMVpGUAbQumkODcYmfMRfZ8yQiH30SK0= github.com/aws/smithy-go v1.24.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0= github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmatcuk/doublestar/v4 v4.8.0 h1:DSXtrypQddoug1459viM9X9D3dp1Z7993fw36I2kNcQ= github.com/bmatcuk/doublestar/v4 v4.8.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= -github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU= -github.com/bodgit/plumbing v1.3.0/go.mod h1:JOTb4XiRu5xfnmdnDJo6GmSbSbtSyufrsyZFByMtKEs= -github.com/bodgit/sevenzip v1.6.0 h1:a4R0Wu6/P1o1pP/3VV++aEOcyeBxeO/xE2Y9NSTrr6A= -github.com/bodgit/sevenzip v1.6.0/go.mod h1:zOBh9nJUof7tcrlqJFv1koWRrhz3LbDbUNngkuZxLMc= -github.com/bodgit/windows v1.0.1 h1:tF7K6KOluPYygXa3Z2594zxlkbKPAOvqr97etrGNIz4= -github.com/bodgit/windows v1.0.1/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -122,15 +65,10 @@ github.com/casbin/gorm-adapter/v3 v3.32.0 h1:Au+IOILBIE9clox5BJhI2nA3p9t7Ep1ePlu github.com/casbin/gorm-adapter/v3 v3.32.0/go.mod h1:Zre/H8p17mpv5U3EaWgPoxLILLdXO3gHW5aoQQpUDZI= github.com/casbin/govaluate v1.3.0 h1:VA0eSY0M2lA86dYd5kPPuNZMUD9QkWnOCnavGrw9myc= github.com/casbin/govaluate v1.3.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I= github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= @@ -144,17 +82,12 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4= -github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= -github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dzwvip/gorm-oracle v0.1.2 h1:811aFDY7oDfKWHc0Z0lHdXzzr89EmKBSwc/jLJ8GU5g= github.com/dzwvip/gorm-oracle v0.1.2/go.mod h1:TbF7idnO9UgGpJ0qJpDZby1/wGquzP5GYof88ScBITE= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= @@ -173,8 +106,6 @@ github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc= github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -222,73 +153,37 @@ github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo= github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0= github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= -github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/huaweicloud/huaweicloud-sdk-go-obs v3.24.9+incompatible h1:XQVXdk+WAJ4fSNB6mMRuYNvFWou7BZs6SZB925hPrnk= github.com/huaweicloud/huaweicloud-sdk-go-obs v3.24.9+incompatible/go.mod h1:l7VUhRbTKCzdOacdT4oWCwATKyvZqUOlOqr0Ous3k4s= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E= github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= @@ -311,26 +206,19 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA= -github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= -github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= -github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= -github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -359,11 +247,6 @@ github.com/mark3labs/mcp-go v0.41.1 h1:w78eWfiQam2i8ICL7AL0WFiq7KHNJQ6UB53ZVtH4K github.com/mark3labs/mcp-go v0.41.1/go.mod h1:T7tUa2jO6MavG+3P25Oy/jR7iCeJPHImCZHRymCn39g= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= -github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/mholt/archives v0.1.1 h1:c7J3qXN1FB54y0qiUXiq9Bxk4eCUc8pdXWwOhZdRzeY= -github.com/mholt/archives v0.1.1/go.mod h1:FQVz01Q2uXKB/35CXeW/QFO23xT+hSCGZHVtha78U4I= github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA= github.com/microsoft/go-mssqldb v1.8.0 h1:7cyZ/AT7ycDsEoWPIXibd+aVKFtteUNhDGf3aobP+tw= github.com/microsoft/go-mssqldb v1.8.0/go.mod h1:6znkekS3T2vp0waiMhen4GPU1BiAsrP+iXHcE7a7rFo= @@ -371,8 +254,6 @@ github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.84 h1:D1HVmAF8JF8Bpi6IU4V9vIEj+8pc+xU88EWMs2yed0E= github.com/minio/minio-go/v7 v7.0.84/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY= -github.com/minio/minlz v1.0.0 h1:Kj7aJZ1//LlTP1DM8Jm7lNKvvJS2m74gyyXXn3+uJWQ= -github.com/minio/minlz v1.0.0/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -394,16 +275,8 @@ github.com/mozillazg/go-httpheader v0.4.0 h1:aBn6aRXtFzyDLZ4VIRLsZbbJloagQfMnCiY github.com/mozillazg/go-httpheader v0.4.0/go.mod h1:PuT8h0pw6efvp8ZeUec1Rs7dwjK08bt6gKSReGMqtdA= github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= -github.com/nwaples/rardecode/v2 v2.1.0 h1:JQl9ZoBPDy+nIZGb1mx8+anfHp/LV3NE2MjMiv0ct/U= -github.com/nwaples/rardecode/v2 v2.1.0/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw= -github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8= -github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I= -github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs= -github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= -github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= -github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= @@ -417,7 +290,6 @@ github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk= github.com/qiniu/go-sdk/v7 v7.25.2 h1:URwgZpxySdiwu2yQpHk93X4LXWHyFRp1x3Vmlk/YWvo= github.com/qiniu/go-sdk/v7 v7.25.2/go.mod h1:dmKtJ2ahhPWFVi9o1D5GemmWoh/ctuB9peqTowyTO8o= @@ -435,14 +307,12 @@ github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= -github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk= github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo= github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= @@ -457,8 +327,6 @@ github.com/sijms/go-ora/v2 v2.7.17 h1:M/pYIqjaMUeBxyzOWp2oj4ntF6fHSBloJWGNH9vbms github.com/sijms/go-ora/v2 v2.7.17/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/songzhibin97/gkit v1.2.13 h1:paY0XJkdRuy9/8k9nTnbdrzo8pC22jIIFldUkOQv5nU= github.com/songzhibin97/gkit v1.2.13/go.mod h1:38CreNR27eTGaG1UMGihrXqI4xc3nGfYxLVKKVx6Ngg= -github.com/sorairolake/lzip-go v0.3.5 h1:ms5Xri9o1JBIWvOFAorYtUNik6HI3HgBTkISiqu0Cwg= -github.com/sorairolake/lzip-go v0.3.5/go.mod h1:N0KYq5iWrMXI0ZEXKXaS9hCyOjZUQdBDEIbXfoUwbdk= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs= @@ -496,8 +364,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.563/go.mod github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563/go.mod h1:uom4Nvi9W+Qkom0exYiJ9VWJjXwyxtPYTkKkaLMlfE0= github.com/tencentyun/cos-go-sdk-v5 v0.7.60 h1:/e/tmvRmfKexr/QQIBzWhOkZWsmY3EK72NrI6G/Tv0o= github.com/tencentyun/cos-go-sdk-v5 v0.7.60/go.mod h1:8+hG+mQMuRP/OIS9d83syAvXvrMj9HhkND6Q1fLghw0= -github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw= -github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY= github.com/thoas/go-funk v0.7.0 h1:GmirKrs6j6zJbhJIficOsz2aAI7700KsU/5YrdHRM1Y= github.com/thoas/go-funk v0.7.0/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU= @@ -508,9 +374,6 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= -github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/unrolled/secure v1.17.0 h1:Io7ifFgo99Bnh0J7+Q+qcMzWM6kaDPCA5FroFZEdbWU= github.com/unrolled/secure v1.17.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40= github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= @@ -529,8 +392,6 @@ github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQ github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE= github.com/xuri/nfp v0.0.0-20250111060730-82a408b9aa71 h1:hOh7aVDrvGJRxzXrQbDY8E+02oaI//5cHL+97oYpEPw= github.com/xuri/nfp v0.0.0-20250111060730-82a408b9aa71/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ= -github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= -github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4= github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= @@ -541,10 +402,6 @@ github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4= go.mongodb.org/mongo-driver v1.17.2 h1:gvZyk8352qSfzyZ2UMWcpDpMSGEr1eqE4T793SqyhzM= go.mongodb.org/mongo-driver v1.17.2/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -553,14 +410,9 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc= -go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU= golang.org/x/arch v0.13.0 h1:KCkqVVV1kGg0X87TFysjCJ8MxtZEIU4Ja/yXGeoECdA= golang.org/x/arch v0.13.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= @@ -577,35 +429,10 @@ golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68= golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -613,20 +440,10 @@ golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -643,17 +460,7 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= @@ -663,19 +470,9 @@ golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -714,9 +511,7 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -734,34 +529,11 @@ golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= @@ -769,41 +541,7 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxb golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -821,34 +559,19 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/datatypes v1.2.5 h1:9UogU3jkydFVW1bIVVeoYsTpLRgwDVW3rHfJG6/Ek9I= -gorm.io/datatypes v1.2.5/go.mod h1:I5FUdlKpLb5PMqeMQhm30CQ6jXP8Rj89xkTeCSAaAD4= gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo= gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= gorm.io/driver/postgres v1.5.11 h1:ubBVAfbKEUld/twyKZ0IYn9rSQh448EdelLYk9Mv314= gorm.io/driver/postgres v1.5.11/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= -gorm.io/driver/sqlite v1.5.0 h1:zKYbzRCpBrT1bNijRnxLDJWPjVfImGEn0lSnUY5gZ+c= -gorm.io/driver/sqlite v1.5.0/go.mod h1:kDMDfntV9u/vuMmz8APHtHF0b4nyBB7sfCieC6G8k8I= gorm.io/driver/sqlserver v1.5.4 h1:xA+Y1KDNspv79q43bPyjDMUgHoYHLhXYmdFcYPobg8g= gorm.io/driver/sqlserver v1.5.4/go.mod h1:+frZ/qYmuna11zHPlh5oc2O6ZA/lS88Keb0XSH1Zh/g= -gorm.io/gen v0.3.26 h1:sFf1j7vNStimPRRAtH4zz5NiHM+1dr6eA9aaRdplyhY= -gorm.io/gen v0.3.26/go.mod h1:a5lq5y3w4g5LMxBcw0wnO6tYUCdNutWODq5LrIt75LE= gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA= -gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= -gorm.io/gorm v1.25.0/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= -gorm.io/hints v1.1.2 h1:b5j0kwk5p4+3BtDtYqqfY+ATSxjj+6ptPgVveuynn9o= -gorm.io/hints v1.1.2/go.mod h1:/ARdpUHAtyEMCh5NNi3tI7FsGh+Cj/MIUlvNxCNCFWg= gorm.io/plugin/dbresolver v1.5.3 h1:wFwINGZZmttuu9h7XpvbDHd8Lf9bb8GNzp/NpAMV2wU= gorm.io/plugin/dbresolver v1.5.3/go.mod h1:TSrVhaUg2DZAWP3PrHlDlITEJmNOkL0tFTjvTEsQ4XE= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= modernc.org/cc/v4 v4.24.4 h1:TFkx1s6dCkQpd6dKurBNmpo+G8Zl4Sq/ztJ+2+DEsh0= modernc.org/cc/v4 v4.24.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0= modernc.org/ccgo/v4 v4.23.13 h1:PFiaemQwE/jdwi8XEHyEV+qYWoIuikLP3T4rvDeJb00= @@ -875,6 +598,3 @@ modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/server/initialize/db_list.go b/server/initialize/db_list.go index 90eef9e..cf0cf21 100644 --- a/server/initialize/db_list.go +++ b/server/initialize/db_list.go @@ -1,8 +1,8 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" "gorm.io/gorm" ) diff --git a/server/initialize/ensure_tables.go b/server/initialize/ensure_tables.go index 3f78d66..cfc8bde 100644 --- a/server/initialize/ensure_tables.go +++ b/server/initialize/ensure_tables.go @@ -2,10 +2,10 @@ package initialize import ( "context" + commonModel "git.echol.cn/loser/Go-Web-Template/server/model/common" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" adapter "github.com/casbin/gorm-adapter/v3" - commonModel "github.com/flipped-aurora/gin-vue-admin/server/model/common" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" "gorm.io/gorm" ) diff --git a/server/initialize/gorm.go b/server/initialize/gorm.go index 8546470..ba76f03 100644 --- a/server/initialize/gorm.go +++ b/server/initialize/gorm.go @@ -3,9 +3,9 @@ package initialize import ( "os" - "github.com/flipped-aurora/gin-vue-admin/server/global" - commonModel "github.com/flipped-aurora/gin-vue-admin/server/model/common" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/global" + commonModel "git.echol.cn/loser/Go-Web-Template/server/model/common" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "go.uber.org/zap" "gorm.io/gorm" diff --git a/server/initialize/gorm_biz.go b/server/initialize/gorm_biz.go index 9316ccc..6878c52 100644 --- a/server/initialize/gorm_biz.go +++ b/server/initialize/gorm_biz.go @@ -1,7 +1,7 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) func bizModel() error { diff --git a/server/initialize/gorm_mssql.go b/server/initialize/gorm_mssql.go index 530275a..5c37702 100644 --- a/server/initialize/gorm_mssql.go +++ b/server/initialize/gorm_mssql.go @@ -10,9 +10,9 @@ package initialize */ import ( - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/initialize/internal" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/initialize/internal" "gorm.io/driver/sqlserver" "gorm.io/gorm" ) diff --git a/server/initialize/gorm_mysql.go b/server/initialize/gorm_mysql.go index cf949aa..c9eef31 100644 --- a/server/initialize/gorm_mysql.go +++ b/server/initialize/gorm_mysql.go @@ -1,9 +1,9 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/initialize/internal" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/initialize/internal" _ "github.com/go-sql-driver/mysql" "gorm.io/driver/mysql" "gorm.io/gorm" diff --git a/server/initialize/gorm_oracle.go b/server/initialize/gorm_oracle.go index 9d3d663..3d20349 100644 --- a/server/initialize/gorm_oracle.go +++ b/server/initialize/gorm_oracle.go @@ -1,10 +1,10 @@ package initialize import ( + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/initialize/internal" oracle "github.com/dzwvip/gorm-oracle" - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/initialize/internal" "gorm.io/gorm" ) diff --git a/server/initialize/gorm_pgsql.go b/server/initialize/gorm_pgsql.go index b5022db..ef882c3 100644 --- a/server/initialize/gorm_pgsql.go +++ b/server/initialize/gorm_pgsql.go @@ -1,9 +1,9 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/initialize/internal" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/initialize/internal" "gorm.io/driver/postgres" "gorm.io/gorm" ) diff --git a/server/initialize/gorm_sqlite.go b/server/initialize/gorm_sqlite.go index 33510ee..a2db4b5 100644 --- a/server/initialize/gorm_sqlite.go +++ b/server/initialize/gorm_sqlite.go @@ -1,9 +1,9 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/initialize/internal" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/initialize/internal" "github.com/glebarez/sqlite" "gorm.io/gorm" ) diff --git a/server/initialize/init.go b/server/initialize/init.go index 4dc48f3..08846fc 100644 --- a/server/initialize/init.go +++ b/server/initialize/init.go @@ -3,7 +3,7 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/utils" ) // 初始化全局函数 diff --git a/server/initialize/internal/gorm.go b/server/initialize/internal/gorm.go index 28f4097..2806717 100644 --- a/server/initialize/internal/gorm.go +++ b/server/initialize/internal/gorm.go @@ -3,7 +3,7 @@ package internal import ( "time" - "github.com/flipped-aurora/gin-vue-admin/server/config" + "git.echol.cn/loser/Go-Web-Template/server/config" "gorm.io/gorm" "gorm.io/gorm/logger" "gorm.io/gorm/schema" diff --git a/server/initialize/internal/gorm_logger_writer.go b/server/initialize/internal/gorm_logger_writer.go index 9774c96..9929f8d 100644 --- a/server/initialize/internal/gorm_logger_writer.go +++ b/server/initialize/internal/gorm_logger_writer.go @@ -2,8 +2,8 @@ package internal import ( "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" "gorm.io/gorm/logger" ) diff --git a/server/initialize/mongo.go b/server/initialize/mongo.go index adefb58..7372b01 100644 --- a/server/initialize/mongo.go +++ b/server/initialize/mongo.go @@ -3,9 +3,9 @@ package initialize import ( "context" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/initialize/internal" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/initialize/internal" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/pkg/errors" "github.com/qiniu/qmgo" "github.com/qiniu/qmgo/options" diff --git a/server/initialize/other.go b/server/initialize/other.go index 5d23aeb..a0043b6 100644 --- a/server/initialize/other.go +++ b/server/initialize/other.go @@ -3,8 +3,8 @@ package initialize import ( "github.com/songzhibin97/gkit/cache/local_cache" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/utils" ) func OtherInit() { diff --git a/server/initialize/redis.go b/server/initialize/redis.go index 2d9c8f4..3fc8d88 100644 --- a/server/initialize/redis.go +++ b/server/initialize/redis.go @@ -3,8 +3,8 @@ package initialize import ( "context" - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" "github.com/redis/go-redis/v9" "go.uber.org/zap" diff --git a/server/initialize/register_init.go b/server/initialize/register_init.go index 850e09e..7c0ccbb 100644 --- a/server/initialize/register_init.go +++ b/server/initialize/register_init.go @@ -1,8 +1,8 @@ package initialize import ( - _ "github.com/flipped-aurora/gin-vue-admin/server/source/common" - _ "github.com/flipped-aurora/gin-vue-admin/server/source/system" + _ "git.echol.cn/loser/Go-Web-Template/server/source/common" + _ "git.echol.cn/loser/Go-Web-Template/server/source/system" ) func init() { diff --git a/server/initialize/reload.go b/server/initialize/reload.go index 8fd27e6..1204147 100644 --- a/server/initialize/reload.go +++ b/server/initialize/reload.go @@ -1,7 +1,7 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "go.uber.org/zap" ) diff --git a/server/initialize/router.go b/server/initialize/router.go index af1d9b6..7e66477 100644 --- a/server/initialize/router.go +++ b/server/initialize/router.go @@ -4,10 +4,10 @@ import ( "net/http" "os" - "github.com/flipped-aurora/gin-vue-admin/server/docs" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/middleware" - "github.com/flipped-aurora/gin-vue-admin/server/router" + "git.echol.cn/loser/Go-Web-Template/server/docs" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/router" "github.com/gin-gonic/gin" swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" @@ -54,7 +54,7 @@ func Routers() *gin.Engine { Router.StaticFS(global.GVA_CONFIG.Local.StorePath, justFilesFilesystem{http.Dir(global.GVA_CONFIG.Local.StorePath)}) // Router.Use(middleware.LoadTls()) // 如果需要使用https 请打开此中间件 然后前往 core/server.go 将启动模式 更变为 Router.RunTLS("端口","你的cre/pem文件","你的key文件") // 跨域，如需跨域可以打开下面的注释 - // Router.Use(middleware.Cors()) // 直接放行全部跨域请求 + Router.Use(middleware.Cors()) // 直接放行全部跨域请求 // Router.Use(middleware.CorsByRules()) // 按照配置的规则放行跨域请求 // global.GVA_LOG.Info("use middleware cors") docs.SwaggerInfo.BasePath = global.GVA_CONFIG.System.RouterPrefix diff --git a/server/initialize/router_biz.go b/server/initialize/router_biz.go index 99ad27c..60ed0f1 100644 --- a/server/initialize/router_biz.go +++ b/server/initialize/router_biz.go @@ -1,7 +1,7 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/router" + "git.echol.cn/loser/Go-Web-Template/server/router" "github.com/gin-gonic/gin" ) diff --git a/server/initialize/timer.go b/server/initialize/timer.go index ab5a7a5..6c7b4c7 100644 --- a/server/initialize/timer.go +++ b/server/initialize/timer.go @@ -2,11 +2,11 @@ package initialize import ( "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/task" + "git.echol.cn/loser/Go-Web-Template/server/task" "github.com/robfig/cron/v3" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) func Timer() { diff --git a/server/initialize/validator.go b/server/initialize/validator.go index 79aea66..90f8695 100644 --- a/server/initialize/validator.go +++ b/server/initialize/validator.go @@ -1,6 +1,6 @@ package initialize -import "github.com/flipped-aurora/gin-vue-admin/server/utils" +import "git.echol.cn/loser/Go-Web-Template/server/utils" func init() { _ = utils.RegisterRule("PageVerify", diff --git a/server/main.go b/server/main.go index b8b2222..b0aa241 100644 --- a/server/main.go +++ b/server/main.go @@ -1,9 +1,9 @@ package main import ( - "github.com/flipped-aurora/gin-vue-admin/server/core" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/initialize" + "git.echol.cn/loser/Go-Web-Template/server/core" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/initialize" _ "go.uber.org/automaxprocs" "go.uber.org/zap" ) diff --git a/server/mcp/api_creator.go b/server/mcp/api_creator.go index 9016a50..0e2fb0d 100644 --- a/server/mcp/api_creator.go +++ b/server/mcp/api_creator.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - commonReq "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + commonReq "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/server/mcp/api_lister.go b/server/mcp/api_lister.go index cdc3624..583074c 100644 --- a/server/mcp/api_lister.go +++ b/server/mcp/api_lister.go @@ -3,8 +3,8 @@ package mcpTool import ( "context" - "github.com/flipped-aurora/gin-vue-admin/server/global" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/global" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/server/mcp/client/client_test.go b/server/mcp/client/client_test.go index 917d22d..07ce70b 100644 --- a/server/mcp/client/client_test.go +++ b/server/mcp/client/client_test.go @@ -4,19 +4,29 @@ import ( "context" "fmt" "github.com/mark3labs/mcp-go/mcp" + "os" "testing" ) +func requireMCPIntegration(t *testing.T) { + t.Helper() + if os.Getenv("RUN_MCP_INTEGRATION") == "" { + t.Skip("set RUN_MCP_INTEGRATION=1 to run MCP integration tests") + } +} + // 测试 MCP 客户端连接 func TestMcpClientConnection(t *testing.T) { + requireMCPIntegration(t) c, err := NewClient("http://localhost:8888/sse", "test-client", "1.0.0", "gin-vue-admin MCP服务") defer c.Close() if err != nil { - t.Fatalf(err.Error()) + t.Fatalf("create client failed: %v", err) } } func TestTools(t *testing.T) { + requireMCPIntegration(t) t.Run("currentTime", func(t *testing.T) { c, err := NewClient("http://localhost:8888/sse", "test-client", "1.0.0", "gin-vue-admin MCP服务") defer c.Close() @@ -91,6 +101,7 @@ func TestTools(t *testing.T) { } func TestGetTools(t *testing.T) { + requireMCPIntegration(t) c, err := NewClient("http://localhost:8888/sse", "test-client", "1.0.0", "gin-vue-admin MCP服务") defer c.Close() if err != nil { diff --git a/server/mcp/context.go b/server/mcp/context.go index 932aa12..2e69790 100644 --- a/server/mcp/context.go +++ b/server/mcp/context.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) type mcpContextKey string diff --git a/server/mcp/dictionary_generator.go b/server/mcp/dictionary_generator.go index 7fa5b26..e30c39a 100644 --- a/server/mcp/dictionary_generator.go +++ b/server/mcp/dictionary_generator.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/server/mcp/dictionary_http.go b/server/mcp/dictionary_http.go index 96c8c03..f3ddce8 100644 --- a/server/mcp/dictionary_http.go +++ b/server/mcp/dictionary_http.go @@ -5,8 +5,8 @@ import ( "net/url" "strconv" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/utils" ) type exportedDictionary struct { diff --git a/server/mcp/dictionary_query.go b/server/mcp/dictionary_query.go index 9d704cd..1ed8a46 100644 --- a/server/mcp/dictionary_query.go +++ b/server/mcp/dictionary_query.go @@ -3,7 +3,7 @@ package mcpTool import ( "context" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/server/mcp/http_client.go b/server/mcp/http_client.go index e2e9e74..038eabc 100644 --- a/server/mcp/http_client.go +++ b/server/mcp/http_client.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) type upstreamEnvelope[T any] struct { diff --git a/server/mcp/menu_creator.go b/server/mcp/menu_creator.go index da97b0e..55171d2 100644 --- a/server/mcp/menu_creator.go +++ b/server/mcp/menu_creator.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/server/mcp/menu_lister.go b/server/mcp/menu_lister.go index 841663b..54aae5b 100644 --- a/server/mcp/menu_lister.go +++ b/server/mcp/menu_lister.go @@ -3,7 +3,7 @@ package mcpTool import ( "context" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "github.com/mark3labs/mcp-go/mcp" ) diff --git a/server/mcp/server.go b/server/mcp/server.go index 933f1cc..ffc4004 100644 --- a/server/mcp/server.go +++ b/server/mcp/server.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" mcpServer "github.com/mark3labs/mcp-go/server" ) diff --git a/server/mcp/standalone_manager.go b/server/mcp/standalone_manager.go index 3be32b0..520c548 100644 --- a/server/mcp/standalone_manager.go +++ b/server/mcp/standalone_manager.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) const ( diff --git a/server/middleware/casbin_rbac.go b/server/middleware/casbin_rbac.go index f71aecd..ea7f26a 100644 --- a/server/middleware/casbin_rbac.go +++ b/server/middleware/casbin_rbac.go @@ -1,9 +1,9 @@ package middleware import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/gin-gonic/gin" "strconv" "strings" diff --git a/server/middleware/cors.go b/server/middleware/cors.go index d7e3ccd..a52bc1d 100644 --- a/server/middleware/cors.go +++ b/server/middleware/cors.go @@ -1,8 +1,8 @@ package middleware import ( - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" "github.com/gin-gonic/gin" "net/http" ) diff --git a/server/middleware/error.go b/server/middleware/error.go index c9f02df..43804fc 100644 --- a/server/middleware/error.go +++ b/server/middleware/error.go @@ -10,9 +10,9 @@ import ( "runtime/debug" "strings" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/middleware/jwt.go b/server/middleware/jwt.go index f4c0296..045621a 100644 --- a/server/middleware/jwt.go +++ b/server/middleware/jwt.go @@ -5,11 +5,11 @@ import ( "strconv" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/golang-jwt/jwt/v5" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" "github.com/gin-gonic/gin" ) diff --git a/server/middleware/limit_ip.go b/server/middleware/limit_ip.go index acc6e98..05af8a2 100644 --- a/server/middleware/limit_ip.go +++ b/server/middleware/limit_ip.go @@ -8,8 +8,8 @@ import ( "go.uber.org/zap" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/response" "github.com/gin-gonic/gin" ) diff --git a/server/middleware/operation.go b/server/middleware/operation.go index dd545f5..c88cdcb 100644 --- a/server/middleware/operation.go +++ b/server/middleware/operation.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/utils" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/model/common/exa_attachment_category.go b/server/model/common/exa_attachment_category.go index 0162594..de03c2b 100644 --- a/server/model/common/exa_attachment_category.go +++ b/server/model/common/exa_attachment_category.go @@ -1,7 +1,7 @@ package common import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) type ExaAttachmentCategory struct { diff --git a/server/model/common/exa_breakpoint_continue.go b/server/model/common/exa_breakpoint_continue.go index d500fa0..fb21060 100644 --- a/server/model/common/exa_breakpoint_continue.go +++ b/server/model/common/exa_breakpoint_continue.go @@ -1,7 +1,7 @@ package common import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) // file struct, 文件结构体 diff --git a/server/model/common/exa_file_upload_download.go b/server/model/common/exa_file_upload_download.go index 49a665e..bd1ed90 100644 --- a/server/model/common/exa_file_upload_download.go +++ b/server/model/common/exa_file_upload_download.go @@ -1,7 +1,7 @@ package common import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) type ExaFileUploadAndDownload struct { diff --git a/server/model/common/response/exa_breakpoint_continue.go b/server/model/common/response/exa_breakpoint_continue.go index 241bfdf..5a73bd2 100644 --- a/server/model/common/response/exa_breakpoint_continue.go +++ b/server/model/common/response/exa_breakpoint_continue.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/server/model/common" +import "git.echol.cn/loser/Go-Web-Template/server/model/common" type FilePathResponse struct { FilePath string `json:"filePath"` diff --git a/server/model/common/response/exa_file_upload_download.go b/server/model/common/response/exa_file_upload_download.go index a9d64bd..7ab4739 100644 --- a/server/model/common/response/exa_file_upload_download.go +++ b/server/model/common/response/exa_file_upload_download.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/server/model/common" +import "git.echol.cn/loser/Go-Web-Template/server/model/common" type ExaFileResponse struct { File common.ExaFileUploadAndDownload `json:"file"` diff --git a/server/model/system/request/sys_api.go b/server/model/system/request/sys_api.go index 5567ee8..65f3091 100644 --- a/server/model/system/request/sys_api.go +++ b/server/model/system/request/sys_api.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) // api分页条件查询及排序结构体 @@ -15,7 +15,7 @@ type SearchApiParams struct { // SetApiAuthorities 通过API路径和方法全量覆盖关联角色列表 type SetApiAuthorities struct { - Path string `json:"path" form:"path"` // API路径 - Method string `json:"method" form:"method"` // 请求方法 - AuthorityIds []uint `json:"authorityIds" form:"authorityIds"` // 角色ID列表 + Path string `json:"path" form:"path"` // API路径 + Method string `json:"method" form:"method"` // 请求方法 + AuthorityIds []uint `json:"authorityIds" form:"authorityIds"` // 角色ID列表 } diff --git a/server/model/system/request/sys_api_token.go b/server/model/system/request/sys_api_token.go index e9e1c02..06f0fdc 100644 --- a/server/model/system/request/sys_api_token.go +++ b/server/model/system/request/sys_api_token.go @@ -1,12 +1,12 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) type SysApiTokenSearch struct { system.SysApiToken request.PageInfo - Status *bool `json:"status" form:"status"` + Status *bool `json:"status" form:"status"` } diff --git a/server/model/system/request/sys_dictionary_detail.go b/server/model/system/request/sys_dictionary_detail.go index 2419cc3..2b7deb8 100644 --- a/server/model/system/request/sys_dictionary_detail.go +++ b/server/model/system/request/sys_dictionary_detail.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) type SysDictionaryDetailSearch struct { diff --git a/server/model/system/request/sys_error.go b/server/model/system/request/sys_error.go index ca1044d..b730b90 100644 --- a/server/model/system/request/sys_error.go +++ b/server/model/system/request/sys_error.go @@ -1,14 +1,13 @@ - package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" "time" ) -type SysErrorSearch struct{ - CreatedAtRange []time.Time `json:"createdAtRange" form:"createdAtRange[]"` - Form *string `json:"form" form:"form"` - Info *string `json:"info" form:"info"` - request.PageInfo +type SysErrorSearch struct { + CreatedAtRange []time.Time `json:"createdAtRange" form:"createdAtRange[]"` + Form *string `json:"form" form:"form"` + Info *string `json:"info" form:"info"` + request.PageInfo } diff --git a/server/model/system/request/sys_export_template.go b/server/model/system/request/sys_export_template.go index 1010bf6..69d895d 100644 --- a/server/model/system/request/sys_export_template.go +++ b/server/model/system/request/sys_export_template.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "time" ) diff --git a/server/model/system/request/sys_init.go b/server/model/system/request/sys_init.go index d04b1d2..aa09942 100644 --- a/server/model/system/request/sys_init.go +++ b/server/model/system/request/sys_init.go @@ -2,7 +2,7 @@ package request import ( "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/config" + "git.echol.cn/loser/Go-Web-Template/server/config" "os" ) diff --git a/server/model/system/request/sys_login_log.go b/server/model/system/request/sys_login_log.go index 48d7256..80e0999 100644 --- a/server/model/system/request/sys_login_log.go +++ b/server/model/system/request/sys_login_log.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) type SysLoginLogSearch struct { diff --git a/server/model/system/request/sys_menu.go b/server/model/system/request/sys_menu.go index 75d4a5c..b60ab38 100644 --- a/server/model/system/request/sys_menu.go +++ b/server/model/system/request/sys_menu.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) // AddMenuAuthorityInfo Add menu authority info structure diff --git a/server/model/system/request/sys_operation_record.go b/server/model/system/request/sys_operation_record.go index e58dd59..ddb6a65 100644 --- a/server/model/system/request/sys_operation_record.go +++ b/server/model/system/request/sys_operation_record.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) type SysOperationRecordSearch struct { diff --git a/server/model/system/request/sys_params.go b/server/model/system/request/sys_params.go index 0009271..5c01c4d 100644 --- a/server/model/system/request/sys_params.go +++ b/server/model/system/request/sys_params.go @@ -1,7 +1,7 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" "time" ) diff --git a/server/model/system/request/sys_user.go b/server/model/system/request/sys_user.go index 7950774..e7d9207 100644 --- a/server/model/system/request/sys_user.go +++ b/server/model/system/request/sys_user.go @@ -1,8 +1,8 @@ package request import ( - common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + common "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) // Register User register structure diff --git a/server/model/system/request/sys_version.go b/server/model/system/request/sys_version.go index 3d6d7ff..3994357 100644 --- a/server/model/system/request/sys_version.go +++ b/server/model/system/request/sys_version.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "time" ) @@ -33,8 +33,8 @@ type ImportVersionRequest struct { // VersionInfo 版本信息结构体 type VersionInfo struct { - Name string `json:"name" binding:"required"` // 版本名称 - Code string `json:"code" binding:"required"` // 版本号 - Description string `json:"description"` // 版本描述 - ExportTime string `json:"exportTime"` // 导出时间 + Name string `json:"name" binding:"required"` // 版本名称 + Code string `json:"code" binding:"required"` // 版本号 + Description string `json:"description"` // 版本描述 + ExportTime string `json:"exportTime"` // 导出时间 } diff --git a/server/model/system/response/sys_api.go b/server/model/system/response/sys_api.go index 20e382b..4349bbb 100644 --- a/server/model/system/response/sys_api.go +++ b/server/model/system/response/sys_api.go @@ -1,7 +1,7 @@ package response import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) type SysAPIResponse struct { diff --git a/server/model/system/response/sys_authority.go b/server/model/system/response/sys_authority.go index a055401..f22701d 100644 --- a/server/model/system/response/sys_authority.go +++ b/server/model/system/response/sys_authority.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/server/model/system" +import "git.echol.cn/loser/Go-Web-Template/server/model/system" type SysAuthorityResponse struct { Authority system.SysAuthority `json:"authority"` diff --git a/server/model/system/response/sys_casbin.go b/server/model/system/response/sys_casbin.go index 267bb42..1e632d1 100644 --- a/server/model/system/response/sys_casbin.go +++ b/server/model/system/response/sys_casbin.go @@ -1,7 +1,7 @@ package response import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" ) type PolicyPathResponse struct { diff --git a/server/model/system/response/sys_menu.go b/server/model/system/response/sys_menu.go index d8f80f3..0e05a31 100644 --- a/server/model/system/response/sys_menu.go +++ b/server/model/system/response/sys_menu.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/server/model/system" +import "git.echol.cn/loser/Go-Web-Template/server/model/system" type SysMenusResponse struct { Menus []system.SysMenu `json:"menus"` diff --git a/server/model/system/response/sys_system.go b/server/model/system/response/sys_system.go index f19e965..d5243e0 100644 --- a/server/model/system/response/sys_system.go +++ b/server/model/system/response/sys_system.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/server/config" +import "git.echol.cn/loser/Go-Web-Template/server/config" type SysConfigResponse struct { Config config.Server `json:"config"` diff --git a/server/model/system/response/sys_user.go b/server/model/system/response/sys_user.go index d6f1074..fe5889f 100644 --- a/server/model/system/response/sys_user.go +++ b/server/model/system/response/sys_user.go @@ -1,7 +1,7 @@ package response import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) type SysUserResponse struct { diff --git a/server/model/system/response/sys_version.go b/server/model/system/response/sys_version.go index b207ddc..29cb9ba 100644 --- a/server/model/system/response/sys_version.go +++ b/server/model/system/response/sys_version.go @@ -1,8 +1,8 @@ package response import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" ) // ExportVersionResponse 导出版本响应结构体 diff --git a/server/model/system/sys_api.go b/server/model/system/sys_api.go index 853ddb0..148a54c 100644 --- a/server/model/system/sys_api.go +++ b/server/model/system/sys_api.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) type SysApi struct { diff --git a/server/model/system/sys_api_token.go b/server/model/system/sys_api_token.go index 2bfbde8..be8a071 100644 --- a/server/model/system/sys_api_token.go +++ b/server/model/system/sys_api_token.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "time" ) diff --git a/server/model/system/sys_base_menu.go b/server/model/system/sys_base_menu.go index 6595db1..ed8bded 100644 --- a/server/model/system/sys_base_menu.go +++ b/server/model/system/sys_base_menu.go @@ -1,41 +1,41 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) type SysBaseMenu struct { global.GVA_MODEL - MenuLevel uint `json:"-"` - ParentId uint `json:"parentId" gorm:"comment:父菜单ID"` // 父菜单ID - Path string `json:"path" gorm:"comment:路由path"` // 路由path - Name string `json:"name" gorm:"comment:路由name"` // 路由name - Hidden bool `json:"hidden" gorm:"comment:是否在列表隐藏"` // 是否在列表隐藏 - Component string `json:"component" gorm:"comment:对应前端文件路径"` // 对应前端文件路径 - Sort int `json:"sort" gorm:"comment:排序标记"` // 排序标记 - Meta `json:"meta" gorm:"embedded"` // 附加属性 - SysAuthoritys []SysAuthority `json:"authoritys" gorm:"many2many:sys_authority_menus;"` - Children []SysBaseMenu `json:"children" gorm:"-"` - Parameters []SysBaseMenuParameter `json:"parameters"` - MenuBtn []SysBaseMenuBtn `json:"menuBtn"` + MenuLevel uint `json:"-"` + ParentId uint `json:"parentId" gorm:"comment:父菜单ID"` // 父菜单ID + Path string `json:"path" gorm:"comment:路由path"` // 路由path + Name string `json:"name" gorm:"comment:路由name"` // 路由name + Hidden bool `json:"hidden" gorm:"comment:是否在列表隐藏"` // 是否在列表隐藏 + Component string `json:"component" gorm:"comment:对应前端文件路径"` // 对应前端文件路径 + Sort int `json:"sort" gorm:"comment:排序标记"` // 排序标记 + Meta `json:"meta" gorm:"embedded"` // 附加属性 + SysAuthoritys []SysAuthority `json:"authoritys" gorm:"many2many:sys_authority_menus;"` + Children []SysBaseMenu `json:"children" gorm:"-"` + Parameters []SysBaseMenuParameter `json:"parameters"` + MenuBtn []SysBaseMenuBtn `json:"menuBtn"` } type Meta struct { ActiveName string `json:"activeName" gorm:"comment:高亮菜单"` - KeepAlive bool `json:"keepAlive" gorm:"comment:是否缓存"` // 是否缓存 + KeepAlive bool `json:"keepAlive" gorm:"comment:是否缓存"` // 是否缓存 DefaultMenu bool `json:"defaultMenu" gorm:"comment:是否是基础路由（开发中）"` // 是否是基础路由（开发中） - Title string `json:"title" gorm:"comment:菜单名"` // 菜单名 - Icon string `json:"icon" gorm:"comment:菜单图标"` // 菜单图标 - CloseTab bool `json:"closeTab" gorm:"comment:自动关闭tab"` // 自动关闭tab - TransitionType string `json:"transitionType" gorm:"comment:路由切换动画"` // 路由切换动画 + Title string `json:"title" gorm:"comment:菜单名"` // 菜单名 + Icon string `json:"icon" gorm:"comment:菜单图标"` // 菜单图标 + CloseTab bool `json:"closeTab" gorm:"comment:自动关闭tab"` // 自动关闭tab + TransitionType string `json:"transitionType" gorm:"comment:路由切换动画"` // 路由切换动画 } type SysBaseMenuParameter struct { global.GVA_MODEL SysBaseMenuID uint Type string `json:"type" gorm:"comment:地址栏携带参数为params还是query"` // 地址栏携带参数为params还是query - Key string `json:"key" gorm:"comment:地址栏携带参数的key"` // 地址栏携带参数的key - Value string `json:"value" gorm:"comment:地址栏携带参数的值"` // 地址栏携带参数的值 + Key string `json:"key" gorm:"comment:地址栏携带参数的key"` // 地址栏携带参数的key + Value string `json:"value" gorm:"comment:地址栏携带参数的值"` // 地址栏携带参数的值 } func (SysBaseMenu) TableName() string { diff --git a/server/model/system/sys_dictionary.go b/server/model/system/sys_dictionary.go index 0bc6084..2b53681 100644 --- a/server/model/system/sys_dictionary.go +++ b/server/model/system/sys_dictionary.go @@ -2,7 +2,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) // 如果含有time.Time 请自行import time包 diff --git a/server/model/system/sys_dictionary_detail.go b/server/model/system/sys_dictionary_detail.go index 1e9dfda..30fb4f7 100644 --- a/server/model/system/sys_dictionary_detail.go +++ b/server/model/system/sys_dictionary_detail.go @@ -2,7 +2,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) // 如果含有time.Time 请自行import time包 diff --git a/server/model/system/sys_error.go b/server/model/system/sys_error.go index 7f5671b..b6bddef 100644 --- a/server/model/system/sys_error.go +++ b/server/model/system/sys_error.go @@ -2,7 +2,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) // 错误日志 结构体 SysError diff --git a/server/model/system/sys_export_template.go b/server/model/system/sys_export_template.go index 68dce3e..ca80b4f 100644 --- a/server/model/system/sys_export_template.go +++ b/server/model/system/sys_export_template.go @@ -2,7 +2,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) // 导出模板 结构体 SysExportTemplate diff --git a/server/model/system/sys_jwt_blacklist.go b/server/model/system/sys_jwt_blacklist.go index 4f9fa39..ff76aa7 100644 --- a/server/model/system/sys_jwt_blacklist.go +++ b/server/model/system/sys_jwt_blacklist.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) type JwtBlacklist struct { diff --git a/server/model/system/sys_login_log.go b/server/model/system/sys_login_log.go index b1fd08b..478146a 100644 --- a/server/model/system/sys_login_log.go +++ b/server/model/system/sys_login_log.go @@ -1,16 +1,16 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) type SysLoginLog struct { global.GVA_MODEL - Username string `json:"username" gorm:"column:username;comment:用户名"` - Ip string `json:"ip" gorm:"column:ip;comment:请求ip"` - Status bool `json:"status" gorm:"column:status;comment:登录状态"` - ErrorMessage string `json:"errorMessage" gorm:"column:error_message;comment:错误信息"` - Agent string `json:"agent" gorm:"column:agent;comment:代理"` - UserID uint `json:"userId" gorm:"column:user_id;comment:用户id"` - User SysUser `json:"user" gorm:"foreignKey:UserID"` + Username string `json:"username" gorm:"column:username;comment:用户名"` + Ip string `json:"ip" gorm:"column:ip;comment:请求ip"` + Status bool `json:"status" gorm:"column:status;comment:登录状态"` + ErrorMessage string `json:"errorMessage" gorm:"column:error_message;comment:错误信息"` + Agent string `json:"agent" gorm:"column:agent;comment:代理"` + UserID uint `json:"userId" gorm:"column:user_id;comment:用户id"` + User SysUser `json:"user" gorm:"foreignKey:UserID"` } diff --git a/server/model/system/sys_menu_btn.go b/server/model/system/sys_menu_btn.go index 9d32761..ade196e 100644 --- a/server/model/system/sys_menu_btn.go +++ b/server/model/system/sys_menu_btn.go @@ -1,6 +1,6 @@ package system -import "github.com/flipped-aurora/gin-vue-admin/server/global" +import "git.echol.cn/loser/Go-Web-Template/server/global" type SysBaseMenuBtn struct { global.GVA_MODEL diff --git a/server/model/system/sys_operation_record.go b/server/model/system/sys_operation_record.go index 3d201d3..d741833 100644 --- a/server/model/system/sys_operation_record.go +++ b/server/model/system/sys_operation_record.go @@ -4,7 +4,7 @@ package system import ( "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) // 如果含有time.Time 请自行import time包 diff --git a/server/model/system/sys_params.go b/server/model/system/sys_params.go index 049c07f..452dce2 100644 --- a/server/model/system/sys_params.go +++ b/server/model/system/sys_params.go @@ -2,7 +2,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) // 参数 结构体 SysParams diff --git a/server/model/system/sys_system.go b/server/model/system/sys_system.go index ad98311..b231d55 100644 --- a/server/model/system/sys_system.go +++ b/server/model/system/sys_system.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/config" + "git.echol.cn/loser/Go-Web-Template/server/config" ) // 配置文件结构体 diff --git a/server/model/system/sys_user.go b/server/model/system/sys_user.go index f20cd87..3253b4b 100644 --- a/server/model/system/sys_user.go +++ b/server/model/system/sys_user.go @@ -1,8 +1,8 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common" "github.com/google/uuid" ) diff --git a/server/model/system/sys_version.go b/server/model/system/sys_version.go index e7c0a82..cb44e22 100644 --- a/server/model/system/sys_version.go +++ b/server/model/system/sys_version.go @@ -2,16 +2,16 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" ) // 版本管理 结构体 SysVersion type SysVersion struct { global.GVA_MODEL - VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"` //版本名称 - VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"` //版本号 - Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"` //版本描述 - VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:text;"` //版本数据 + VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"` //版本名称 + VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"` //版本号 + Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"` //版本描述 + VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:text;"` //版本数据 } // TableName 版本管理 SysVersion自定义表名 sys_versions diff --git a/server/resource/function/api.go.tpl b/server/resource/function/api.go.tpl deleted file mode 100644 index 606eb9c..0000000 --- a/server/resource/function/api.go.tpl +++ /dev/null @@ -1,20 +0,0 @@ -// {{.FuncName}} {{.FuncDesc}} -// @Tags {{.StructName}} -// @Summary {{.FuncDesc}} -// @Accept application/json -// @Produce application/json -// @Param data query {{.Package}}Req.{{.StructName}}Search true "成功" -// @Success 200 {object} response.Response{data=object,msg=string} "成功" -// @Router /{{.Abbreviation}}/{{.Router}} [{{.Method}}] -func ({{.Abbreviation}}Api *{{.StructName}}Api){{.FuncName}}(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - // 请添加自己的业务逻辑 - err := {{.Abbreviation}}Service.{{.FuncName}}(ctx) - if err != nil { - global.GVA_LOG.Error("失败!", zap.Error(err)) - response.FailWithMessage("失败", c) - return - } - response.OkWithData("返回数据",c) -} diff --git a/server/resource/function/api.js.tpl b/server/resource/function/api.js.tpl deleted file mode 100644 index 07f82b3..0000000 --- a/server/resource/function/api.js.tpl +++ /dev/null @@ -1,13 +0,0 @@ -// {{.FuncName}} {{.FuncDesc}} -// @Tags {{.StructName}} -// @Summary {{.FuncDesc}} -// @Accept application/json -// @Produce application/json -// @Success 200 {object} response.Response{data=object,msg=string} "成功" -// @Router /{{.Abbreviation}}/{{.Router}} [{{.Method}}] -export const {{.Router}} = () => { - return service({ - url: '/{{.Abbreviation}}/{{.Router}}', - method: '{{.Method}}' - }) -} diff --git a/server/resource/function/server.go.tpl b/server/resource/function/server.go.tpl deleted file mode 100644 index 87f0476..0000000 --- a/server/resource/function/server.go.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{- $db := "" }} -{{- if eq .BusinessDB "" }} - {{- $db = "global.GVA_DB" }} -{{- else}} - {{- $db = printf "global.MustGetGlobalDBByDBName(\"%s\")" .BusinessDB }} -{{- end}} - -// {{.FuncName}} {{.FuncDesc}} -// Author [yourname](https://github.com/yourname) -func ({{.Abbreviation}}Service *{{.StructName}}Service){{.FuncName}}(ctx context.Context) (err error) { - // 请在这里实现自己的业务逻辑 - db := {{$db}}.Model(&{{.Package}}.{{.StructName}}{}) - return db.Error -} diff --git a/server/resource/package/readme.txt.tpl b/server/resource/package/readme.txt.tpl deleted file mode 100644 index 25de230..0000000 --- a/server/resource/package/readme.txt.tpl +++ /dev/null @@ -1,7 +0,0 @@ -代码解压后把fe的api文件内容粘贴进前端api文件夹下并修改为自己想要的名字即可 - -后端代码解压后同理，放到自己想要的 mvc对应路径 并且到 initRouter中注册自动生成的路由 到registerTable中注册自动生成的model - -项目github:"https://github.com/piexlmax/github.com/flipped-aurora/gin-vue-admin/server" - -希望大家给个star多多鼓励 diff --git a/server/resource/package/server/api/api.go.tpl b/server/resource/package/server/api/api.go.tpl deleted file mode 100644 index 528487f..0000000 --- a/server/resource/package/server/api/api.go.tpl +++ /dev/null @@ -1,260 +0,0 @@ -package {{.Package}} - -import ( - {{if not .OnlyTemplate}} - "{{.Module}}/global" - "{{.Module}}/model/common/response" - "{{.Module}}/model/{{.Package}}" - {{- if not .IsTree}} - {{.Package}}Req "{{.Module}}/model/{{.Package}}/request" - {{- end }} - "github.com/gin-gonic/gin" - "go.uber.org/zap" - {{- if .AutoCreateResource}} - "{{.Module}}/utils" - {{- end }} - {{- else}} - "{{.Module}}/model/common/response" - "github.com/gin-gonic/gin" - {{- end}} -) - -type {{.StructName}}Api struct {} - -{{if not .OnlyTemplate}} - -// Create{{.StructName}} 创建{{.Description}} -// @Tags {{.StructName}} -// @Summary 创建{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data body {{.Package}}.{{.StructName}} true "创建{{.Description}}" -// @Success 200 {object} response.Response{msg=string} "创建成功" -// @Router /{{.Abbreviation}}/create{{.StructName}} [post] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Create{{.StructName}}(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - - var {{.Abbreviation}} {{.Package}}.{{.StructName}} - err := c.ShouldBindJSON(&{{.Abbreviation}}) - if err != nil { - response.FailWithMessage(err.Error(), c) - return - } - {{- if .AutoCreateResource }} - {{.Abbreviation}}.CreatedBy = utils.GetUserID(c) - {{- end }} - err = {{.Abbreviation}}Service.Create{{.StructName}}(ctx,&{{.Abbreviation}}) - if err != nil { - global.GVA_LOG.Error("创建失败!", zap.Error(err)) - response.FailWithMessage("创建失败:" + err.Error(), c) - return - } - response.OkWithMessage("创建成功", c) -} - -// Delete{{.StructName}} 删除{{.Description}} -// @Tags {{.StructName}} -// @Summary 删除{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data body {{.Package}}.{{.StructName}} true "删除{{.Description}}" -// @Success 200 {object} response.Response{msg=string} "删除成功" -// @Router /{{.Abbreviation}}/delete{{.StructName}} [delete] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - - {{.PrimaryField.FieldJson}} := c.Query("{{.PrimaryField.FieldJson}}") - {{- if .AutoCreateResource }} - userID := utils.GetUserID(c) - {{- end }} - err := {{.Abbreviation}}Service.Delete{{.StructName}}(ctx,{{.PrimaryField.FieldJson}} {{- if .AutoCreateResource -}},userID{{- end -}}) - if err != nil { - global.GVA_LOG.Error("删除失败!", zap.Error(err)) - response.FailWithMessage("删除失败:" + err.Error(), c) - return - } - response.OkWithMessage("删除成功", c) -} - -// Delete{{.StructName}}ByIds 批量删除{{.Description}} -// @Tags {{.StructName}} -// @Summary 批量删除{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Success 200 {object} response.Response{msg=string} "批量删除成功" -// @Router /{{.Abbreviation}}/delete{{.StructName}}ByIds [delete] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}ByIds(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - - {{.PrimaryField.FieldJson}}s := c.QueryArray("{{.PrimaryField.FieldJson}}s[]") - {{- if .AutoCreateResource }} - userID := utils.GetUserID(c) - {{- end }} - err := {{.Abbreviation}}Service.Delete{{.StructName}}ByIds(ctx,{{.PrimaryField.FieldJson}}s{{- if .AutoCreateResource }},userID{{- end }}) - if err != nil { - global.GVA_LOG.Error("批量删除失败!", zap.Error(err)) - response.FailWithMessage("批量删除失败:" + err.Error(), c) - return - } - response.OkWithMessage("批量删除成功", c) -} - -// Update{{.StructName}} 更新{{.Description}} -// @Tags {{.StructName}} -// @Summary 更新{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data body {{.Package}}.{{.StructName}} true "更新{{.Description}}" -// @Success 200 {object} response.Response{msg=string} "更新成功" -// @Router /{{.Abbreviation}}/update{{.StructName}} [put] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Context) { - // 从ctx获取标准context进行业务行为 - ctx := c.Request.Context() - - var {{.Abbreviation}} {{.Package}}.{{.StructName}} - err := c.ShouldBindJSON(&{{.Abbreviation}}) - if err != nil { - response.FailWithMessage(err.Error(), c) - return - } - {{- if .AutoCreateResource }} - {{.Abbreviation}}.UpdatedBy = utils.GetUserID(c) - {{- end }} - err = {{.Abbreviation}}Service.Update{{.StructName}}(ctx,{{.Abbreviation}}) - if err != nil { - global.GVA_LOG.Error("更新失败!", zap.Error(err)) - response.FailWithMessage("更新失败:" + err.Error(), c) - return - } - response.OkWithMessage("更新成功", c) -} - -// Find{{.StructName}} 用id查询{{.Description}} -// @Tags {{.StructName}} -// @Summary 用id查询{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param {{.PrimaryField.FieldJson}} query {{.PrimaryField.FieldType}} true "用id查询{{.Description}}" -// @Success 200 {object} response.Response{data={{.Package}}.{{.StructName}},msg=string} "查询成功" -// @Router /{{.Abbreviation}}/find{{.StructName}} [get] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - - {{.PrimaryField.FieldJson}} := c.Query("{{.PrimaryField.FieldJson}}") - re{{.Abbreviation}}, err := {{.Abbreviation}}Service.Get{{.StructName}}(ctx,{{.PrimaryField.FieldJson}}) - if err != nil { - global.GVA_LOG.Error("查询失败!", zap.Error(err)) - response.FailWithMessage("查询失败:" + err.Error(), c) - return - } - response.OkWithData(re{{.Abbreviation}}, c) -} - -{{- if .IsTree }} -// Get{{.StructName}}List 分页获取{{.Description}}列表,Tree模式下不接受参数 -// @Tags {{.StructName}} -// @Summary 分页获取{{.Description}}列表 -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功" -// @Router /{{.Abbreviation}}/get{{.StructName}}List [get] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - - list, err := {{.Abbreviation}}Service.Get{{.StructName}}InfoList(ctx) - if err != nil { - global.GVA_LOG.Error("获取失败!", zap.Error(err)) - response.FailWithMessage("获取失败:" + err.Error(), c) - return - } - response.OkWithDetailed(list, "获取成功", c) -} -{{- else }} -// Get{{.StructName}}List 分页获取{{.Description}}列表 -// @Tags {{.StructName}} -// @Summary 分页获取{{.Description}}列表 -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data query {{.Package}}Req.{{.StructName}}Search true "分页获取{{.Description}}列表" -// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功" -// @Router /{{.Abbreviation}}/get{{.StructName}}List [get] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - - var pageInfo {{.Package}}Req.{{.StructName}}Search - err := c.ShouldBindQuery(&pageInfo) - if err != nil { - response.FailWithMessage(err.Error(), c) - return - } - list, total, err := {{.Abbreviation}}Service.Get{{.StructName}}InfoList(ctx,pageInfo) - if err != nil { - global.GVA_LOG.Error("获取失败!", zap.Error(err)) - response.FailWithMessage("获取失败:" + err.Error(), c) - return - } - response.OkWithDetailed(response.PageResult{ - List: list, - Total: total, - Page: pageInfo.Page, - PageSize: pageInfo.PageSize, - }, "获取成功", c) -} -{{- end }} - -{{- if .HasDataSource }} -// Get{{.StructName}}DataSource 获取{{.StructName}}的数据源 -// @Tags {{.StructName}} -// @Summary 获取{{.StructName}}的数据源 -// @Accept application/json -// @Produce application/json -// @Success 200 {object} response.Response{data=object,msg=string} "查询成功" -// @Router /{{.Abbreviation}}/get{{.StructName}}DataSource [get] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}DataSource(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - - // 此接口为获取数据源定义的数据 - dataSource, err := {{.Abbreviation}}Service.Get{{.StructName}}DataSource(ctx) - if err != nil { - global.GVA_LOG.Error("查询失败!", zap.Error(err)) - response.FailWithMessage("查询失败:" + err.Error(), c) - return - } - response.OkWithData(dataSource, c) -} -{{- end }} - -{{- end }} - -// Get{{.StructName}}Public 不需要鉴权的{{.Description}}接口 -// @Tags {{.StructName}} -// @Summary 不需要鉴权的{{.Description}}接口 -// @Accept application/json -// @Produce application/json -// @Success 200 {object} response.Response{data=object,msg=string} "获取成功" -// @Router /{{.Abbreviation}}/get{{.StructName}}Public [get] -func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}Public(c *gin.Context) { - // 创建业务用Context - ctx := c.Request.Context() - - // 此接口不需要鉴权 - // 示例为返回了一个固定的消息接口，一般本接口用于C端服务，需要自己实现业务逻辑 - {{.Abbreviation}}Service.Get{{.StructName}}Public(ctx) - response.OkWithDetailed(gin.H{ - "info": "不需要鉴权的{{.Description}}接口信息", - }, "获取成功", c) -} diff --git a/server/resource/package/server/api/enter.go.tpl b/server/resource/package/server/api/enter.go.tpl deleted file mode 100644 index 778b314..0000000 --- a/server/resource/package/server/api/enter.go.tpl +++ /dev/null @@ -1,4 +0,0 @@ -package {{ .Package }} - -type ApiGroup struct { -} \ No newline at end of file diff --git a/server/resource/package/server/model/model.go.tpl b/server/resource/package/server/model/model.go.tpl deleted file mode 100644 index e1603ed..0000000 --- a/server/resource/package/server/model/model.go.tpl +++ /dev/null @@ -1,75 +0,0 @@ -{{- if .IsAdd}} -// 在结构体中新增如下字段 -{{- range .Fields}} - {{ GenerateField . }} -{{- end }} - -{{ else }} -// 自动生成模板{{.StructName}} -package {{.Package}} - -{{- if not .OnlyTemplate}} -import ( - {{- if .GvaModel }} - "{{.Module}}/global" - {{- end }} - {{- if or .HasTimer }} - "time" - {{- end }} - {{- if .NeedJSON }} - "gorm.io/datatypes" - {{- end }} -) -{{- end }} - -// {{.Description}} 结构体 {{.StructName}} -type {{.StructName}} struct { -{{- if not .OnlyTemplate}} -{{- if .GvaModel }} - global.GVA_MODEL -{{- end }} -{{- range .Fields}} - {{ GenerateField . }} -{{- end }} - {{- if .AutoCreateResource }} - CreatedBy uint `gorm:"column:created_by;comment:创建者"` - UpdatedBy uint `gorm:"column:updated_by;comment:更新者"` - DeletedBy uint `gorm:"column:deleted_by;comment:删除者"` - {{- end }} - {{- if .IsTree }} - Children []*{{.StructName}} `json:"children" gorm:"-"` //子节点 - ParentID int `json:"parentID" gorm:"column:parent_id;comment:父节点"` - {{- end }} -{{- end }} -} - -{{ if .TableName }} -// TableName {{.Description}} {{.StructName}}自定义表名 {{.TableName}} -func ({{.StructName}}) TableName() string { - return "{{.TableName}}" -} -{{ end }} - -{{if .IsTree }} -// GetChildren 实现TreeNode接口 -func (s *{{.StructName}}) GetChildren() []*{{.StructName}} { - return s.Children -} - -// SetChildren 实现TreeNode接口 -func (s *{{.StructName}}) SetChildren(children *{{.StructName}}) { - s.Children = append(s.Children, children) -} - -// GetID 实现TreeNode接口 -func (s *{{.StructName}}) GetID() int { - return int({{if not .GvaModel}}*{{- end }}s.{{.PrimaryField.FieldName}}) -} - -// GetParentID 实现TreeNode接口 -func (s *{{.StructName}}) GetParentID() int { - return s.ParentID -} -{{ end }} - -{{ end }} diff --git a/server/resource/package/server/model/request/request.go.tpl b/server/resource/package/server/model/request/request.go.tpl deleted file mode 100644 index f8749f3..0000000 --- a/server/resource/package/server/model/request/request.go.tpl +++ /dev/null @@ -1,39 +0,0 @@ -{{- if .IsAdd}} -// 在结构体中新增如下字段 -{{- range .Fields}} - {{- if ne .FieldSearchType ""}} - {{ GenerateSearchField . }} - {{- end}} -{{- end }} -{{- if .NeedSort}} -Sort string `json:"sort" form:"sort"` -Order string `json:"order" form:"order"` -{{- end}} -{{- else }} -package request - -import ( -{{- if not .OnlyTemplate }} - "{{.Module}}/model/common/request" - {{ if or .HasSearchTimer .GvaModel }}"time"{{ end }} -{{- end }} -) - -type {{.StructName}}Search struct{ -{{- if not .OnlyTemplate}} -{{- if .GvaModel }} - CreatedAtRange []time.Time `json:"createdAtRange" form:"createdAtRange[]"` -{{- end }} -{{- range .Fields}} - {{- if ne .FieldSearchType ""}} - {{ GenerateSearchField . }} - {{- end}} -{{- end }} - request.PageInfo - {{- if .NeedSort}} - Sort string `json:"sort" form:"sort"` - Order string `json:"order" form:"order"` - {{- end}} -{{- end}} -} -{{- end }} diff --git a/server/resource/package/server/router/enter.go.tpl b/server/resource/package/server/router/enter.go.tpl deleted file mode 100644 index 178aecf..0000000 --- a/server/resource/package/server/router/enter.go.tpl +++ /dev/null @@ -1,4 +0,0 @@ -package {{ .Package }} - -type RouterGroup struct { -} \ No newline at end of file diff --git a/server/resource/package/server/router/router.go.tpl b/server/resource/package/server/router/router.go.tpl deleted file mode 100644 index cac47ab..0000000 --- a/server/resource/package/server/router/router.go.tpl +++ /dev/null @@ -1,42 +0,0 @@ -package {{.Package}} - -import ( - {{if .OnlyTemplate}}// {{ end}}"{{.Module}}/middleware" - "github.com/gin-gonic/gin" -) - -type {{.StructName}}Router struct {} - -// Init{{.StructName}}Router 初始化 {{.Description}} 路由信息 -func (s *{{.StructName}}Router) Init{{.StructName}}Router(Router *gin.RouterGroup,PublicRouter *gin.RouterGroup) { - {{- if not .OnlyTemplate}} - {{.Abbreviation}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.OperationRecord()) - {{.Abbreviation}}RouterWithoutRecord := Router.Group("{{.Abbreviation}}") - {{- else }} - // {{.Abbreviation}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.OperationRecord()) - // {{.Abbreviation}}RouterWithoutRecord := Router.Group("{{.Abbreviation}}") - {{- end}} - {{.Abbreviation}}RouterWithoutAuth := PublicRouter.Group("{{.Abbreviation}}") - {{- if not .OnlyTemplate}} - { - {{.Abbreviation}}Router.POST("create{{.StructName}}", {{.Abbreviation}}Api.Create{{.StructName}}) // 新建{{.Description}} - {{.Abbreviation}}Router.DELETE("delete{{.StructName}}", {{.Abbreviation}}Api.Delete{{.StructName}}) // 删除{{.Description}} - {{.Abbreviation}}Router.DELETE("delete{{.StructName}}ByIds", {{.Abbreviation}}Api.Delete{{.StructName}}ByIds) // 批量删除{{.Description}} - {{.Abbreviation}}Router.PUT("update{{.StructName}}", {{.Abbreviation}}Api.Update{{.StructName}}) // 更新{{.Description}} - } - { - {{.Abbreviation}}RouterWithoutRecord.GET("find{{.StructName}}", {{.Abbreviation}}Api.Find{{.StructName}}) // 根据ID获取{{.Description}} - {{.Abbreviation}}RouterWithoutRecord.GET("get{{.StructName}}List", {{.Abbreviation}}Api.Get{{.StructName}}List) // 获取{{.Description}}列表 - } - { - {{- if .HasDataSource}} - {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}DataSource", {{.Abbreviation}}Api.Get{{.StructName}}DataSource) // 获取{{.Description}}数据源 - {{- end}} - {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}Public", {{.Abbreviation}}Api.Get{{.StructName}}Public) // {{.Description}}开放接口 - } - {{- else}} - { - {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}Public", {{.Abbreviation}}Api.Get{{.StructName}}Public) // {{.Description}}开放接口 - } - {{ end }} -} diff --git a/server/resource/package/server/service/enter.go.tpl b/server/resource/package/server/service/enter.go.tpl deleted file mode 100644 index adf1db0..0000000 --- a/server/resource/package/server/service/enter.go.tpl +++ /dev/null @@ -1,4 +0,0 @@ -package {{ .Package }} - -type ServiceGroup struct { -} \ No newline at end of file diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl deleted file mode 100644 index acd57a3..0000000 --- a/server/resource/package/server/service/service.go.tpl +++ /dev/null @@ -1,213 +0,0 @@ -{{- $db := "" }} -{{- if eq .BusinessDB "" }} - {{- $db = "global.GVA_DB" }} -{{- else}} - {{- $db = printf "global.MustGetGlobalDBByDBName(\"%s\")" .BusinessDB }} -{{- end}} - -{{- if .IsAdd}} - -// Get{{.StructName}}InfoList 新增搜索语句 - {{ GenerateSearchConditions .Fields }} -// Get{{.StructName}}InfoList 新增排序语句 请自行在搜索语句中添加orderMap内容 - {{- range .Fields}} - {{- if .Sort}} -orderMap["{{.ColumnName}}"] = true - {{- end}} - {{- end}} - - -{{- if .HasDataSource }} -// Get{{.StructName}}DataSource()方法新增关联语句 - {{range $key, $value := .DataSourceMap}} -{{$key}} := make([]map[string]any, 0) -{{ $dataDB := "" }} -{{- if eq $value.DBName "" }} -{{ $dataDB = $db }} -{{- else}} -{{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }} -{{- end}} -{{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}}) -res["{{$key}}"] = {{$key}} - {{- end }} -{{- end }} -{{- else}} -package {{.Package}} - -import ( -{{- if not .OnlyTemplate }} - "context" - "{{.Module}}/global" - "{{.Module}}/model/{{.Package}}" - {{- if not .IsTree}} - {{.Package}}Req "{{.Module}}/model/{{.Package}}/request" - {{- else }} - "{{.Module}}/utils" - "errors" - {{- end }} - {{- if .AutoCreateResource }} - "gorm.io/gorm" - {{- end}} -{{- end }} -) - -type {{.StructName}}Service struct {} - -{{- if not .OnlyTemplate }} -// Create{{.StructName}} 创建{{.Description}}记录 -// Author [yourname](https://github.com/yourname) -func ({{.Abbreviation}}Service *{{.StructName}}Service) Create{{.StructName}}(ctx context.Context, {{.Abbreviation}} *{{.Package}}.{{.StructName}}) (err error) { - err = {{$db}}.Create({{.Abbreviation}}).Error - return err -} - -// Delete{{.StructName}} 删除{{.Description}}记录 -// Author [yourname](https://github.com/yourname) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}(ctx context.Context, {{.PrimaryField.FieldJson}} string{{- if .AutoCreateResource -}},userID uint{{- end -}}) (err error) { - {{- if .IsTree }} - var count int64 - err = {{$db}}.Find(&{{.Package}}.{{.StructName}}{},"parent_id = ?",{{.PrimaryField.FieldJson}}).Count(&count).Error - if count > 0 { - return errors.New("此节点存在子节点不允许删除") - } - if err != nil { - return err - } - {{- end }} - - {{- if .AutoCreateResource }} - err = {{$db}}.Transaction(func(tx *gorm.DB) error { - if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).Update("deleted_by", userID).Error; err != nil { - return err - } - if err = tx.Delete(&{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} = ?",{{.PrimaryField.FieldJson}}).Error; err != nil { - return err - } - return nil - }) - {{- else }} - err = {{$db}}.Delete(&{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} = ?",{{.PrimaryField.FieldJson}}).Error - {{- end }} - return err -} - -// Delete{{.StructName}}ByIds 批量删除{{.Description}}记录 -// Author [yourname](https://github.com/yourname) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}ByIds(ctx context.Context, {{.PrimaryField.FieldJson}}s []string {{- if .AutoCreateResource }},deleted_by uint{{- end}}) (err error) { - {{- if .AutoCreateResource }} - err = {{$db}}.Transaction(func(tx *gorm.DB) error { - if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} in ?", {{.PrimaryField.FieldJson}}s).Update("deleted_by", deleted_by).Error; err != nil { - return err - } - if err := tx.Where("{{.PrimaryField.ColumnName}} in ?", {{.PrimaryField.FieldJson}}s).Delete(&{{.Package}}.{{.StructName}}{}).Error; err != nil { - return err - } - return nil - }) - {{- else}} - err = {{$db}}.Delete(&[]{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} in ?",{{.PrimaryField.FieldJson}}s).Error - {{- end}} - return err -} - -// Update{{.StructName}} 更新{{.Description}}记录 -// Author [yourname](https://github.com/yourname) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Update{{.StructName}}(ctx context.Context, {{.Abbreviation}} {{.Package}}.{{.StructName}}) (err error) { - err = {{$db}}.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} = ?",{{.Abbreviation}}.{{.PrimaryField.FieldName}}).Updates(&{{.Abbreviation}}).Error - return err -} - -// Get{{.StructName}} 根据{{.PrimaryField.FieldJson}}获取{{.Description}}记录 -// Author [yourname](https://github.com/yourname) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}(ctx context.Context, {{.PrimaryField.FieldJson}} string) ({{.Abbreviation}} {{.Package}}.{{.StructName}}, err error) { - err = {{$db}}.Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).First(&{{.Abbreviation}}).Error - return -} - - -{{- if .IsTree }} -// Get{{.StructName}}InfoList 分页获取{{.Description}}记录,Tree模式下不添加分页和搜索 -// Author [yourname](https://github.com/yourname) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoList(ctx context.Context) (list []*{{.Package}}.{{.StructName}},err error) { - // 创建db - db := {{$db}}.Model(&{{.Package}}.{{.StructName}}{}) - var {{.Abbreviation}}s []*{{.Package}}.{{.StructName}} - - err = db.Find(&{{.Abbreviation}}s).Error - - return utils.BuildTree({{.Abbreviation}}s), err -} -{{- else }} -// Get{{.StructName}}InfoList 分页获取{{.Description}}记录 -// Author [yourname](https://github.com/yourname) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoList(ctx context.Context, info {{.Package}}Req.{{.StructName}}Search) (list []{{.Package}}.{{.StructName}}, total int64, err error) { - limit := info.PageSize - offset := info.PageSize * (info.Page - 1) - // 创建db - db := {{$db}}.Model(&{{.Package}}.{{.StructName}}{}) - var {{.Abbreviation}}s []{{.Package}}.{{.StructName}} - // 如果有条件搜索 下方会自动创建搜索语句 -{{- if .GvaModel }} - if len(info.CreatedAtRange) == 2 { - db = db.Where("created_at BETWEEN ? AND ?", info.CreatedAtRange[0], info.CreatedAtRange[1]) - } -{{- end }} - {{ GenerateSearchConditions .Fields }} - err = db.Count(&total).Error - if err!=nil { - return - } - {{- if .NeedSort}} - var OrderStr string - orderMap := make(map[string]bool) - {{- if .GvaModel }} - orderMap["id"] = true - orderMap["created_at"] = true - {{- end }} - {{- range .Fields}} - {{- if .Sort}} - orderMap["{{.ColumnName}}"] = true - {{- end}} - {{- end}} - if orderMap[info.Sort] { - OrderStr = info.Sort - if info.Order == "descending" { - OrderStr = OrderStr + " desc" - } - db = db.Order(OrderStr) - } - {{- end}} - - if limit != 0 { - db = db.Limit(limit).Offset(offset) - } - - err = db.Find(&{{.Abbreviation}}s).Error - return {{.Abbreviation}}s, total, err -} - -{{- end }} - -{{- if .HasDataSource }} -func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}DataSource(ctx context.Context) (res map[string][]map[string]any, err error) { - res = make(map[string][]map[string]any) - {{range $key, $value := .DataSourceMap}} - {{$key}} := make([]map[string]any, 0) - {{ $dataDB := "" }} - {{- if eq $value.DBName "" }} - {{ $dataDB = "global.GVA_DB" }} - {{- else}} - {{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }} - {{- end}} - {{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}}) - res["{{$key}}"] = {{$key}} - {{- end }} - return -} -{{- end }} -{{- end }} -func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}Public(ctx context.Context) { - // 此方法为获取数据源定义的数据 - // 请自行实现 -} -{{- end }} diff --git a/server/resource/package/web/api/api.js.tpl b/server/resource/package/web/api/api.js.tpl deleted file mode 100644 index a41ef6f..0000000 --- a/server/resource/package/web/api/api.js.tpl +++ /dev/null @@ -1,130 +0,0 @@ -import service from '@/utils/request' - -{{- if not .OnlyTemplate}} -// @Tags {{.StructName}} -// @Summary 创建{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data body model.{{.StructName}} true "创建{{.Description}}" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}" -// @Router /{{.Abbreviation}}/create{{.StructName}} [post] -export const create{{.StructName}} = (data) => { - return service({ - url: '/{{.Abbreviation}}/create{{.StructName}}', - method: 'post', - data - }) -} - -// @Tags {{.StructName}} -// @Summary 删除{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data body model.{{.StructName}} true "删除{{.Description}}" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}" -// @Router /{{.Abbreviation}}/delete{{.StructName}} [delete] -export const delete{{.StructName}} = (params) => { - return service({ - url: '/{{.Abbreviation}}/delete{{.StructName}}', - method: 'delete', - params - }) -} - -// @Tags {{.StructName}} -// @Summary 批量删除{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data body request.IdsReq true "批量删除{{.Description}}" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}" -// @Router /{{.Abbreviation}}/delete{{.StructName}} [delete] -export const delete{{.StructName}}ByIds = (params) => { - return service({ - url: '/{{.Abbreviation}}/delete{{.StructName}}ByIds', - method: 'delete', - params - }) -} - -// @Tags {{.StructName}} -// @Summary 更新{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data body model.{{.StructName}} true "更新{{.Description}}" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}" -// @Router /{{.Abbreviation}}/update{{.StructName}} [put] -export const update{{.StructName}} = (data) => { - return service({ - url: '/{{.Abbreviation}}/update{{.StructName}}', - method: 'put', - data - }) -} - -// @Tags {{.StructName}} -// @Summary 用id查询{{.Description}} -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data query model.{{.StructName}} true "用id查询{{.Description}}" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" -// @Router /{{.Abbreviation}}/find{{.StructName}} [get] -export const find{{.StructName}} = (params) => { - return service({ - url: '/{{.Abbreviation}}/find{{.StructName}}', - method: 'get', - params - }) -} - -// @Tags {{.StructName}} -// @Summary 分页获取{{.Description}}列表 -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Param data query request.PageInfo true "分页获取{{.Description}}列表" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" -// @Router /{{.Abbreviation}}/get{{.StructName}}List [get] -export const get{{.StructName}}List = (params) => { - return service({ - url: '/{{.Abbreviation}}/get{{.StructName}}List', - method: 'get', - params - }) -} - -{{- if .HasDataSource}} -// @Tags {{.StructName}} -// @Summary 获取数据源 -// @Security ApiKeyAuth -// @Accept application/json -// @Produce application/json -// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" -// @Router /{{.Abbreviation}}/find{{.StructName}}DataSource [get] -export const get{{.StructName}}DataSource = () => { - return service({ - url: '/{{.Abbreviation}}/get{{.StructName}}DataSource', - method: 'get', - }) -} -{{- end}} - -{{- end}} - -// @Tags {{.StructName}} -// @Summary 不需要鉴权的{{.Description}}接口 -// @Accept application/json -// @Produce application/json -// @Param data query {{.Package}}Req.{{.StructName}}Search true "分页获取{{.Description}}列表" -// @Success 200 {object} response.Response{data=object,msg=string} "获取成功" -// @Router /{{.Abbreviation}}/get{{.StructName}}Public [get] -export const get{{.StructName}}Public = () => { - return service({ - url: '/{{.Abbreviation}}/get{{.StructName}}Public', - method: 'get', - }) -} diff --git a/server/resource/package/web/view/form.vue.tpl b/server/resource/package/web/view/form.vue.tpl deleted file mode 100644 index 28c1f02..0000000 --- a/server/resource/package/web/view/form.vue.tpl +++ /dev/null @@ -1,274 +0,0 @@ -{{- if .IsAdd }} -// 新增表单中增加如下代码 -{{- range .Fields}} - {{- if .Form}} - {{ GenerateFormItem . }} - {{- end }} -{{- end }} - -// 字典增加如下代码 - {{- range $index, $element := .DictTypes}} -const {{ $element }}Options = ref([]) - {{- end }} - -// init方法中增加如下调用 - -{{- range $index, $element := .DictTypes }} - {{ $element }}Options.value = await getDictFunc('{{$element}}') -{{- end }} - -// 基础formData结构增加如下字段 -{{- range .Fields}} - {{- if .Form}} - {{ GenerateDefaultFormValue . }} - {{- end }} - {{- end }} -// 验证规则中增加如下字段 - -{{- range .Fields }} - {{- if .Form }} - {{- if eq .Require true }} -{{.FieldJson }} : [{ - required: true, - message: '{{ .ErrorText }}', - trigger: ['input','blur'], -}, - {{- if eq .FieldType "string" }} -{ - whitespace: true, - message: '不能只输入空格', - trigger: ['input', 'blur'], -} - {{- end }} -], - {{- end }} - {{- end }} - {{- end }} - -{{- if .HasDataSource }} -// 请引用 -get{{.StructName}}DataSource, - -// 获取数据源 -const dataSource = ref([]) -const getDataSourceFunc = async()=>{ - const res = await get{{.StructName}}DataSource() - if (res.code === 0) { - dataSource.value = res.data - } -} -getDataSourceFunc() -{{- end }} -{{- else }} -{{- if not .OnlyTemplate }} - - - - - -{{- else }} - - - -{{- end }} -{{- end }} diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl deleted file mode 100644 index b2662da..0000000 --- a/server/resource/package/web/view/table.vue.tpl +++ /dev/null @@ -1,694 +0,0 @@ -{{- $global := . }} -{{- $templateID := printf "%s_%s" .Package .StructName }} -{{- if .IsAdd }} - -// 请在搜索条件中增加如下代码 -{{- range .Fields}} - {{- if .FieldSearchType}} -{{ GenerateSearchFormItem .}} - {{ end }} -{{ end }} - - -// 表格增加如下列代码 - -{{- range .Fields}} - {{- if .Table}} - {{ GenerateTableColumn . }} - {{- end }} -{{- end }} - -// 新增表单中增加如下代码 -{{- range .Fields}} - {{- if .Form}} - {{ GenerateFormItem . }} - {{- end }} -{{- end }} - -// 查看抽屉中增加如下代码 - -{{- range .Fields}} - {{- if .Desc }} - {{ GenerateDescriptionItem . }} - {{- end }} - {{- end }} - -// 字典增加如下代码 - {{- range $index, $element := .DictTypes}} -const {{ $element }}Options = ref([]) - {{- end }} - -// setOptions方法中增加如下调用 - -{{- range $index, $element := .DictTypes }} - {{ $element }}Options.value = await getDictFunc('{{$element}}') -{{- end }} - -// 基础formData结构（变量处和关闭表单处）增加如下字段 -{{- range .Fields}} - {{- if .Form}} - {{ GenerateDefaultFormValue . }} - {{- end }} - {{- end }} -// 验证规则中增加如下字段 - -{{- range .Fields }} - {{- if .Form }} - {{- if eq .Require true }} -{{.FieldJson }} : [{ - required: true, - message: '{{ .ErrorText }}', - trigger: ['input','blur'], -}, - {{- if eq .FieldType "string" }} -{ - whitespace: true, - message: '不能只输入空格', - trigger: ['input', 'blur'], -} - {{- end }} -], - {{- end }} - {{- end }} - {{- end }} - - - -{{- if .HasDataSource }} -// 请引用 -get{{.StructName}}DataSource, - -// 获取数据源 -const dataSource = ref({}) -const getDataSourceFunc = async()=>{ - const res = await get{{.StructName}}DataSource() - if (res.code === 0) { - dataSource.value = res.data - } -} -getDataSourceFunc() -{{- end }} - -{{- else }} - -{{- if not .OnlyTemplate}} - - - - - -{{- else}} - - - -{{- end }} - -{{- end }} diff --git a/server/router/common/enter.go b/server/router/common/enter.go index c4c09df..fe3f3de 100644 --- a/server/router/common/enter.go +++ b/server/router/common/enter.go @@ -1,7 +1,7 @@ package common import ( - api "github.com/flipped-aurora/gin-vue-admin/server/api/v1" + api "git.echol.cn/loser/Go-Web-Template/server/api/v1" ) type RouterGroup struct { diff --git a/server/router/enter.go b/server/router/enter.go index 2bc76e7..2fdafb1 100644 --- a/server/router/enter.go +++ b/server/router/enter.go @@ -1,8 +1,8 @@ package router import ( - "github.com/flipped-aurora/gin-vue-admin/server/router/common" - "github.com/flipped-aurora/gin-vue-admin/server/router/system" + "git.echol.cn/loser/Go-Web-Template/server/router/common" + "git.echol.cn/loser/Go-Web-Template/server/router/system" ) var RouterGroupApp = new(RouterGroup) diff --git a/server/router/system/enter.go b/server/router/system/enter.go index a5d6f1c..4d28b0a 100644 --- a/server/router/system/enter.go +++ b/server/router/system/enter.go @@ -1,6 +1,6 @@ package system -import api "github.com/flipped-aurora/gin-vue-admin/server/api/v1" +import api "git.echol.cn/loser/Go-Web-Template/server/api/v1" type RouterGroup struct { ApiRouter diff --git a/server/router/system/sys_api.go b/server/router/system/sys_api.go index 0134a25..40333de 100644 --- a/server/router/system/sys_api.go +++ b/server/router/system/sys_api.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) @@ -22,11 +22,11 @@ func (s *ApiRouter) InitApiRouter(Router *gin.RouterGroup, RouterPub *gin.Router apiRouter.POST("getApiById", apiRouterApi.GetApiById) // 获取单条Api消息 apiRouter.POST("updateApi", apiRouterApi.UpdateApi) // 更新api apiRouter.DELETE("deleteApisByIds", apiRouterApi.DeleteApisByIds) // 删除选中api - apiRouter.POST("setApiRoles", apiRouterApi.SetApiRoles) // 全量覆盖API关联角色 + apiRouter.POST("setApiRoles", apiRouterApi.SetApiRoles) // 全量覆盖API关联角色 } { - apiRouterWithoutRecord.POST("getAllApis", apiRouterApi.GetAllApis) // 获取所有api - apiRouterWithoutRecord.POST("getApiList", apiRouterApi.GetApiList) // 获取Api列表 + apiRouterWithoutRecord.POST("getAllApis", apiRouterApi.GetAllApis) // 获取所有api + apiRouterWithoutRecord.POST("getApiList", apiRouterApi.GetApiList) // 获取Api列表 apiRouterWithoutRecord.GET("getApiRoles", apiRouterApi.GetApiRoles) // 获取API关联角色ID列表 } { diff --git a/server/router/system/sys_api_token.go b/server/router/system/sys_api_token.go index ebedeb0..ad4f2fb 100644 --- a/server/router/system/sys_api_token.go +++ b/server/router/system/sys_api_token.go @@ -1,8 +1,8 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/api/v1" - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/api/v1" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_authority.go b/server/router/system/sys_authority.go index 67a2880..69f080a 100644 --- a/server/router/system/sys_authority.go +++ b/server/router/system/sys_authority.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) @@ -19,7 +19,7 @@ func (s *AuthorityRouter) InitAuthorityRouter(Router *gin.RouterGroup) { authorityRouter.POST("setRoleUsers", authorityApi.SetRoleUsers) // 全量覆盖角色关联用户 } { - authorityRouterWithoutRecord.POST("getAuthorityList", authorityApi.GetAuthorityList) // 获取角色列表 + authorityRouterWithoutRecord.POST("getAuthorityList", authorityApi.GetAuthorityList) // 获取角色列表 authorityRouterWithoutRecord.GET("getUsersByAuthority", authorityApi.GetUsersByAuthority) // 获取角色关联用户ID列表 } } diff --git a/server/router/system/sys_casbin.go b/server/router/system/sys_casbin.go index e4a3eb1..3fbf095 100644 --- a/server/router/system/sys_casbin.go +++ b/server/router/system/sys_casbin.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_dictionary.go b/server/router/system/sys_dictionary.go index c95e8ff..679aafc 100644 --- a/server/router/system/sys_dictionary.go +++ b/server/router/system/sys_dictionary.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_dictionary_detail.go b/server/router/system/sys_dictionary_detail.go index 3f4aa5d..0738ad0 100644 --- a/server/router/system/sys_dictionary_detail.go +++ b/server/router/system/sys_dictionary_detail.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_error.go b/server/router/system/sys_error.go index ea38602..5a50634 100644 --- a/server/router/system/sys_error.go +++ b/server/router/system/sys_error.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) @@ -9,20 +9,20 @@ type SysErrorRouter struct{} // InitSysErrorRouter 初始化 错误日志 路由信息 func (s *SysErrorRouter) InitSysErrorRouter(Router *gin.RouterGroup, PublicRouter *gin.RouterGroup) { - sysErrorRouter := Router.Group("sysError").Use(middleware.OperationRecord()) - sysErrorRouterWithoutRecord := Router.Group("sysError") - sysErrorRouterWithoutAuth := PublicRouter.Group("sysError") - { - sysErrorRouter.DELETE("deleteSysError", sysErrorApi.DeleteSysError) // 删除错误日志 - sysErrorRouter.DELETE("deleteSysErrorByIds", sysErrorApi.DeleteSysErrorByIds) // 批量删除错误日志 - sysErrorRouter.PUT("updateSysError", sysErrorApi.UpdateSysError) // 更新错误日志 - sysErrorRouter.GET("getSysErrorSolution", sysErrorApi.GetSysErrorSolution) // 触发错误日志处理 - } - { - sysErrorRouterWithoutRecord.GET("findSysError", sysErrorApi.FindSysError) // 根据ID获取错误日志 - sysErrorRouterWithoutRecord.GET("getSysErrorList", sysErrorApi.GetSysErrorList) // 获取错误日志列表 - } - { - sysErrorRouterWithoutAuth.POST("createSysError", sysErrorApi.CreateSysError) // 新建错误日志 - } + sysErrorRouter := Router.Group("sysError").Use(middleware.OperationRecord()) + sysErrorRouterWithoutRecord := Router.Group("sysError") + sysErrorRouterWithoutAuth := PublicRouter.Group("sysError") + { + sysErrorRouter.DELETE("deleteSysError", sysErrorApi.DeleteSysError) // 删除错误日志 + sysErrorRouter.DELETE("deleteSysErrorByIds", sysErrorApi.DeleteSysErrorByIds) // 批量删除错误日志 + sysErrorRouter.PUT("updateSysError", sysErrorApi.UpdateSysError) // 更新错误日志 + sysErrorRouter.GET("getSysErrorSolution", sysErrorApi.GetSysErrorSolution) // 触发错误日志处理 + } + { + sysErrorRouterWithoutRecord.GET("findSysError", sysErrorApi.FindSysError) // 根据ID获取错误日志 + sysErrorRouterWithoutRecord.GET("getSysErrorList", sysErrorApi.GetSysErrorList) // 获取错误日志列表 + } + { + sysErrorRouterWithoutAuth.POST("createSysError", sysErrorApi.CreateSysError) // 新建错误日志 + } } diff --git a/server/router/system/sys_export_template.go b/server/router/system/sys_export_template.go index fb82fb1..3cd55a5 100644 --- a/server/router/system/sys_export_template.go +++ b/server/router/system/sys_export_template.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) @@ -26,7 +26,7 @@ func (s *SysExportTemplateRouter) InitSysExportTemplateRouter(Router *gin.Router sysExportTemplateRouterWithoutRecord.GET("getSysExportTemplateList", exportTemplateApi.GetSysExportTemplateList) // 获取导出模板列表 sysExportTemplateRouterWithoutRecord.GET("exportExcel", exportTemplateApi.ExportExcel) // 获取导出token sysExportTemplateRouterWithoutRecord.GET("exportTemplate", exportTemplateApi.ExportTemplate) // 导出表格模板 - sysExportTemplateRouterWithoutRecord.GET("previewSQL", exportTemplateApi.PreviewSQL) // 预览SQL + sysExportTemplateRouterWithoutRecord.GET("previewSQL", exportTemplateApi.PreviewSQL) // 预览SQL } { sysExportTemplateRouterWithoutAuth.GET("exportExcelByToken", exportTemplateApi.ExportExcelByToken) // 通过token导出表格 diff --git a/server/router/system/sys_login_log.go b/server/router/system/sys_login_log.go index 3ef672e..1d588f1 100644 --- a/server/router/system/sys_login_log.go +++ b/server/router/system/sys_login_log.go @@ -1,8 +1,8 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/api/v1" - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/api/v1" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_menu.go b/server/router/system/sys_menu.go index 69fb65c..5df9ce9 100644 --- a/server/router/system/sys_menu.go +++ b/server/router/system/sys_menu.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_params.go b/server/router/system/sys_params.go index 50dd236..b60830d 100644 --- a/server/router/system/sys_params.go +++ b/server/router/system/sys_params.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_system.go b/server/router/system/sys_system.go index 1a9643f..dd591fb 100644 --- a/server/router/system/sys_system.go +++ b/server/router/system/sys_system.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_user.go b/server/router/system/sys_user.go index 0e076f7..4e01866 100644 --- a/server/router/system/sys_user.go +++ b/server/router/system/sys_user.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/router/system/sys_version.go b/server/router/system/sys_version.go index 249feb8..8277c80 100644 --- a/server/router/system/sys_version.go +++ b/server/router/system/sys_version.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "git.echol.cn/loser/Go-Web-Template/server/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/service/common/exa_attachment_category.go b/server/service/common/exa_attachment_category.go index ff0a6e4..a3c5683 100644 --- a/server/service/common/exa_attachment_category.go +++ b/server/service/common/exa_attachment_category.go @@ -2,8 +2,8 @@ package common import ( "errors" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common" "gorm.io/gorm" ) diff --git a/server/service/common/exa_breakpoint_continue.go b/server/service/common/exa_breakpoint_continue.go index 8360478..761ada3 100644 --- a/server/service/common/exa_breakpoint_continue.go +++ b/server/service/common/exa_breakpoint_continue.go @@ -3,8 +3,8 @@ package common import ( "errors" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common" "gorm.io/gorm" ) diff --git a/server/service/common/exa_file_upload_download.go b/server/service/common/exa_file_upload_download.go index 2e4b82e..00832db 100644 --- a/server/service/common/exa_file_upload_download.go +++ b/server/service/common/exa_file_upload_download.go @@ -5,10 +5,10 @@ import ( "mime/multipart" "strings" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common" - commonReq "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/utils/upload" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common" + commonReq "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/utils/upload" "gorm.io/gorm" ) diff --git a/server/service/enter.go b/server/service/enter.go index f83855e..2432904 100644 --- a/server/service/enter.go +++ b/server/service/enter.go @@ -1,8 +1,8 @@ package service import ( - "github.com/flipped-aurora/gin-vue-admin/server/service/common" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + "git.echol.cn/loser/Go-Web-Template/server/service/common" + "git.echol.cn/loser/Go-Web-Template/server/service/system" ) var ServiceGroupApp = new(ServiceGroup) diff --git a/server/service/system/jwt_black_list.go b/server/service/system/jwt_black_list.go index 6c34bbb..9f3ecfd 100644 --- a/server/service/system/jwt_black_list.go +++ b/server/service/system/jwt_black_list.go @@ -5,8 +5,8 @@ import ( "go.uber.org/zap" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" ) type JwtService struct{} diff --git a/server/service/system/mcp.go b/server/service/system/mcp.go index cea9fe2..7237356 100644 --- a/server/service/system/mcp.go +++ b/server/service/system/mcp.go @@ -8,7 +8,7 @@ import ( "text/template" "unicode" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" ) type McpService struct{} diff --git a/server/service/system/sys_api.go b/server/service/system/sys_api.go index a77d1d5..d7023b0 100644 --- a/server/service/system/sys_api.go +++ b/server/service/system/sys_api.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemRes "git.echol.cn/loser/Go-Web-Template/server/model/system/response" "gorm.io/gorm" ) diff --git a/server/service/system/sys_api_token.go b/server/service/system/sys_api_token.go index b2ebdde..1e913a1 100644 --- a/server/service/system/sys_api_token.go +++ b/server/service/system/sys_api_token.go @@ -2,10 +2,10 @@ package system import ( "errors" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - sysReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + sysReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/golang-jwt/jwt/v5" "time" ) diff --git a/server/service/system/sys_authority.go b/server/service/system/sys_authority.go index 1264707..df2495a 100644 --- a/server/service/system/sys_authority.go +++ b/server/service/system/sys_authority.go @@ -4,12 +4,12 @@ import ( "errors" "strconv" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system/response" "gorm.io/gorm" ) diff --git a/server/service/system/sys_authority_btn.go b/server/service/system/sys_authority_btn.go index 1cc8f1f..c658237 100644 --- a/server/service/system/sys_authority_btn.go +++ b/server/service/system/sys_authority_btn.go @@ -2,10 +2,10 @@ package system import ( "errors" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system/response" "gorm.io/gorm" ) diff --git a/server/service/system/sys_base_menu.go b/server/service/system/sys_base_menu.go index 3a6560f..ea18d94 100644 --- a/server/service/system/sys_base_menu.go +++ b/server/service/system/sys_base_menu.go @@ -3,8 +3,8 @@ package system import ( "errors" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "gorm.io/gorm" ) diff --git a/server/service/system/sys_casbin.go b/server/service/system/sys_casbin.go index b281a4e..28fe5cd 100644 --- a/server/service/system/sys_casbin.go +++ b/server/service/system/sys_casbin.go @@ -6,10 +6,10 @@ import ( "gorm.io/gorm" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/utils" gormadapter "github.com/casbin/gorm-adapter/v3" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/utils" _ "github.com/go-sql-driver/mysql" ) diff --git a/server/service/system/sys_dictionary.go b/server/service/system/sys_dictionary.go index d5d068d..d65450c 100644 --- a/server/service/system/sys_dictionary.go +++ b/server/service/system/sys_dictionary.go @@ -4,11 +4,11 @@ import ( "encoding/json" "errors" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "gorm.io/gorm" ) diff --git a/server/service/system/sys_dictionary_detail.go b/server/service/system/sys_dictionary_detail.go index 56425d3..cc39d03 100644 --- a/server/service/system/sys_dictionary_detail.go +++ b/server/service/system/sys_dictionary_detail.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" ) //@author: [piexlmax](https://github.com/piexlmax) @@ -233,7 +233,7 @@ func (dictionaryDetailService *DictionaryDetailService) GetDictionaryTreeList(di } else { sysDictionaryDetails[i].Disabled = false // 默认不禁用 } - + err = dictionaryDetailService.loadChildren(&sysDictionaryDetails[i]) if err != nil { return nil, err @@ -258,7 +258,7 @@ func (dictionaryDetailService *DictionaryDetailService) loadChildren(detail *sys } else { children[i].Disabled = false // 默认不禁用 } - + err = dictionaryDetailService.loadChildren(&children[i]) if err != nil { return err @@ -335,7 +335,7 @@ func (dictionaryDetailService *DictionaryDetailService) GetDictionaryTreeListByT } else { sysDictionaryDetails[i].Disabled = false // 默认不禁用 } - + err = dictionaryDetailService.loadChildren(&sysDictionaryDetails[i]) if err != nil { return nil, err diff --git a/server/service/system/sys_error.go b/server/service/system/sys_error.go index acd7057..0626d33 100644 --- a/server/service/system/sys_error.go +++ b/server/service/system/sys_error.go @@ -3,9 +3,9 @@ package system import ( "context" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "strings" ) diff --git a/server/service/system/sys_export_template.go b/server/service/system/sys_export_template.go index 6f449c9..24639ff 100644 --- a/server/service/system/sys_export_template.go +++ b/server/service/system/sys_export_template.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/xuri/excelize/v2" "gorm.io/gorm" ) diff --git a/server/service/system/sys_initdb.go b/server/service/system/sys_initdb.go index 825e0ac..f815f75 100644 --- a/server/service/system/sys_initdb.go +++ b/server/service/system/sys_initdb.go @@ -5,8 +5,8 @@ import ( "database/sql" "errors" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "gorm.io/gorm" "sort" ) diff --git a/server/service/system/sys_initdb_mssql.go b/server/service/system/sys_initdb_mssql.go index 3597bf7..f7a1696 100644 --- a/server/service/system/sys_initdb_mssql.go +++ b/server/service/system/sys_initdb_mssql.go @@ -3,10 +3,10 @@ package system import ( "context" "errors" - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/google/uuid" "github.com/gookit/color" "gorm.io/driver/sqlserver" diff --git a/server/service/system/sys_initdb_mysql.go b/server/service/system/sys_initdb_mysql.go index a9120dc..6261c64 100644 --- a/server/service/system/sys_initdb_mysql.go +++ b/server/service/system/sys_initdb_mysql.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/config" + "git.echol.cn/loser/Go-Web-Template/server/config" "github.com/gookit/color" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/utils" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/google/uuid" "gorm.io/driver/mysql" "gorm.io/gorm" diff --git a/server/service/system/sys_initdb_pgsql.go b/server/service/system/sys_initdb_pgsql.go index b76afda..2b3ef37 100644 --- a/server/service/system/sys_initdb_pgsql.go +++ b/server/service/system/sys_initdb_pgsql.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/config" + "git.echol.cn/loser/Go-Web-Template/server/config" "github.com/gookit/color" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/utils" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/google/uuid" "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/server/service/system/sys_initdb_sqlite.go b/server/service/system/sys_initdb_sqlite.go index 09013f5..8e2d477 100644 --- a/server/service/system/sys_initdb_sqlite.go +++ b/server/service/system/sys_initdb_sqlite.go @@ -8,10 +8,10 @@ import ( "github.com/gookit/color" "gorm.io/gorm" - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/utils" ) type SqliteInitHandler struct{} diff --git a/server/service/system/sys_login_log.go b/server/service/system/sys_login_log.go index 79fee93..b271936 100644 --- a/server/service/system/sys_login_log.go +++ b/server/service/system/sys_login_log.go @@ -1,10 +1,10 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" ) type LoginLogService struct{} diff --git a/server/service/system/sys_menu.go b/server/service/system/sys_menu.go index c2156ef..d7d9bfe 100644 --- a/server/service/system/sys_menu.go +++ b/server/service/system/sys_menu.go @@ -2,9 +2,9 @@ package system import ( "errors" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "gorm.io/gorm" "strconv" ) diff --git a/server/service/system/sys_operation_record.go b/server/service/system/sys_operation_record.go index ef131db..77ef779 100644 --- a/server/service/system/sys_operation_record.go +++ b/server/service/system/sys_operation_record.go @@ -1,10 +1,10 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" ) //@author: [granty1](https://github.com/granty1) diff --git a/server/service/system/sys_params.go b/server/service/system/sys_params.go index 7391ec0..f102d3e 100644 --- a/server/service/system/sys_params.go +++ b/server/service/system/sys_params.go @@ -1,9 +1,9 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" ) type SysParamsService struct{} diff --git a/server/service/system/sys_system.go b/server/service/system/sys_system.go index a4415f0..e372067 100644 --- a/server/service/system/sys_system.go +++ b/server/service/system/sys_system.go @@ -1,10 +1,10 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/server/config" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/config" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/utils" "go.uber.org/zap" ) diff --git a/server/service/system/sys_user.go b/server/service/system/sys_user.go index c02906e..902c11b 100644 --- a/server/service/system/sys_user.go +++ b/server/service/system/sys_user.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/flipped-aurora/gin-vue-admin/server/model/common" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/server/service/system/sys_version.go b/server/service/system/sys_version.go index 68d5ae2..f6fde51 100644 --- a/server/service/system/sys_version.go +++ b/server/service/system/sys_version.go @@ -2,9 +2,9 @@ package system import ( "context" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "gorm.io/gorm" ) diff --git a/server/source/common/file_upload_download.go b/server/source/common/file_upload_download.go index 3d1c382..ac4ef78 100644 --- a/server/source/common/file_upload_download.go +++ b/server/source/common/file_upload_download.go @@ -2,8 +2,8 @@ package common import ( "context" - commonModel "github.com/flipped-aurora/gin-vue-admin/server/model/common" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + commonModel "git.echol.cn/loser/Go-Web-Template/server/model/common" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/api.go b/server/source/system/api.go index 88165c2..4237e91 100644 --- a/server/source/system/api.go +++ b/server/source/system/api.go @@ -3,8 +3,8 @@ package system import ( "context" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/api_ignore.go b/server/source/system/api_ignore.go index d11f277..41a9464 100644 --- a/server/source/system/api_ignore.go +++ b/server/source/system/api_ignore.go @@ -2,8 +2,8 @@ package system import ( "context" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/authorities_menus.go b/server/source/system/authorities_menus.go index 9aa0f51..802c35c 100644 --- a/server/source/system/authorities_menus.go +++ b/server/source/system/authorities_menus.go @@ -3,8 +3,8 @@ package system import ( "context" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/authority.go b/server/source/system/authority.go index 1157a19..ee5c306 100644 --- a/server/source/system/authority.go +++ b/server/source/system/authority.go @@ -2,9 +2,9 @@ package system import ( "context" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/casbin.go b/server/source/system/casbin.go index 106055d..a4541da 100644 --- a/server/source/system/casbin.go +++ b/server/source/system/casbin.go @@ -3,8 +3,8 @@ package system import ( "context" + "git.echol.cn/loser/Go-Web-Template/server/service/system" adapter "github.com/casbin/gorm-adapter/v3" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/dictionary.go b/server/source/system/dictionary.go index a0cf8e0..ed8ee27 100644 --- a/server/source/system/dictionary.go +++ b/server/source/system/dictionary.go @@ -2,8 +2,8 @@ package system import ( "context" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/dictionary_detail.go b/server/source/system/dictionary_detail.go index 8a2bd2b..4e563d2 100644 --- a/server/source/system/dictionary_detail.go +++ b/server/source/system/dictionary_detail.go @@ -3,8 +3,8 @@ package system import ( "context" "fmt" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/excel_template.go b/server/source/system/excel_template.go index 20bf16d..5a05a24 100644 --- a/server/source/system/excel_template.go +++ b/server/source/system/excel_template.go @@ -2,8 +2,8 @@ package system import ( "context" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/menu.go b/server/source/system/menu.go index c83f9c5..47733ed 100644 --- a/server/source/system/menu.go +++ b/server/source/system/menu.go @@ -3,8 +3,8 @@ package system import ( "context" - . "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" + . "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/server/source/system/user.go b/server/source/system/user.go index d5c20d5..68b0b40 100644 --- a/server/source/system/user.go +++ b/server/source/system/user.go @@ -2,9 +2,9 @@ package system import ( "context" - sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" - "github.com/flipped-aurora/gin-vue-admin/server/utils" + sysModel "git.echol.cn/loser/Go-Web-Template/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/service/system" + "git.echol.cn/loser/Go-Web-Template/server/utils" "github.com/google/uuid" "github.com/pkg/errors" "gorm.io/gorm" diff --git a/server/task/clearTable.go b/server/task/clearTable.go index 8d1e2f2..5272197 100644 --- a/server/task/clearTable.go +++ b/server/task/clearTable.go @@ -3,9 +3,10 @@ package task import ( "errors" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/model/common" "time" + "git.echol.cn/loser/Go-Web-Template/server/model/common" + "gorm.io/gorm" ) diff --git a/server/utils/ast/ast.go b/server/utils/ast/ast.go index a2b4728..8057078 100644 --- a/server/utils/ast/ast.go +++ b/server/utils/ast/ast.go @@ -2,7 +2,7 @@ package ast import ( "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "git.echol.cn/loser/Go-Web-Template/server/model/system" "go/ast" "go/parser" "go/token" diff --git a/server/utils/ast/ast_gorm.go b/server/utils/ast/ast_gorm.go index 4340721..6cff919 100644 --- a/server/utils/ast/ast_gorm.go +++ b/server/utils/ast/ast_gorm.go @@ -12,7 +12,7 @@ import ( // AddRegisterTablesAst 自动为 gorm.go 注册一个自动迁移 func AddRegisterTablesAst(path, funcName, pk, varName, dbName, model string) { - modelPk := fmt.Sprintf("github.com/flipped-aurora/gin-vue-admin/server/model/%s", pk) + modelPk := fmt.Sprintf("git.echol.cn/loser/Go-Web-Template/server/model/%s", pk) src, err := os.ReadFile(path) if err != nil { fmt.Println(err) diff --git a/server/utils/ast/ast_init_test.go b/server/utils/ast/ast_init_test.go index ec6bd9b..fa62ef0 100644 --- a/server/utils/ast/ast_init_test.go +++ b/server/utils/ast/ast_init_test.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" ) diff --git a/server/utils/ast/ast_rollback.go b/server/utils/ast/ast_rollback.go index dfaf99d..2bac788 100644 --- a/server/utils/ast/ast_rollback.go +++ b/server/utils/ast/ast_rollback.go @@ -69,7 +69,7 @@ func RollGormBack(pk, model string) { if gen, ok := node.(*ast.GenDecl); ok { for i := range gen.Specs { if imspec, ok := gen.Specs[i].(*ast.ImportSpec); ok { - if imspec.Path.Value == "\"github.com/flipped-aurora/gin-vue-admin/server/model/"+pk+"\"" { + if imspec.Path.Value == "\"git.echol.cn/loser/Go-Web-Template/server/model/"+pk+"\"" { gp = gen imI = i return false diff --git a/server/utils/ast/ast_test.go b/server/utils/ast/ast_test.go index 001f530..76b6c5f 100644 --- a/server/utils/ast/ast_test.go +++ b/server/utils/ast/ast_test.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "go/ast" "go/parser" "go/printer" diff --git a/server/utils/ast/package_enter_test.go b/server/utils/ast/package_enter_test.go index 3cf4ab4..101d82c 100644 --- a/server/utils/ast/package_enter_test.go +++ b/server/utils/ast/package_enter_test.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -25,7 +25,7 @@ func TestPackageEnter_Rollback(t *testing.T) { fields: fields{ Type: TypePackageApiEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "api", "v1", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/api/v1/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/api/v1/example"`, StructName: "ExampleApiGroup", PackageName: "example", PackageStructName: "ApiGroup", @@ -37,7 +37,7 @@ func TestPackageEnter_Rollback(t *testing.T) { fields: fields{ Type: TypePackageRouterEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "router", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/router/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/router/example"`, StructName: "Example", PackageName: "example", PackageStructName: "RouterGroup", @@ -49,7 +49,7 @@ func TestPackageEnter_Rollback(t *testing.T) { fields: fields{ Type: TypePackageServiceEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "service", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/service/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/service/example"`, StructName: "ExampleServiceGroup", PackageName: "example", PackageStructName: "ServiceGroup", @@ -99,7 +99,7 @@ func TestPackageEnter_Injection(t *testing.T) { fields: fields{ Type: TypePackageApiEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "api", "v1", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/api/v1/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/api/v1/example"`, StructName: "ExampleApiGroup", PackageName: "example", PackageStructName: "ApiGroup", @@ -110,7 +110,7 @@ func TestPackageEnter_Injection(t *testing.T) { fields: fields{ Type: TypePackageRouterEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "router", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/router/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/router/example"`, StructName: "Example", PackageName: "example", PackageStructName: "RouterGroup", @@ -122,7 +122,7 @@ func TestPackageEnter_Injection(t *testing.T) { fields: fields{ Type: TypePackageServiceEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "service", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/service/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/service/example"`, StructName: "ExampleServiceGroup", PackageName: "example", PackageStructName: "ServiceGroup", diff --git a/server/utils/ast/package_initialize_gorm_test.go b/server/utils/ast/package_initialize_gorm_test.go index af5cef9..a67f753 100644 --- a/server/utils/ast/package_initialize_gorm_test.go +++ b/server/utils/ast/package_initialize_gorm_test.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -25,7 +25,7 @@ func TestPackageInitializeGorm_Injection(t *testing.T) { fields: fields{ Type: TypePackageInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "gorm_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/model/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/model/example"`, StructName: "ExaFileUploadAndDownload", PackageName: "example", IsNew: false, @@ -36,7 +36,7 @@ func TestPackageInitializeGorm_Injection(t *testing.T) { fields: fields{ Type: TypePackageInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "gorm_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/model/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/model/example"`, StructName: "ExaCustomer", PackageName: "example", IsNew: false, @@ -47,7 +47,7 @@ func TestPackageInitializeGorm_Injection(t *testing.T) { fields: fields{ Type: TypePackageInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "gorm_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/model/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/model/example"`, StructName: "ExaFileUploadAndDownload", PackageName: "example", IsNew: true, @@ -58,7 +58,7 @@ func TestPackageInitializeGorm_Injection(t *testing.T) { fields: fields{ Type: TypePackageInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "gorm_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/model/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/model/example"`, StructName: "ExaCustomer", PackageName: "example", IsNew: true, @@ -107,7 +107,7 @@ func TestPackageInitializeGorm_Rollback(t *testing.T) { fields: fields{ Type: TypePackageInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "gorm_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/model/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/model/example"`, StructName: "ExaFileUploadAndDownload", PackageName: "example", IsNew: false, @@ -118,7 +118,7 @@ func TestPackageInitializeGorm_Rollback(t *testing.T) { fields: fields{ Type: TypePackageInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "gorm_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/model/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/model/example"`, StructName: "ExaCustomer", PackageName: "example", IsNew: false, @@ -129,7 +129,7 @@ func TestPackageInitializeGorm_Rollback(t *testing.T) { fields: fields{ Type: TypePackageInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "gorm_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/model/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/model/example"`, StructName: "ExaFileUploadAndDownload", PackageName: "example", IsNew: true, @@ -140,7 +140,7 @@ func TestPackageInitializeGorm_Rollback(t *testing.T) { fields: fields{ Type: TypePackageInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "gorm_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/model/example"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/model/example"`, StructName: "ExaCustomer", PackageName: "example", IsNew: true, diff --git a/server/utils/ast/package_initialize_router_test.go b/server/utils/ast/package_initialize_router_test.go index 5a23dbb..6d52c41 100644 --- a/server/utils/ast/package_initialize_router_test.go +++ b/server/utils/ast/package_initialize_router_test.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -28,7 +28,7 @@ func TestPackageInitializeRouter_Injection(t *testing.T) { fields: fields{ Type: TypePackageInitializeRouter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "router_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/router"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/router"`, AppName: "RouterGroupApp", GroupName: "Example", ModuleName: "exampleRouter", @@ -43,7 +43,7 @@ func TestPackageInitializeRouter_Injection(t *testing.T) { fields: fields{ Type: TypePackageInitializeRouter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "router_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/router"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/router"`, AppName: "RouterGroupApp", GroupName: "Example", ModuleName: "exampleRouter", @@ -105,7 +105,7 @@ func TestPackageInitializeRouter_Rollback(t *testing.T) { fields: fields{ Type: TypePackageInitializeRouter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "router_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/router"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/router"`, AppName: "RouterGroupApp", GroupName: "Example", ModuleName: "exampleRouter", @@ -120,7 +120,7 @@ func TestPackageInitializeRouter_Rollback(t *testing.T) { fields: fields{ Type: TypePackageInitializeRouter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "initialize", "router_biz.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/router"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/router"`, AppName: "RouterGroupApp", GroupName: "Example", ModuleName: "exampleRouter", diff --git a/server/utils/ast/package_module_enter_test.go b/server/utils/ast/package_module_enter_test.go index 0015e35..656f41f 100644 --- a/server/utils/ast/package_module_enter_test.go +++ b/server/utils/ast/package_module_enter_test.go @@ -1,7 +1,7 @@ package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -28,7 +28,7 @@ func TestPackageModuleEnter_Rollback(t *testing.T) { fields: fields{ Type: TypePackageRouterModuleEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "router", "example", "enter.go"), - ImportPath: `api "github.com/flipped-aurora/gin-vue-admin/server/api/v1"`, + ImportPath: `api "git.echol.cn/loser/Go-Web-Template/server/api/v1"`, StructName: "FileUploadAndDownloadRouter", AppName: "ApiGroupApp", GroupName: "ExampleApiGroup", @@ -43,7 +43,7 @@ func TestPackageModuleEnter_Rollback(t *testing.T) { fields: fields{ Type: TypePackageApiModuleEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "api", "v1", "example", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/service"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/service"`, StructName: "FileUploadAndDownloadApi", AppName: "ServiceGroupApp", GroupName: "ExampleServiceGroup", @@ -117,7 +117,7 @@ func TestPackageModuleEnter_Injection(t *testing.T) { fields: fields{ Type: TypePackageRouterModuleEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "router", "example", "enter.go"), - ImportPath: `api "github.com/flipped-aurora/gin-vue-admin/server/api/v1"`, + ImportPath: `api "git.echol.cn/loser/Go-Web-Template/server/api/v1"`, StructName: "FileUploadAndDownloadRouter", AppName: "ApiGroupApp", GroupName: "ExampleApiGroup", @@ -132,7 +132,7 @@ func TestPackageModuleEnter_Injection(t *testing.T) { fields: fields{ Type: TypePackageApiModuleEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "api", "v1", "example", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/service"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/service"`, StructName: "FileUploadAndDownloadApi", AppName: "ServiceGroupApp", GroupName: "ExampleServiceGroup", diff --git a/server/utils/ast/plugin_enter_test.go b/server/utils/ast/plugin_enter_test.go index 60b8dfc..97e0064 100644 --- a/server/utils/ast/plugin_enter_test.go +++ b/server/utils/ast/plugin_enter_test.go @@ -1,7 +1,10 @@ +//go:build legacy_plugin_ast +// +build legacy_plugin_ast + package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -28,7 +31,7 @@ func TestPluginEnter_Injection(t *testing.T) { fields: fields{ Type: TypePluginApiEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "api", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/service"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/service"`, StructName: "User", StructCamelName: "user", ModuleName: "serviceUser", @@ -43,7 +46,7 @@ func TestPluginEnter_Injection(t *testing.T) { fields: fields{ Type: TypePluginRouterEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "router", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/api"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/api"`, StructName: "User", StructCamelName: "user", ModuleName: "userApi", @@ -132,7 +135,7 @@ func TestPluginEnter_Rollback(t *testing.T) { fields: fields{ Type: TypePluginRouterEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "router", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/api"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/api"`, StructName: "User", StructCamelName: "user", ModuleName: "userApi", @@ -147,7 +150,7 @@ func TestPluginEnter_Rollback(t *testing.T) { fields: fields{ Type: TypePluginApiEnter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "api", "enter.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/service"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/service"`, StructName: "User", StructCamelName: "user", ModuleName: "serviceUser", diff --git a/server/utils/ast/plugin_gen_test.go b/server/utils/ast/plugin_gen_test.go index 1b9c790..11264f0 100644 --- a/server/utils/ast/plugin_gen_test.go +++ b/server/utils/ast/plugin_gen_test.go @@ -1,7 +1,10 @@ +//go:build legacy_plugin_ast +// +build legacy_plugin_ast + package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -25,7 +28,7 @@ func TestPluginGenModel_Injection(t *testing.T) { fields: fields{ Type: TypePluginGen, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "gen", "main.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, PackageName: "model", StructName: "User", IsNew: false, @@ -36,7 +39,7 @@ func TestPluginGenModel_Injection(t *testing.T) { fields: fields{ Type: TypePluginGen, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "gen", "main.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, PackageName: "model", StructName: "User", IsNew: true, @@ -85,7 +88,7 @@ func TestPluginGenModel_Rollback(t *testing.T) { fields: fields{ Type: TypePluginGen, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "gen", "main.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, PackageName: "model", StructName: "User", IsNew: false, @@ -96,7 +99,7 @@ func TestPluginGenModel_Rollback(t *testing.T) { fields: fields{ Type: TypePluginGen, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "gen", "main.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, PackageName: "model", StructName: "User", IsNew: true, diff --git a/server/utils/ast/plugin_initialize_gorm_test.go b/server/utils/ast/plugin_initialize_gorm_test.go index ebfc12a..4043d1b 100644 --- a/server/utils/ast/plugin_initialize_gorm_test.go +++ b/server/utils/ast/plugin_initialize_gorm_test.go @@ -1,7 +1,10 @@ +//go:build legacy_plugin_ast +// +build legacy_plugin_ast + package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -25,7 +28,7 @@ func TestPluginInitializeGorm_Injection(t *testing.T) { fields: fields{ Type: TypePluginInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "gorm.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, StructName: "User", PackageName: "model", IsNew: false, @@ -36,7 +39,7 @@ func TestPluginInitializeGorm_Injection(t *testing.T) { fields: fields{ Type: TypePluginInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "gorm.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, StructName: "User", PackageName: "model", IsNew: true, @@ -47,7 +50,7 @@ func TestPluginInitializeGorm_Injection(t *testing.T) { fields: fields{ Type: TypePluginInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "gorm.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, StructName: "SysUser", PackageName: "model", IsNew: true, @@ -96,7 +99,7 @@ func TestPluginInitializeGorm_Rollback(t *testing.T) { fields: fields{ Type: TypePluginInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "gorm.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, StructName: "User", PackageName: "model", IsNew: false, @@ -107,7 +110,7 @@ func TestPluginInitializeGorm_Rollback(t *testing.T) { fields: fields{ Type: TypePluginInitializeGorm, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "gorm.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/model"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/model"`, StructName: "User", PackageName: "model", IsNew: true, diff --git a/server/utils/ast/plugin_initialize_router_test.go b/server/utils/ast/plugin_initialize_router_test.go index 4dffd7f..4464791 100644 --- a/server/utils/ast/plugin_initialize_router_test.go +++ b/server/utils/ast/plugin_initialize_router_test.go @@ -1,7 +1,10 @@ +//go:build legacy_plugin_ast +// +build legacy_plugin_ast + package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -28,7 +31,7 @@ func TestPluginInitializeRouter_Injection(t *testing.T) { fields: fields{ Type: TypePluginInitializeRouter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "router.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/router"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/router"`, AppName: "Router", GroupName: "User", PackageName: "router", @@ -43,7 +46,7 @@ func TestPluginInitializeRouter_Injection(t *testing.T) { fields: fields{ Type: TypePluginInitializeRouter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "router.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/router"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/router"`, AppName: "Router", GroupName: "U中文", PackageName: "router", @@ -102,7 +105,7 @@ func TestPluginInitializeRouter_Rollback(t *testing.T) { fields: fields{ Type: TypePluginInitializeRouter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "router.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/router"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/router"`, AppName: "Router", GroupName: "User", PackageName: "router", @@ -117,7 +120,7 @@ func TestPluginInitializeRouter_Rollback(t *testing.T) { fields: fields{ Type: TypePluginInitializeRouter, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "initialize", "router.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva/router"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva/router"`, AppName: "Router", GroupName: "U中文", PackageName: "router", diff --git a/server/utils/ast/plugin_initialize_v2_test.go b/server/utils/ast/plugin_initialize_v2_test.go index ceb2a74..b0eb175 100644 --- a/server/utils/ast/plugin_initialize_v2_test.go +++ b/server/utils/ast/plugin_initialize_v2_test.go @@ -1,7 +1,10 @@ +//go:build legacy_plugin_ast +// +build legacy_plugin_ast + package ast import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "path/filepath" "testing" ) @@ -24,7 +27,7 @@ func TestPluginInitialize_Injection(t *testing.T) { Type: TypePluginInitializeV2, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "plugin.go"), PluginPath: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "register.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva"`, }, wantErr: false, }, @@ -71,7 +74,7 @@ func TestPluginInitialize_Rollback(t *testing.T) { Type: TypePluginInitializeV2, Path: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "gva", "plugin.go"), PluginPath: filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", "register.go"), - ImportPath: `"github.com/flipped-aurora/gin-vue-admin/server/plugin/gva"`, + ImportPath: `"git.echol.cn/loser/Go-Web-Template/server/plugin/gva"`, }, wantErr: false, }, diff --git a/server/utils/captcha/redis.go b/server/utils/captcha/redis.go index ffb4dbf..c363b30 100644 --- a/server/utils/captcha/redis.go +++ b/server/utils/captcha/redis.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "go.uber.org/zap" ) diff --git a/server/utils/casbin_util.go b/server/utils/casbin_util.go index 62d44fc..25397ca 100644 --- a/server/utils/casbin_util.go +++ b/server/utils/casbin_util.go @@ -3,10 +3,10 @@ package utils import ( "sync" + "git.echol.cn/loser/Go-Web-Template/server/global" "github.com/casbin/casbin/v2" "github.com/casbin/casbin/v2/model" gormadapter "github.com/casbin/gorm-adapter/v3" - "github.com/flipped-aurora/gin-vue-admin/server/global" "go.uber.org/zap" ) diff --git a/server/utils/claims.go b/server/utils/claims.go index f697967..41eb4f1 100644 --- a/server/utils/claims.go +++ b/server/utils/claims.go @@ -4,9 +4,9 @@ import ( "net" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system" + systemReq "git.echol.cn/loser/Go-Web-Template/server/model/system/request" "github.com/gin-gonic/gin" "github.com/google/uuid" ) diff --git a/server/utils/directory.go b/server/utils/directory.go index d419fee..8891a90 100644 --- a/server/utils/directory.go +++ b/server/utils/directory.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "go.uber.org/zap" ) diff --git a/server/utils/fmt_plus.go b/server/utils/fmt_plus.go index 1257a65..0a882d3 100644 --- a/server/utils/fmt_plus.go +++ b/server/utils/fmt_plus.go @@ -2,7 +2,7 @@ package utils import ( "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/model/common" + "git.echol.cn/loser/Go-Web-Template/server/model/common" "math/rand" "reflect" "strings" diff --git a/server/utils/json_test.go b/server/utils/json_test.go index f21a679..bf13dd3 100644 --- a/server/utils/json_test.go +++ b/server/utils/json_test.go @@ -16,35 +16,35 @@ func TestGetJSONKeys(t *testing.T) { }` keys, err := GetJSONKeys(jsonStr) if err != nil { - t.Errorf("GetJSONKeys failed" + err.Error()) + t.Errorf("GetJSONKeys failed: %v", err) return } if len(keys) != 5 { - t.Errorf("GetJSONKeys failed" + err.Error()) + t.Errorf("GetJSONKeys unexpected key count: %d", len(keys)) return } if keys[0] != "Name" { - t.Errorf("GetJSONKeys failed" + err.Error()) + t.Errorf("GetJSONKeys unexpected first key: %s", keys[0]) return } if keys[1] != "TableName" { - t.Errorf("GetJSONKeys failed" + err.Error()) + t.Errorf("GetJSONKeys unexpected second key: %s", keys[1]) return } if keys[2] != "TemplateID" { - t.Errorf("GetJSONKeys failed" + err.Error()) + t.Errorf("GetJSONKeys unexpected third key: %s", keys[2]) return } if keys[3] != "TemplateInfo" { - t.Errorf("GetJSONKeys failed" + err.Error()) + t.Errorf("GetJSONKeys unexpected fourth key: %s", keys[3]) return } if keys[4] != "Limit" { - t.Errorf("GetJSONKeys failed" + err.Error()) + t.Errorf("GetJSONKeys unexpected fifth key: %s", keys[4]) return } diff --git a/server/utils/jwt.go b/server/utils/jwt.go index b4e6b3b..da9307e 100644 --- a/server/utils/jwt.go +++ b/server/utils/jwt.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "git.echol.cn/loser/Go-Web-Template/server/global" + "git.echol.cn/loser/Go-Web-Template/server/model/system/request" jwt "github.com/golang-jwt/jwt/v5" ) diff --git a/server/utils/server.go b/server/utils/server.go index 8c14cd7..212d435 100644 --- a/server/utils/server.go +++ b/server/utils/server.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" + "git.echol.cn/loser/Go-Web-Template/server/global" "runtime" "time" @@ -18,9 +18,9 @@ const ( ) type Server struct { - Os Os `json:"os"` - Cpu Cpu `json:"cpu"` - Ram Ram `json:"ram"` + Os Os `json:"os"` + Cpu Cpu `json:"cpu"` + Ram Ram `json:"ram"` Disk []Disk `json:"disk"` } @@ -45,11 +45,11 @@ type Ram struct { type Disk struct { MountPoint string `json:"mountPoint"` - UsedMB int `json:"usedMb"` - UsedGB int `json:"usedGb"` - TotalMB int `json:"totalMb"` - TotalGB int `json:"totalGb"` - UsedPercent int `json:"usedPercent"` + UsedMB int `json:"usedMb"` + UsedGB int `json:"usedGb"` + TotalMB int `json:"totalMb"` + TotalGB int `json:"totalGb"` + UsedPercent int `json:"usedPercent"` } //@author: [SliverHorn](https://github.com/SliverHorn) diff --git a/server/utils/validator_test.go b/server/utils/validator_test.go index bdacb8b..17ab30e 100644 --- a/server/utils/validator_test.go +++ b/server/utils/validator_test.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "git.echol.cn/loser/Go-Web-Template/server/model/common/request" "testing" ) diff --git a/web-admin/eslint.config.js b/web-admin/eslint.config.js index 5e6b472..fa5fd79 100644 --- a/web-admin/eslint.config.js +++ b/web-admin/eslint.config.js @@ -20,4 +20,10 @@ export default defineConfig([ globals: globals.browser, }, }, + { + files: ['src/router/pages/**/page.tsx'], + rules: { + 'react-refresh/only-export-components': 'off', + }, + }, ]) diff --git a/web-admin/src/App.tsx b/web-admin/src/App.tsx index 627bf85..fc24f02 100644 --- a/web-admin/src/App.tsx +++ b/web-admin/src/App.tsx @@ -6,59 +6,8 @@ import { buildFullMenus, findDefaultRoute, flattenMenus, isExternalMenu } from ' import { useAuthStore } from '@/store/auth' import { LoginPage } from '@/features/auth/LoginPage' import { AdminShell } from '@/features/layout/AdminShell' -import { DashboardPage } from '@/features/dashboard/DashboardPage' -import { ModuleLandingPage } from '@/features/discovery/ModuleLandingPage' -import { ProfilePage } from '@/features/person/ProfilePage' -import { ServerStatePage } from '@/features/server/ServerStatePage' -import { UserManagementPage } from '@/features/users/UserManagementPage' -import { RoleManagementPage } from '@/features/roles/RoleManagementPage' -import { MenuManagementPage } from '@/features/menus/MenuManagementPage' -import { ApiManagementPage } from '@/features/apis/ApiManagementPage' -import { DictionaryManagementPage } from '@/features/dictionaries/DictionaryManagementPage' -import { ParamsManagementPage } from '@/features/params/ParamsManagementPage' -import { LoginLogPage } from '@/features/logs/LoginLogPage' -import { OperationLogPage } from '@/features/logs/OperationLogPage' -import { SystemConfigPage } from '@/features/system/SystemConfigPage' -import { ApiTokenPage } from '@/features/tokens/ApiTokenPage' -import { ErrorLogPage } from '@/features/errors/ErrorLogPage' -import { MediaLibraryPage } from '@/features/media/MediaLibraryPage' -import { BreakpointPage } from '@/features/breakpoint/BreakpointPage' -import { McpTestPage } from '@/features/mcp/McpTestPage' -import { McpToolPage } from '@/features/mcp/McpToolPage' - -type AppRoute = { - path: string - menuName: string - element: React.ReactNode -} - -const appRoutes: AppRoute[] = [ - { path: 'dashboard', menuName: 'dashboard', element: }, - { path: 'about', menuName: 'about', element: }, - { path: 'admin', menuName: 'superAdmin', element: }, - { path: 'admin/authority', menuName: 'authority', element: }, - { path: 'admin/menu', menuName: 'menu', element: }, - { path: 'admin/api', menuName: 'api', element: }, - { path: 'admin/user', menuName: 'user', element: }, - { path: 'admin/dictionary', menuName: 'dictionary', element: }, - { path: 'admin/operation', menuName: 'operation', element: }, - { path: 'admin/sysParams', menuName: 'sysParams', element: }, - { path: 'admin/system', menuName: 'system', element: }, - { path: 'admin/apiToken', menuName: 'apiToken', element: }, - { path: 'admin/loginLog', menuName: 'loginLog', element: }, - { path: 'admin/sysVersion', menuName: 'sysVersion', element: }, - { path: 'admin/sysError', menuName: 'sysError', element: }, - { path: 'common', menuName: 'common', element: }, - { path: 'common/upload', menuName: 'upload', element: }, - { path: 'common/breakpoint', menuName: 'breakpoint', element: }, - { path: 'systemTools', menuName: 'systemTools', element: }, - { path: 'systemTools/formCreate', menuName: 'formCreate', element: }, - { path: 'systemTools/exportTemplate', menuName: 'exportTemplate', element: }, - { path: 'systemTools/mcpTest', menuName: 'mcpTest', element: }, - { path: 'systemTools/mcpTool', menuName: 'mcpTool', element: }, - { path: 'person', menuName: 'person', element: }, - { path: 'state', menuName: 'state', element: }, -] +import { appRoutes } from '@/router/fsRoutes' +import type { AppRoute } from '@/router/routeTypes' function BootstrapGate() { const navigate = useNavigate() @@ -158,7 +107,8 @@ function RouteGuard({ route }: { route: AppRoute }) { ) } - return <>{route.element} + const RouteComponent = route.component + return } function LayoutFrame() { diff --git a/web-admin/vite.config.ts b/web-admin/vite.config.ts index bdfc4fe..beacc59 100644 --- a/web-admin/vite.config.ts +++ b/web-admin/vite.config.ts @@ -23,5 +23,35 @@ export default defineConfig({ }, build: { chunkSizeWarningLimit: 1500, + rollupOptions: { + output: { + manualChunks(id) { + if (!id.includes('node_modules')) { + return + } + + if (id.includes('antd') || id.includes('@ant-design') || id.includes('/rc-')) { + return 'antd-vendor' + } + + if (id.includes('recharts') || id.includes('/d3-')) { + return 'charts-vendor' + } + + if (id.includes('react') || id.includes('scheduler')) { + return 'react-vendor' + } + + if ( + id.includes('@tanstack') || + id.includes('axios') || + id.includes('zustand') || + id.includes('dayjs') + ) { + return 'app-vendor' + } + }, + }, + }, }, })