Merge 7957371a6c into 86805ba047

fix: 修复lodash-es类型错误

docs/guide-zh-CN/code-curd-join.md

@@ -10,7 +10,7 @@ gf run main.go
 
 # web端
 cd web
-yarn dev
+pnpm run dev 或 npm run dev
 ```
 
 以下是一个关联表的CURD生成流程

docs/guide-zh-CN/code-curd.md

@@ -10,7 +10,7 @@ gf run main.go
 
 # web端
 cd web
-yarn dev
+pnpm run dev 或 npm run dev
 ```
 
 以下是一个基本的CURD生成流程

docs/guide-zh-CN/code-tree.md

@@ -10,7 +10,7 @@ gf run main.go
 
 # web端
 cd web
-yarn dev
+pnpm run dev 或 npm run dev
 ```
 
 以下是一个基本的树形CURD生成流程

docs/guide-zh-CN/start-deploy.md

@@ -41,8 +41,9 @@ cd server &&  make build
 cd server                                             # 切换到服务端目录下
 rm -rf ./resource/public/admin/                       # 删除之前的web资源
 mkdir ./resource/public/admin/                        # 重新创建web资源存放目录，除首次编译后续可以跳过执行此步骤
-cd ../web && yarn build                               # 切换到web项目下，编译web项目
+cd ../web && pnpm run build                               # 切换到web项目下，编译web项目
 \cp -rf ./dist/*  ../server/resource/public/admin/    # 将编译好的web资源复制到server对应的资源存放路径下
+cd ../server                                          # 切换回服务端目录下
 echo "y" | gf build                                   # 编译hotgo服务端
 
 # 不出意外你已经编译好了hotgo可执行文件！
@@ -57,7 +58,7 @@ echo "y" | gf build                              # 编译hotgo服务端
 
 # 编译web端
 cd web                                           
-yarn build
+pnpm run build 或 npm run build
 
 # web端编译完成后，将web/dist/*中的文件上传到`server`端线上运行目录：/resource/public/admin即可
 # 至此，web端和server端都可以独立覆盖更新
@@ -102,4 +103,4 @@ yarn build
           proxy_set_header Upgrade $http_upgrade;
           proxy_set_header Connection upgrade;
     }
-```
+```

docs/guide-zh-CN/start-environment.md

@@ -11,14 +11,14 @@
 1. 前往https://nodejs.org/zh-cn/下载当前版本node
 2. 命令行运行 `node -v` 若控制台输出版本号则node安装成功
 3. node 版本需大于等于 `16.0`
-4. 安装yarn：`npm install -g yarn`
-5. 命令行运行 `yarn -v` 若控制台输出版本号则前端环境搭建成功
+4. 安装pnpm：`npm install -g pnpm`
+5. 命令行运行 `pnpm -v` 若控制台输出版本号则前端环境搭建成功
 
 ### 后端环境
-1. 下载golang安装 版本号需>=1.21
+1. 下载golang安装 版本号需>=1.23
 2. 国际: https://golang.org/dl/
 3. 国内: https://golang.google.cn/dl/
-4. 命令行运行 go 若控制台输出各类提示命令 则安装成功 输入 `go version` 确认版本大于1.19
+4. 命令行运行 go 若控制台输出各类提示命令 则安装成功 输入 `go version` 确认版本大于1.23
 5. 开发工具推荐 [Goland](https://www.jetbrains.com/go/)
 
 ### 使用说明
@@ -26,6 +26,6 @@
 > 需要本地具有 git node golang 环境
 
 - node版本 >= 16.0.0
-- golang版本 >= 1.21
+- golang版本 >= 1.23
 - mysql版本 >= 5.7，引擎需要是 innoDB
 - IDE推荐：Goland

docs/guide-zh-CN/start-installation.md

@@ -8,7 +8,7 @@
 ### 环境要求
 
 - node版本 >= v16.0.0
-- golang版本 >= v1.21
+- golang版本 >= v1.23
 - goframe版本 >=v2.7.0
 - mysql版本 >=5.7
 
@@ -88,13 +88,13 @@ gfcli:
 2、web前端：
 ```shell script
     cd web
-    # 首先确定你以安装node16.0以上版本并安装了包[npm、yarn]，否则可能会出现一些未知报错
+    # 首先确定你以安装node16.0以上版本并安装了包[npm、pnpm]，否则可能会出现一些未知报错
     
     # 安装依赖
-    yarn install 
+    pnpm install 
     
     # 启动web项目
-    yarn dev 
+    pnpm run dev 
     
     # 如果顺利，至此到浏览器打开：http://你的IP:8001/admin
     # 登录账号：admin, 密码：123456

docs/guide-zh-CN/start-issue.md

@@ -65,5 +65,31 @@ Error: connect ECONNREFUSED ::1:8000
 - 服务端没有启动
 - `.\wen\.env.development`中的`VITE_PROXY`配置的服务器地址或端口与实际不一致
 
+### 四、Debug相关
+
+如果Debug不能正常运行，请手动更换Goland调试工具路径
+
+首先安装GO最新调试工具（注意是master分支）
+```shell
+go install github.com/go-delve/delve/cmd/dlv@master
+```
+或
+```shell
+git clone https://github.com/go-delve/delve
+cd delve
+go install github.com/go-delve/delve/cmd/dlv
+```
+依次打开Goland对应配置
+```text
+Toolbar->Help->Edit Customer Properties
+```
+```properties
+dlv.path=/${your path}/go/bin/dlv
+```
+重启Goland
+
+- 服务端没有启动
+- `.\wen\.env.development`中的`VITE_PROXY`配置的服务器地址或端口与实际不一致
+
 
 

docs/guide-zh-CN/start-update-log.md

@@ -11,6 +11,17 @@
 
 > 如果升级(覆盖)代码后打开会出现 sql 报错, 请检查更新的数据库格式或自行调整
 
+### v2.15.7
+updated 2024.7.21
+
+- 增加：访问日志、服务日志增加关键词搜索
+- 增加：web端增加字典状态管理，重构字典选项使用方式，大幅减少冗余代码
+- 修复：修复生成代码选项式树表已知的一些小bug
+- 优化：gf版本升级到v2.7.2
+- 优化：naive-ui版本升级到2.39.0
+- 优化：访问日志不再记录过大的请求头参数，减少日志大小
+
+
 ### v2.15.1
 updated 2024.4.22
 

docs/guide-zh-CN/sys-code.md

@@ -128,7 +128,7 @@ gfcli:
 ### 生成CRUD表格
 
 - 推荐使用热编译方式启动HotGo，这样生成完成页面自动刷新即可看到新生成内容，无需手动重启
-- 服务端热编译启动：`gf run main.go`, web前端启动：`yarn dev`
+- 服务端热编译启动：`gf run main.go`, web前端启动：`pnpm run dev` 或 `npm run dev`
 
 1、创建数据表
 

docs/guide-zh-CN/web-deploy.md

@@ -15,7 +15,7 @@
 
 项目开发完成之后，执行以下命令进行构建
 ```shell
-yarn build
+pnpm run build 或 npm run build
 ```
 构建打包成功之后，会在根目录生成 dist 文件夹，里面就是构建打包好的文件
 
@@ -40,15 +40,15 @@ VITE_LEGACY = true
 使用项目自定的命令进行预览(推荐)
 ```shell
 # 先打包在进行预览
-yarn preview
+pnpm run preview 或 npm run preview
 # 直接预览本地 dist 文件目录
-yarn preview:dist
+pnpm run preview:dist 或 npm run preview:dist
 ```
 
 - 本地服务器预览(通过 live-server)
 ```shell
 # 1.全局安装live-server
-yarn global add live-server
+npm -g install live-server
 # 2. 进入打包的后目录
 cd ./dist
 # 本地预览，默认端口8080
@@ -60,7 +60,7 @@ live-server --port 9000
 ### 分析构建文件体积
 如果你的构建文件很大，可以通过项目内置 [rollup-plugin-analyzer](https://github.com/doesdev/rollup-plugin-analyzer) 插件进行代码体积分析，从而优化你的代码。
 ```shell
-yarn report
+pnpm run report 或 npm run report
 ```
 运行之后，在自动打开的页面可以看到具体的体积分布，以分析哪些依赖有问题。
 

server/.golangci.yml

@@ -13,14 +13,15 @@ run:
   # Include test files or not.
   # Default: true
   tests: false
+  go: "1.20"
 
   # Which dirs to skip: issues from them won't be reported.
   # Can use regexp here: `generated.*`, regexp is applied on full path.
   # Default value is empty list,
   # but default dirs are skipped independently of this option's value (see skip-dirs-use-default).
   # "/" will be replaced by current OS file path separator to properly work on Windows.
-  skip-dirs:
-    - internal/library/hggen/internal
+  # skip-dirs:
+  #   - internal/library/hggen/internal
 
   # Which files to skip: they will be analyzed, but issues from them won't be reported.
   # Default value is empty list,
@@ -28,7 +29,7 @@ run:
   # we confidently recognize autogenerated files.
   # If it's not please let us know.
   # "/" will be replaced by current OS file path separator to properly work on Windows.
-  skip-files: []
+  # skip-files: []
 
 
 # Main linters configurations.
@@ -71,7 +72,10 @@ issues:
     - linters:
         - gocritic
       text: "unnecessaryDefer:"
-
+  exclude-dirs:
+    - internal/library/hggen/internal
+  exclude-files: []
+    
 
 # https://golangci-lint.run/usage/linters
 linters-settings:
@@ -176,7 +180,7 @@ linters-settings:
     # Select the Go version to target.
     # Default: 1.13
     # Deprecated: use the global `run.go` instead.
-    go: "1.15"
+    # go: "1.15"
     # Sxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
     # Default: ["*"]
     checks: [
@@ -187,7 +191,7 @@ linters-settings:
   govet:
     # Report about shadowed variables.
     # Default: false
-    check-shadowing: true
+    # check-shadowing: true
     # Settings per analyzer.
     settings:
       # Analyzer name, run `go tool vet help` to see all analyzers.
@@ -263,7 +267,7 @@ linters-settings:
     # Select the Go version to target.
     # Default: "1.13"
     # Deprecated: use the global `run.go` instead.
-    go: "1.15"
+    # go: "1.15"
     # SAxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
     # Default: ["*"]
     checks: [ "all","-SA1019","-SA4015","-SA1029","-SA1016","-SA9003","-SA4006","-SA6003" ]

server/Makefile

@@ -9,7 +9,8 @@ ADMIN_RESOURCE_PATH = "/resource/public/admin/"
 build:
 	@rm -rf ./$(ADMIN_RESOURCE_PATH)
 	@mkdir ./$(ADMIN_RESOURCE_PATH)
-	@cd ../web && yarn build && \cp -rf ./dist/*  ../server$(ADMIN_RESOURCE_PATH)
+	@cd ../web && pnpm run build && \cp -rf ./dist/*  ../server$(ADMIN_RESOURCE_PATH)
+	@cd ../server
 	@echo "y" | gf build
 
 # 通过热编译启动所有服务
@@ -36,7 +37,7 @@ auth:
 # 启动web服务
 .PHONY: web
 web:
-	@cd ../web && yarn dev
+	@cd ../web && pnpm run dev
 
 # 刷新casbin权限
 .PHONY: refresh

server/addons/hgexample/logic/sys/index.go

@@ -29,7 +29,7 @@ func init() {
 func (s *sSysIndex) Test(ctx context.Context, in *sysin.IndexTestInp) (res *sysin.IndexTestModel, err error) {
 	res = new(sysin.IndexTestModel)
 	res.Name = in.Name
-	res.Module = fmt.Sprintf("当前插件模块是：%s，当前应用模块是：%s", global.GetSkeleton().Name, contexts.Get(ctx).Module)
+	res.Module = fmt.Sprintf("当前插件模块是：%s，当前应用模块是：%s", global.GetSkeleton().Name, contexts.Get[any](ctx).Module)
 	res.Time = gtime.Now()
 	return
 }

server/addons/hgexample/logic/sys/table.go

@@ -128,7 +128,7 @@ func (s *sSysTable) Export(ctx context.Context, in *sysin.TableListInp) (err err
 		return
 	}
 
-	if err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName); err != nil {
+	if err = excel.ExportByStructs[any](ctx, tags, exports, fileName, sheetName); err != nil {
 		return
 	}
 	return
@@ -143,7 +143,7 @@ func (s *sSysTable) Edit(ctx context.Context, in *sysin.TableEditInp) (err error
 
 	// 修改
 	if in.Id > 0 {
-		in.UpdatedBy = contexts.GetUserId(ctx)
+		in.UpdatedBy = contexts.GetUserId[any](ctx)
 		if _, err = s.Model(ctx).WherePri(in.Id).Data(in).Update(); err != nil {
 			err = gerror.Wrap(err, "修改表格失败，请稍后重试！")
 			return
@@ -152,8 +152,8 @@ func (s *sSysTable) Edit(ctx context.Context, in *sysin.TableEditInp) (err error
 	}
 
 	// 新增
-	in.CreatedBy = contexts.GetUserId(ctx)
-	if _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).Data(in).Insert(); err != nil {
+	in.CreatedBy = contexts.GetUserId[any](ctx)
+	if _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).Data(in).OmitEmptyData().Insert(); err != nil {
 		err = gerror.Wrap(err, "新增表格失败，请稍后重试！")
 		return
 	}
@@ -173,7 +173,7 @@ func (s *sSysTable) Delete(ctx context.Context, in *sysin.TableDeleteInp) (err e
 func (s *sSysTable) Status(ctx context.Context, in *sysin.TableStatusInp) (err error) {
 	update := g.Map{
 		dao.AddonHgexampleTable.Columns().Status:    in.Status,
-		dao.AddonHgexampleTable.Columns().UpdatedBy: contexts.GetUserId(ctx),
+		dao.AddonHgexampleTable.Columns().UpdatedBy: contexts.GetUserId[any](ctx),
 	}
 
 	if _, err = s.Model(ctx).WherePri(in.Id).Data(update).Update(); err != nil {
@@ -197,7 +197,7 @@ func (s *sSysTable) Switch(ctx context.Context, in *sysin.TableSwitchInp) (err e
 
 	update := g.Map{
 		in.Key: in.Value,
-		dao.AddonHgexampleTable.Columns().UpdatedBy: contexts.GetUserId(ctx),
+		dao.AddonHgexampleTable.Columns().UpdatedBy: contexts.GetUserId[any](ctx),
 	}
 
 	if _, err = s.Model(ctx).Where(dao.AddonHgexampleTable.Columns().Id, in.Id).Data(update).Update(); err != nil {

server/addons/hgexample/logic/sys/tenant_order.go

@@ -126,14 +126,13 @@ func (s *sSysTenantOrder) Export(ctx context.Context, in *sysin.TenantOrderListI
 		return
 	}
 
-	err = excel.ExportByStructs(ctx, tags, exports, fileName, sheetName)
+	err = excel.ExportByStructs[any](ctx, tags, exports, fileName, sheetName)
 	return
 }
 
 // Edit 修改/新增多租户功能演示
 func (s *sSysTenantOrder) Edit(ctx context.Context, in *sysin.TenantOrderEditInp) (err error) {
 	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
-
 		// 修改
 		if in.Id > 0 {
 			if _, err = s.Model(ctx).
@@ -158,7 +157,6 @@ func (s *sSysTenantOrder) Edit(ctx context.Context, in *sysin.TenantOrderEditInp
 
 // Delete 删除多租户功能演示
 func (s *sSysTenantOrder) Delete(ctx context.Context, in *sysin.TenantOrderDeleteInp) (err error) {
-
 	if _, err = s.Model(ctx).WherePri(in.Id).Delete(); err != nil {
 		err = gerror.Wrap(err, "删除多租户功能演示失败，请稍后重试！")
 		return

server/addons/hgexample/logic/sys/tree_table.go

@@ -118,14 +118,14 @@ func (s *sSysTreeTable) Edit(ctx context.Context, in *sysin.TableEditInp) (err e
 		}
 
 		if in.Id > 0 {
-			in.UpdatedBy = contexts.GetUserId(ctx)
+			in.UpdatedBy = contexts.GetUserId[any](ctx)
 			if _, err = s.Model(ctx).WherePri(in.Id).Data(in).Update(); err != nil {
 				err = gerror.Wrap(err, "修改表格失败，请稍后重试！")
 				return err
 			}
 		} else {
-			in.CreatedBy = contexts.GetUserId(ctx)
-			if _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).Data(in).Insert(); err != nil {
+			in.CreatedBy = contexts.GetUserId[any](ctx)
+			if _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).Data(in).OmitEmptyData().Insert(); err != nil {
 				err = gerror.Wrap(err, "新增表格失败，请稍后重试！")
 				return err
 			}

server/api/admin/attachment/attachment.go

@@ -47,21 +47,3 @@ type ClearKindReq struct {
 }
 
 type ClearKindRes struct{}
-
-// ChooserOptionReq 获取选择器选项
-type ChooserOptionReq struct {
-	g.Meta `path:"/attachment/chooserOption" method:"get" tags:"附件" summary:"获取选择器选项"`
-}
-
-type ChooserOptionRes struct {
-	Drive sysin.DataSelectModel `json:"drive" dc:"驱动"`
-	Kind  []KindSelect          `json:"kind"  dc:"上传类型"`
-}
-
-type KindSelect struct {
-	Key   string `json:"key"`
-	Value string `json:"value"`
-	Tag   string `json:"listClass"`
-	Label string `json:"label"`
-	Icon  string `json:"icon"`
-}

server/api/admin/curddemo/curddemo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2024 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.13.1
+// @AutoGenerate Version 2.15.7
 package curddemo
 
 import (
@@ -68,6 +68,14 @@ type MaxSortRes struct {
 	*sysin.CurdDemoMaxSortModel
 }
 
+// StatusReq 更新CURD列表状态
+type StatusReq struct {
+	g.Meta `path:"/curdDemo/status" method:"post" tags:"CURD列表" summary:"更新CURD列表状态"`
+	sysin.CurdDemoStatusInp
+}
+
+type StatusRes struct{}
+
 // SwitchReq 更新CURD列表开关状态
 type SwitchReq struct {
 	g.Meta `path:"/curdDemo/switch" method:"post" tags:"CURD列表" summary:"更新CURD列表状态"`

server/api/admin/loginlog/loginlog.go

@@ -30,16 +30,6 @@ type ExportReq struct {
 
 type ExportRes struct{}
 
-// ViewReq 获取登录日志指定信息
-type ViewReq struct {
-	g.Meta `path:"/loginLog/view" method:"get" tags:"登录日志" summary:"获取登录日志指定信息"`
-	sysin.LoginLogViewInp
-}
-
-type ViewRes struct {
-	*sysin.LoginLogViewModel
-}
-
 // DeleteReq 删除登录日志
 type DeleteReq struct {
 	g.Meta `path:"/loginLog/delete" method:"post" tags:"登录日志" summary:"删除登录日志"`

server/api/admin/monitor/monitor.go

@@ -87,8 +87,7 @@ type NetOptionReq struct {
 }
 
 type NetOptionRes struct {
-	LicenseGroup form.Selects   `json:"licenseGroup" dc:"授权分组"`
-	Routes       []*RouteSelect `json:"routes" dc:"路由选项"`
+	Routes []*RouteSelect `json:"routes" dc:"路由选项"`
 }
 
 type RouteSelect struct {

server/api/admin/normaltreedemo/normaltreedemo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2024 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.13.1
+// @AutoGenerate Version 2.15.7
 package normaltreedemo
 
 import (
@@ -66,4 +66,4 @@ type TreeOptionReq struct {
 	g.Meta `path:"/normalTreeDemo/treeOption" method:"get" tags:"普通树表" summary:"获取普通树表关系树选项"`
 }
 
-type TreeOptionRes []tree.Node
+type TreeOptionRes []tree.Node

server/api/admin/optiontreedemo/optiontreedemo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2024 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.13.1
+// @AutoGenerate Version 2.15.7
 package optiontreedemo
 
 import (
@@ -66,4 +66,4 @@ type TreeOptionReq struct {
 	g.Meta `path:"/optionTreeDemo/treeOption" method:"get" tags:"选项树表" summary:"获取选项树表关系树选项"`
 }
 
-type TreeOptionRes []tree.Node
+type TreeOptionRes []tree.Node

server/api/admin/testcategory/testcategory.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2024 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.13.1
+// @AutoGenerate Version 2.15.1
 package testcategory
 
 import (

server/api/api/member/member.go

@@ -1,16 +1,15 @@
-// Package member
-// @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2023 HotGo CLI
-// @Author  Ms <133814250@qq.com>
-// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
 package member
 
-import "github.com/gogf/gf/v2/frame/g"
+import (
+	"context"
 
-// GetIdByCodeReq 通过邀请码获取用户ID
-type GetIdByCodeReq struct {
-	g.Meta `path:"/member/getIdByCode" method:"post" tags:"用户" summary:"通过邀请码获取用户ID"`
-	Code   string `json:"code"   dc:"邀请码"`
+	"hotgo/api/api/member/v1"
+)
+
+type IMemberV1 interface {
+	GetIdByCode(ctx context.Context, req *v1.GetIdByCodeReq) (res *v1.GetIdByCodeRes, err error)
 }
-
-type GetIdByCodeRes struct{}

server/api/api/member/v1/member.go

@@ -0,0 +1,16 @@
+// Package member
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+package v1
+
+import "github.com/gogf/gf/v2/frame/g"
+
+// GetIdByCodeReq 通过邀请码获取用户ID
+type GetIdByCodeReq struct {
+	g.Meta `path:"/member/getIdByCode" method:"post" tags:"用户" summary:"通过邀请码获取用户ID"`
+	Code   string `json:"code"   dc:"邀请码"`
+}
+
+type GetIdByCodeRes struct{}

server/api/api/pay/pay.go

@@ -0,0 +1,17 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package pay
+
+import (
+	"context"
+
+	"hotgo/api/api/pay/v1"
+)
+
+type IPayV1 interface {
+	NotifyAliPay(ctx context.Context, req *v1.NotifyAliPayReq) (res *v1.NotifyAliPayRes, err error)
+	NotifyWxPay(ctx context.Context, req *v1.NotifyWxPayReq) (res *v1.NotifyWxPayRes, err error)
+	NotifyQQPay(ctx context.Context, req *v1.NotifyQQPayReq) (res *v1.NotifyQQPayRes, err error)
+}

server/api/api/pay/v1/notify.go

@@ -3,11 +3,12 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-package pay
+package v1
 
 import (
-	"github.com/gogf/gf/v2/frame/g"
 	"hotgo/internal/model/input/payin"
+
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 // NotifyAliPayReq 支付宝回调

server/go.mod

@@ -1,141 +1,148 @@
 module hotgo
 
-go 1.21
-
-toolchain go1.22.1
+go 1.23.1
 
 require (
-	github.com/Shopify/sarama v1.34.1
-	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.2
-	github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.5
-	github.com/alibabacloud-go/tea v1.1.20
-	github.com/alibabacloud-go/tea-utils/v2 v2.0.1
-	github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible
+	github.com/IBM/sarama v1.43.3
+	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.9
+	github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.6
+	github.com/alibabacloud-go/tea v1.2.2
+	github.com/alibabacloud-go/tea-utils/v2 v2.0.6
+	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
 	github.com/apache/rocketmq-client-go/v2 v2.1.2
-	github.com/casbin/casbin/v2 v2.55.0
-	github.com/forgoer/openssl v1.4.0
-	github.com/go-pay/gopay v1.5.91
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.0
-	github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.0
-	github.com/gogf/gf/contrib/trace/jaeger/v2 v2.7.0
-	github.com/gogf/gf/v2 v2.7.0
+	github.com/casbin/casbin/v2 v2.99.0
+	github.com/forgoer/openssl v1.6.0
+	github.com/go-pay/crypto v0.0.1
+	github.com/go-pay/gopay v1.5.104
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.3
+	github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.3
+	github.com/gogf/gf/contrib/trace/jaeger/v2 v2.7.3
+	github.com/gogf/gf/v2 v2.7.3
 	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
-	github.com/golang-jwt/jwt/v5 v5.0.0
-	github.com/gorilla/websocket v1.5.1
+	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/gorilla/websocket v1.5.3
 	github.com/kayon/iploc v0.0.0-20200312105652-bda3e968a794
-	github.com/minio/minio-go/v7 v7.0.63
+	github.com/minio/minio-go/v7 v7.0.76
 	github.com/mojocn/base64Captcha v1.3.6
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/qiniu/go-sdk/v7 v7.14.0
-	github.com/shirou/gopsutil/v3 v3.23.3
-	github.com/silenceper/wechat/v2 v2.1.4
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.633
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.633
-	github.com/tencentyun/cos-go-sdk-v5 v0.7.45
-	github.com/ufilesdk-dev/ufile-gosdk v1.0.3
+	github.com/qiniu/go-sdk/v7 v7.21.1
+	github.com/shirou/gopsutil/v3 v3.24.5
+	github.com/silenceper/wechat/v2 v2.1.6
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.993
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.993
+	github.com/tencentyun/cos-go-sdk-v5 v0.7.54
+	github.com/ufilesdk-dev/ufile-gosdk v1.0.4
 	github.com/xuri/excelize/v2 v2.6.0
-	go.opentelemetry.io/otel v1.25.0
-	golang.org/x/mod v0.9.0
-	golang.org/x/net v0.24.0
-	golang.org/x/tools v0.7.0
+	go.opentelemetry.io/otel v1.29.0
+	golang.org/x/mod v0.20.0
+	golang.org/x/net v0.28.0
+	golang.org/x/tools v0.24.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	aead.dev/minisign v0.2.0 // indirect
+	aead.dev/minisign v0.3.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/BurntSushi/toml v1.3.2 // indirect
-	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
-	github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 // indirect
-	github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect
-	github.com/alibabacloud-go/endpoint-util v1.1.0 // indirect
-	github.com/alibabacloud-go/openapi-util v0.1.0 // indirect
-	github.com/alibabacloud-go/tea-utils v1.3.1 // indirect
-	github.com/alibabacloud-go/tea-xml v1.1.2 // indirect
-	github.com/aliyun/credentials-go v1.1.2 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d // indirect
+	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 // indirect
+	github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect
+	github.com/alibabacloud-go/debug v1.0.1 // indirect
+	github.com/alibabacloud-go/endpoint-util v1.1.1 // indirect
+	github.com/alibabacloud-go/openapi-util v0.1.1 // indirect
+	github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
+	github.com/aliyun/credentials-go v1.3.9 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
+	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
+	github.com/casbin/govaluate v1.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/eapache/go-resiliency v1.2.0 // indirect
-	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
+	github.com/eapache/go-resiliency v1.7.0 // indirect
+	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
-	github.com/emirpasic/gods v1.12.0 // indirect
-	github.com/fatih/color v1.16.0 // indirect
+	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/fatih/color v1.17.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-ini/ini v1.67.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-pay/errgroup v0.0.2 // indirect
+	github.com/go-pay/util v0.0.4 // indirect
+	github.com/go-pay/xlog v0.0.3 // indirect
+	github.com/go-pay/xtime v0.0.2 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/btree v1.1.2 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-uuid v1.0.2 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
-	github.com/jcmturner/gofork v1.0.0 // indirect
-	github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
+	github.com/jcmturner/gofork v1.7.6 // indirect
+	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/lufia/plan9stats v0.0.0-20240819163618-b1d8f4d146e7 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/matishsiao/goInfo v0.0.0-20210923090445-da2e3fa8d45f // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
-	github.com/minio/sha256-simd v1.0.1 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // 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
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
-	github.com/mozillazg/go-httpheader v0.2.1 // indirect
+	github.com/mozillazg/go-httpheader v0.4.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pierrec/lz4/v4 v4.1.18 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
-	github.com/redis/go-redis/v9 v9.5.1 // indirect
+	github.com/redis/go-redis/v9 v9.6.1 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
-	github.com/richardlehane/msoleps v1.0.1 // indirect
+	github.com/richardlehane/msoleps v1.0.3 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/rs/xid v1.5.0 // indirect
-	github.com/shoenig/go-m1cpu v0.1.4 // indirect
+	github.com/rs/xid v1.6.0 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
-	github.com/tidwall/gjson v1.14.1 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
+	github.com/tidwall/gjson v1.17.3 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
-	github.com/tjfoc/gmsm v1.3.2 // indirect
-	github.com/tklauser/go-sysconf v0.3.11 // indirect
-	github.com/tklauser/numcpus v0.6.0 // indirect
-	github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8 // indirect
-	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
-	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/numcpus v0.8.0 // indirect
+	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
+	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
-	go.opentelemetry.io/otel/metric v1.25.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.25.0 // indirect
-	go.opentelemetry.io/otel/trace v1.25.0 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
-	golang.org/x/image v0.13.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	go.opentelemetry.io/otel/metric v1.29.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.29.0 // indirect
+	go.opentelemetry.io/otel/trace v1.29.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/image v0.19.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	stathat.com/c/consistent v1.0.0 // indirect
 )

server/hack/config.yaml

@@ -38,4 +38,10 @@ gfcli:
 #      srcFolder: "internal/logic"
 #      dstFolder: "internal/service"
 #      dstFileNameCase: "CamelLower"
-#      clear: true
+#      clear: true
+    ctrl:
+      # api/api下的接口可以使用gf gen ctrl自动生成控制器相关代码
+      srcFolder: "api/api"
+      dstFolder: "internal/controller/api"
+      clear: true
+      merge: false

server/internal/consts/ems.go

@@ -18,12 +18,6 @@ const (
 	EmsTemplateCash     = "cash"     // 申请提现
 )
 
-// 验证码状态
-const (
-	EmsStatusNotUsed = 1 // 未使用
-	EmsStatusUsed    = 2 // 已使用
-)
-
 var EmsSubjectMap = g.MapStrStr{
 	EmsTemplateText:     "这是一封来自HotGo的邮件",
 	EmsTemplateCode:     "验证码",

server/internal/consts/http.go

@@ -5,9 +5,56 @@
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package consts
 
+import (
+	"fmt"
+	"github.com/gogf/gf/v2/errors/gcode"
+	"hotgo/internal/library/dict"
+	"hotgo/internal/model"
+	"net/http"
+)
+
+func init() {
+	dict.RegisterEnums("HTTPMethod", "HTTP请求方式选项", HTTPMethodOptions)
+	dict.RegisterEnums("HTTPHandlerTime", "HTTP处理耗时选项", HTTPHandlerTimeOptions)
+	dict.RegisterEnums("HTTPApiCode", "HTTP接口状态码选项", HTTPApiCodeOptions)
+}
+
 const (
 	HTTPContentTypeXml    = "text/xml"
 	HTTPContentTypeHtml   = "text/html"
 	HTTPContentTypeStream = "text/event-stream"
 	HTTPContentTypeJson   = "application/json"
 )
+
+// HTTPMethodOptions HTTP请求方式选项
+var HTTPMethodOptions = []*model.Option{
+	dict.GenSuccessOption(http.MethodGet, "GET"),
+	dict.GenInfoOption(http.MethodPost, "POST"),
+	dict.GenSuccessOption(http.MethodPut, "PUT"),
+	dict.GenInfoOption(http.MethodDelete, "DELETE"),
+}
+
+const (
+	HTTPHandlerTime50          = "< 50"
+	HTTPHandlerTime200         = "< 200"
+	HTTPHandlerTime200To500    = "BETWEEN 200 AND 500"
+	HTTPHandlerTime500To1000   = "BETWEEN 500 AND 1000"
+	HTTPHandlerTime1000To10000 = "BETWEEN 1000 AND 10000"
+	HTTPHandlerTime10000UP     = "> 10000"
+)
+
+// HTTPHandlerTimeOptions HTTP处理耗时选项
+var HTTPHandlerTimeOptions = []*model.Option{
+	dict.GenSuccessOption(HTTPHandlerTime50, "50ms以内"),
+	dict.GenInfoOption(HTTPHandlerTime200, "200ms以内"),
+	dict.GenSuccessOption(HTTPHandlerTime200To500, "200~500ms"),
+	dict.GenSuccessOption(HTTPHandlerTime500To1000, "500~1000ms"),
+	dict.GenInfoOption(HTTPHandlerTime1000To10000, "1000~10000ms"),
+	dict.GenInfoOption(HTTPHandlerTime10000UP, "10000ms以上"),
+}
+
+// HTTPApiCodeOptions HTTP接口状态码选项
+var HTTPApiCodeOptions = []*model.Option{
+	dict.GenSuccessOption(gcode.CodeOK.Code(), fmt.Sprintf("%v %v", gcode.CodeOK.Code(), "成功")),
+	dict.GenWarningOption(gcode.CodeNil.Code(), fmt.Sprintf("%v %v", gcode.CodeNil.Code(), "失败")),
+}

server/internal/consts/servelicense.go

@@ -5,6 +5,15 @@
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package consts
 
+import (
+	"hotgo/internal/library/dict"
+	"hotgo/internal/model"
+)
+
+func init() {
+	dict.RegisterEnums("ServerLicenseGroupOptions", "服务授权分组选项", ServerLicenseGroupOptions)
+}
+
 // 授权分组
 const (
 	LicenseGroupDefault = "default" // 默认组
@@ -12,8 +21,9 @@ const (
 	LicenseGroupAuth    = "auth"    // 服务授权
 )
 
-var LicenseGroupNameMap = map[string]string{
-	LicenseGroupDefault: "默认组",
-	LicenseGroupCron:    "定时任务",
-	LicenseGroupAuth:    "服务授权",
+// ServerLicenseGroupOptions 服务授权分组选项
+var ServerLicenseGroupOptions = []*model.Option{
+	dict.GenWarningOption(LicenseGroupDefault, "默认组"),
+	dict.GenSuccessOption(LicenseGroupCron, "定时任务"),
+	dict.GenSuccessOption(LicenseGroupAuth, "服务授权"),
 }

server/internal/consts/sms.go

@@ -6,7 +6,6 @@
 package consts
 
 // 短信驱动
-
 const (
 	SmsDriveAliYun  = "aliyun"  // 阿里云
 	SmsDriveTencent = "tencent" // 腾讯云
@@ -32,9 +31,3 @@ var (
 		SmsTemplateCash:     "申请提现",
 	}
 )
-
-// 验证码状态
-const (
-	SmsStatusNotUsed = 1 // 未使用
-	SmsStatusUsed    = 2 // 已使用
-)

server/internal/consts/status.go

@@ -5,6 +5,16 @@
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
 package consts
 
+import (
+	"hotgo/internal/library/dict"
+	"hotgo/internal/model"
+)
+
+func init() {
+	dict.RegisterEnums("CodeStatusOptions", "验证码状态选项", CodeStatusOptions)
+	dict.RegisterEnums("BlacklistStatusOptions", "黑名单拉黑状态选项", BlacklistStatusOptions)
+}
+
 // 状态码
 const (
 	StatusALL     int = -1 // 全部状态
@@ -14,3 +24,26 @@ const (
 )
 
 var StatusSlice = []int{StatusALL, StatusEnabled, StatusDisable, StatusDelete}
+
+// 验证码状态
+const (
+	CodeStatusNotUsed = 1 // 未使用
+	CodeStatusUsed    = 2 // 已使用
+)
+
+// CodeStatusOptions 验证码状态选项
+var CodeStatusOptions = []*model.Option{
+	dict.GenWarningOption(CodeStatusNotUsed, "未使用"),
+	dict.GenSuccessOption(CodeStatusUsed, "已使用"),
+}
+
+const (
+	BlacklistStatusDisable = 1 // 封禁中
+	BlacklistStatusEnabled = 2 // 已解封
+)
+
+// BlacklistStatusOptions 黑名单拉黑状态选项
+var BlacklistStatusOptions = []*model.Option{
+	dict.GenWarningOption(BlacklistStatusDisable, "封禁中"),
+	dict.GenSuccessOption(BlacklistStatusEnabled, "已解封"),
+}

server/internal/consts/version.go

@@ -7,5 +7,5 @@ package consts
 
 // VersionApp HotGo版本
 const (
-	VersionApp = "2.15.1"
+	VersionApp = "2.15.7"
 )

server/internal/controller/admin/admin/cash.go

@@ -48,7 +48,7 @@ func (c *cCash) List(ctx context.Context, req *cash.ListReq) (res *cash.ListRes,
 func (c *cCash) Apply(ctx context.Context, req *cash.ApplyReq) (res *cash.ApplyRes, err error) {
 	err = service.AdminCash().Apply(ctx, &adminin.CashApplyInp{
 		Money:    req.Money,
-		MemberId: contexts.GetUserId(ctx),
+		MemberId: contexts.GetUserId[any](ctx),
 	})
 	return
 }

server/internal/controller/admin/admin/member.go

@@ -46,7 +46,7 @@ func (c *cMember) UpdateProfile(ctx context.Context, req *member.UpdateProfileRe
 
 // UpdatePwd 修改登录密码
 func (c *cMember) UpdatePwd(ctx context.Context, req *member.UpdatePwdReq) (res *member.UpdatePwdRes, err error) {
-	var memberId = contexts.Get(ctx).User.Id
+	var memberId = contexts.Get[any](ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
 		return

server/internal/controller/admin/admin/monitor.go

@@ -204,16 +204,6 @@ func (c *cMonitor) NetOnlineList(ctx context.Context, req *monitor.NetOnlineList
 func (c *cMonitor) NetOption(ctx context.Context, req *monitor.NetOptionReq) (res *monitor.NetOptionRes, err error) {
 	res = new(monitor.NetOptionRes)
 
-	// 授权分组
-	for k, v := range consts.LicenseGroupNameMap {
-		res.LicenseGroup = append(res.LicenseGroup, &form.Select{
-			Value: k,
-			Name:  v,
-			Label: v,
-		})
-	}
-	sort.Sort(res.LicenseGroup)
-
 	for _, v := range service.TCPServer().Instance().GetRoutes() {
 		// 无需勾选的路由
 		disabled := false

server/internal/controller/admin/admin/role.go

@@ -46,7 +46,7 @@ func (c *cRole) Delete(ctx context.Context, req *role.DeleteReq) (res *role.Dele
 
 // Dynamic 动态路由
 func (c *cRole) Dynamic(ctx context.Context, _ *role.DynamicReq) (res *role.DynamicRes, err error) {
-	return service.AdminMenu().GetMenuList(ctx, contexts.GetUserId(ctx))
+	return service.AdminMenu().GetMenuList(ctx, contexts.GetUserId[any](ctx))
 }
 
 // GetPermissions 获取指定角色权限

server/internal/controller/admin/common/ems.go

@@ -44,7 +44,7 @@ func (c *cEms) SendTest(ctx context.Context, req *common.SendTestEmailReq) (res
 // SendBindEms 发送换绑邮件
 func (c *cEms) SendBindEms(ctx context.Context, _ *common.SendBindEmsReq) (res *common.SendBindEmsRes, err error) {
 	var (
-		memberId = contexts.GetUserId(ctx)
+		memberId = contexts.GetUserId[any](ctx)
 		models   *entity.AdminMember
 	)
 

server/internal/controller/admin/common/site.go

@@ -7,18 +7,19 @@ package common
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/net/ghttp"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gmode"
 	"hotgo/api/admin/common"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/captcha"
 	"hotgo/internal/library/token"
 	"hotgo/internal/service"
 	"hotgo/utility/validate"
+
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/gmode"
 )
 
 var Site = cSite{}
@@ -44,7 +45,12 @@ func (c *cSite) Config(ctx context.Context, _ *common.SiteConfigReq) (res *commo
 
 func (c *cSite) getWsAddr(ctx context.Context, request *ghttp.Request) string {
 	// 如果是本地IP访问，则认为是调试模式，走实际请求地址，否则走配置中的地址
+	// 尝试读取hostname，兼容本地运行模式
 	ip := ghttp.RequestFromCtx(ctx).GetHeader("hostname")
+	if len(ip) == 0 {
+		ip = ghttp.RequestFromCtx(ctx).GetHost()
+	}
+
 	if validate.IsLocalIPAddr(ip) {
 		return "ws://" + ip + ":" + gstr.StrEx(request.Host, ":") + g.Cfg().MustGet(ctx, "router.websocket.prefix").String()
 	}
@@ -58,7 +64,12 @@ func (c *cSite) getWsAddr(ctx context.Context, request *ghttp.Request) string {
 
 func (c *cSite) getDomain(ctx context.Context, request *ghttp.Request) string {
 	// 如果是本地IP访问，则认为是调试模式，走实际请求地址，否则走配置中的地址
-	ip := request.GetHeader("hostname")
+	// 尝试读取hostname，兼容本地运行模式
+	ip := ghttp.RequestFromCtx(ctx).GetHeader("hostname")
+	if len(ip) == 0 {
+		ip = ghttp.RequestFromCtx(ctx).GetHost()
+	}
+
 	if validate.IsLocalIPAddr(ip) {
 		return "http://" + ip + ":" + gstr.StrEx(request.Host, ":")
 	}
@@ -102,7 +113,7 @@ func (c *cSite) AccountLogin(ctx context.Context, req *common.AccountLoginReq) (
 		return
 	}
 
-	if !req.IsLock && login.CaptchaSwitch == 1 {
+	if !req.IsLock && login.CaptchaSwitch == consts.StatusEnabled {
 		// 校验 验证码
 		if !captcha.Verify(req.Cid, req.Code) {
 			err = gerror.New("验证码错误")
@@ -132,6 +143,6 @@ func (c *cSite) MobileLogin(ctx context.Context, req *common.MobileLoginReq) (re
 
 // Logout 注销登录
 func (c *cSite) Logout(ctx context.Context, _ *common.LoginLogoutReq) (res *common.LoginLogoutRes, err error) {
-	err = token.Logout(ghttp.RequestFromCtx(ctx))
+	err = token.Logout[any](ghttp.RequestFromCtx(ctx))
 	return
 }

server/internal/controller/admin/common/sms.go

@@ -30,7 +30,7 @@ func (c *cSms) SendTest(ctx context.Context, req *common.SendTestSmsReq) (res *c
 // SendBindSms 发送换绑短信
 func (c *cSms) SendBindSms(ctx context.Context, _ *common.SendBindSmsReq) (res *common.SendBindSmsRes, err error) {
 	var (
-		memberId = contexts.GetUserId(ctx)
+		memberId = contexts.GetUserId[any](ctx)
 		models   *entity.AdminMember
 	)
 

server/internal/controller/admin/sys/attachment.go

@@ -8,8 +8,6 @@ package sys
 import (
 	"context"
 	"hotgo/api/admin/attachment"
-	"hotgo/internal/library/storager"
-	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
 )
 
@@ -50,42 +48,6 @@ func (c *cAttachment) List(ctx context.Context, req *attachment.ListReq) (res *a
 	return
 }
 
-// ChooserOption 获取选择器选项
-func (c *cAttachment) ChooserOption(ctx context.Context, req *attachment.ChooserOptionReq) (res *attachment.ChooserOptionRes, err error) {
-	res = new(attachment.ChooserOptionRes)
-
-	res.Drive, err = service.SysDictData().Select(ctx, &sysin.DataSelectInp{Type: "config_upload_drive"})
-	if err != nil {
-		return
-	}
-
-	var kinds = []attachment.KindSelect{
-		{
-			Label: "全部", Key: "", Value: "",
-		},
-		{
-			Label: "图片", Key: storager.KindImg, Value: storager.KindImg, Icon: "PictureOutlined", Tag: "success",
-		},
-		{
-			Label: "文档", Key: storager.KindDoc, Value: storager.KindDoc, Icon: "FileWordOutlined", Tag: "primary",
-		},
-		{
-			Label: "音频", Key: storager.KindAudio, Value: storager.KindAudio, Icon: "CustomerServiceOutlined", Tag: "info",
-		},
-		{
-			Label: "视频", Key: storager.KindVideo, Value: storager.KindVideo, Icon: "PlaySquareOutlined", Tag: "warning",
-		},
-		{
-			Label: "压缩包", Key: storager.KindZip, Value: storager.KindZip, Icon: "FileZipOutlined", Tag: "error",
-		},
-		{
-			Label: "其他", Key: storager.KindOther, Value: storager.KindOther, Icon: "PlusOutlined", Tag: "default",
-		},
-	}
-	res.Kind = append(res.Kind, kinds...)
-	return
-}
-
 // ClearKind 清空上传类型
 func (c *cAttachment) ClearKind(ctx context.Context, req *attachment.ClearKindReq) (res *attachment.ClearKindRes, err error) {
 	err = service.SysAttachment().ClearKind(ctx, &req.AttachmentClearKindInp)

server/internal/controller/admin/sys/curd_demo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2024 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.13.1
+// @AutoGenerate Version 2.15.7
 package sys
 
 import (
@@ -78,6 +78,12 @@ func (c *cCurdDemo) Delete(ctx context.Context, req *curddemo.DeleteReq) (res *c
 	return
 }
 
+// Status 更新CURD列表状态
+func (c *cCurdDemo) Status(ctx context.Context, req *curddemo.StatusReq) (res *curddemo.StatusRes, err error) {
+	err = service.SysCurdDemo().Status(ctx, &req.CurdDemoStatusInp)
+	return
+}
+
 // Switch 更新CURD列表开关状态
 func (c *cCurdDemo) Switch(ctx context.Context, req *curddemo.SwitchReq) (res *curddemo.SwitchRes, err error) {
 	err = service.SysCurdDemo().Switch(ctx, &req.CurdDemoSwitchInp)

server/internal/controller/admin/sys/login_log.go

@@ -38,18 +38,6 @@ func (c *cLoginLog) Export(ctx context.Context, req *loginlog.ExportReq) (res *l
 	return
 }
 
-// View 获取指定登录日志信息
-func (c *cLoginLog) View(ctx context.Context, req *loginlog.ViewReq) (res *loginlog.ViewRes, err error) {
-	data, err := service.SysLoginLog().View(ctx, &req.LoginLogViewInp)
-	if err != nil {
-		return
-	}
-
-	res = new(loginlog.ViewRes)
-	res.LoginLogViewModel = data
-	return
-}
-
 // Delete 删除登录日志
 func (c *cLoginLog) Delete(ctx context.Context, req *loginlog.DeleteReq) (res *loginlog.DeleteRes, err error) {
 	err = service.SysLoginLog().Delete(ctx, &req.LoginLogDeleteInp)

server/internal/controller/admin/sys/normal_tree_demo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2024 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.13.1
+// @AutoGenerate Version 2.15.7
 package sys
 
 import (
@@ -75,6 +75,15 @@ func (c *cNormalTreeDemo) Delete(ctx context.Context, req *normaltreedemo.Delete
 // TreeOption 获取普通树表关系树选项
 func (c *cNormalTreeDemo) TreeOption(ctx context.Context, req *normaltreedemo.TreeOptionReq) (res *normaltreedemo.TreeOptionRes, err error) {
 	data, err := service.SysNormalTreeDemo().TreeOption(ctx)
-	res = (*normaltreedemo.TreeOptionRes)(&data)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(data) > 0 {
+		res = (*normaltreedemo.TreeOptionRes)(&data)
+	} else {
+		temp := make(normaltreedemo.TreeOptionRes, 0)
+		res = &temp
+	}
 	return
-}
+}

server/internal/controller/admin/sys/option_tree_demo.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2024 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.13.1
+// @AutoGenerate Version 2.15.7
 package sys
 
 import (
@@ -75,6 +75,15 @@ func (c *cOptionTreeDemo) Delete(ctx context.Context, req *optiontreedemo.Delete
 // TreeOption 获取选项树表关系树选项
 func (c *cOptionTreeDemo) TreeOption(ctx context.Context, req *optiontreedemo.TreeOptionReq) (res *optiontreedemo.TreeOptionRes, err error) {
 	data, err := service.SysOptionTreeDemo().TreeOption(ctx)
-	res = (*optiontreedemo.TreeOptionRes)(&data)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(data) > 0 {
+		res = (*optiontreedemo.TreeOptionRes)(&data)
+	} else {
+		temp := make(optiontreedemo.TreeOptionRes, 0)
+		res = &temp
+	}
 	return
-}
+}

server/internal/controller/admin/sys/test_category.go

@@ -3,7 +3,7 @@
 // @Copyright  Copyright (c) 2024 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.13.1
+// @AutoGenerate Version 2.15.1
 package sys
 
 import (

server/internal/controller/api/member/member.go

@@ -1,23 +1,5 @@
-// Package member
-// @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2023 HotGo CLI
-// @Author  Ms <133814250@qq.com>
-// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
 package member
-
-import (
-	"context"
-	"github.com/gogf/gf/v2/frame/g"
-	"hotgo/api/api/member"
-)
-
-var (
-	Member = cMember{}
-)
-
-type cMember struct{}
-
-func (c *cMember) GetIdByCode(ctx context.Context, _ *member.GetIdByCodeReq) (res *member.GetIdByCodeRes, err error) {
-	g.RequestFromCtx(ctx).Response.Writeln("Hello World api member!")
-	return
-}

server/internal/controller/api/member/member_new.go

@@ -0,0 +1,15 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package member
+
+import (
+	"hotgo/api/api/member"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() member.IMemberV1 {
+	return &ControllerV1{}
+}

server/internal/controller/api/member/member_v1_get_id_by_code.go

@@ -0,0 +1,14 @@
+package member
+
+import (
+	"context"
+
+	v1 "hotgo/api/api/member/v1"
+
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+func (c *ControllerV1) GetIdByCode(ctx context.Context, req *v1.GetIdByCodeReq) (res *v1.GetIdByCodeRes, err error) {
+	g.RequestFromCtx(ctx).Response.Writeln("Hello World api member!")
+	return
+}

server/internal/controller/api/pay/notify.go

@@ -1,57 +0,0 @@
-// Package pay
-// @Link  https://github.com/bufanyun/hotgo
-// @Copyright  Copyright (c) 2023 HotGo CLI
-// @Author  Ms <133814250@qq.com>
-// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-package pay
-
-import (
-	"context"
-	"github.com/gogf/gf/v2/frame/g"
-	"hotgo/api/api/pay"
-	"hotgo/internal/consts"
-	"hotgo/internal/library/response"
-	"hotgo/internal/model/input/payin"
-	"hotgo/internal/service"
-)
-
-var (
-	Notify = cNotify{}
-)
-
-type cNotify struct{}
-
-// AliPay 支付宝回调
-func (c *cNotify) AliPay(ctx context.Context, _ *pay.NotifyAliPayReq) (res *pay.NotifyAliPayRes, err error) {
-	if _, err = service.Pay().Notify(ctx, &payin.PayNotifyInp{PayType: consts.PayTypeAliPay}); err != nil {
-		return nil, err
-	}
-
-	response.RText(g.RequestFromCtx(ctx), "success")
-	return
-}
-
-// WxPay 微信支付回调
-func (c *cNotify) WxPay(ctx context.Context, _ *pay.NotifyWxPayReq) (res *pay.NotifyWxPayRes, err error) {
-	if _, err = service.Pay().Notify(ctx, &payin.PayNotifyInp{PayType: consts.PayTypeWxPay}); err != nil {
-		return
-	}
-
-	response.CustomJson(g.RequestFromCtx(ctx), `{"code": "SUCCESS","message": "收单成功"}`)
-	return
-}
-
-// QQPay QQ支付回调
-func (c *cNotify) QQPay(ctx context.Context, _ *pay.NotifyQQPayReq) (res *pay.NotifyQQPayRes, err error) {
-	if _, err = service.Pay().Notify(ctx, &payin.PayNotifyInp{PayType: consts.PayTypeQQPay}); err != nil {
-		return
-	}
-
-	r := g.RequestFromCtx(ctx)
-	r.Response.ClearBuffer()
-	r.Response.Write(`<?xml version="1.0" encoding="UTF-8"?>`)
-	r.Response.WriteXml(g.Map{
-		"return_code": "SUCCESS",
-	})
-	return
-}

server/internal/controller/api/pay/pay.go

@@ -0,0 +1,5 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package pay

server/internal/controller/api/pay/pay_new.go

@@ -0,0 +1,15 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package pay
+
+import (
+	"hotgo/api/api/pay"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() pay.IPayV1 {
+	return &ControllerV1{}
+}

server/internal/controller/api/pay/pay_v1_notify_ali_pay.go

@@ -0,0 +1,22 @@
+package pay
+
+import (
+	"context"
+
+	v1 "hotgo/api/api/pay/v1"
+	"hotgo/internal/consts"
+	"hotgo/internal/library/response"
+	"hotgo/internal/model/input/payin"
+	"hotgo/internal/service"
+
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+func (c *ControllerV1) NotifyAliPay(ctx context.Context, req *v1.NotifyAliPayReq) (res *v1.NotifyAliPayRes, err error) {
+	if _, err = service.Pay().Notify(ctx, &payin.PayNotifyInp{PayType: consts.PayTypeAliPay}); err != nil {
+		return nil, err
+	}
+
+	response.RText(g.RequestFromCtx(ctx), "success")
+	return
+}

server/internal/controller/api/pay/pay_v1_notify_qq_pay.go

@@ -0,0 +1,26 @@
+package pay
+
+import (
+	"context"
+
+	v1 "hotgo/api/api/pay/v1"
+	"hotgo/internal/consts"
+	"hotgo/internal/model/input/payin"
+	"hotgo/internal/service"
+
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+func (c *ControllerV1) NotifyQQPay(ctx context.Context, req *v1.NotifyQQPayReq) (res *v1.NotifyQQPayRes, err error) {
+	if _, err = service.Pay().Notify(ctx, &payin.PayNotifyInp{PayType: consts.PayTypeQQPay}); err != nil {
+		return
+	}
+
+	r := g.RequestFromCtx(ctx)
+	r.Response.ClearBuffer()
+	r.Response.Write(`<?xml version="1.0" encoding="UTF-8"?>`)
+	r.Response.WriteXml(g.Map{
+		"return_code": "SUCCESS",
+	})
+	return
+}

server/internal/controller/api/pay/pay_v1_notify_wx_pay.go

@@ -0,0 +1,22 @@
+package pay
+
+import (
+	"context"
+
+	v1 "hotgo/api/api/pay/v1"
+	"hotgo/internal/consts"
+	"hotgo/internal/library/response"
+	"hotgo/internal/model/input/payin"
+	"hotgo/internal/service"
+
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+func (c *ControllerV1) NotifyWxPay(ctx context.Context, req *v1.NotifyWxPayReq) (res *v1.NotifyWxPayRes, err error) {
+	if _, err = service.Pay().Notify(ctx, &payin.PayNotifyInp{PayType: consts.PayTypeWxPay}); err != nil {
+		return
+	}
+
+	response.CustomJson(g.RequestFromCtx(ctx), `{"code": "SUCCESS","message": "收单成功"}`)
+	return
+}