remove uint repeat conversion (#2096)

Co-authored-by: houseme <housemecn@gmail.com>

.github/workflows/cli.yml

@@ -52,7 +52,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name:     ${{ github.ref }}
-          release_name: GoFrame CLI Release ${{ github.ref }}
+          release_name: GoFrame Release ${{ github.ref }}
           draft:        false
           prerelease:   false
       

.github/workflows/gf.yml

@@ -8,6 +8,7 @@ on:
     - develop
     - personal/**
     - feature/**
+    - enhance/**
     - fix/**
 
   pull_request:
@@ -16,8 +17,14 @@ on:
     - develop
     - personal/**
     - feature/**
+    - enhance/**
     - fix/**
 
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
 env:
   TZ: "Asia/Shanghai"
 
@@ -111,15 +118,13 @@ jobs:
           - 1521:1521
 
 
-
     strategy:
       matrix:
-        go: [ "1.15", "1.16", "1.17" ]
+        go-version: [ "1.15", "1.16", "1.17", "1.18" ]
         goarch: [ "386", "amd64" ]
 
-
     steps:
-    - name: Set Up Timezone
+    - name: Setup Timezone
       uses: szenius/set-timezone@v1.0
       with:
         timezoneLinux: "Asia/Shanghai"
@@ -127,13 +132,30 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
-    - name: Set Up Go
+    - name: Setup Golang ${{ matrix.go-version }}
       uses: actions/setup-go@v2
       with:
-        go-version: ${{ matrix.go }}
+        go-version: ${{ matrix.go-version }}
+
+    - name: Setup Golang caches
+      uses: actions/cache@v3
+      with:
+        # In order:
+        # * Module download cache
+        # * Build cache (Linux)
+        # * Build cache (Mac)
+        # * Build cache (Windows)
+        path: |
+          ~/go/pkg/mod
+          ~/.cache/go-build
+          ~/Library/Caches/go-build
+          ~\AppData\Local\go-build
+        key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-${{ matrix.go-version }}-
 
     - name: Start containers
-      run: docker-compose -f ".github/workflows/docker-compose.yml" up -d --build
+      run: docker-compose -f ".github/workflows/docker/docker-compose.yml" up -d --build
 
     - name: Before Script
       run: |
@@ -165,10 +187,10 @@ jobs:
         done
 
     - name: Stop containers
-      run: docker-compose -f ".github/workflows/docker-compose.yml" down
+      run: docker-compose -f ".github/workflows/docker/docker-compose.yml" down
 
     - name: Report Coverage
       uses: codecov/codecov-action@v2
       with:
-        flags: go-${{ matrix.go }}-${{ matrix.goarch }}
+        flags: go-${{ matrix.go-version }}-${{ matrix.goarch }}
 

.github/workflows/issue-check-inactive.yml

@@ -0,0 +1,28 @@
+# 规则描述：每天0点(GMT+8)执行一次，将最近7天没有活跃且非BUG的ISSUE设置标签:inactive
+name: Issue Check Inactive
+
+on:
+  schedule:
+    - cron: "0 3 * * *"
+
+env: # 设置环境变量
+  TZ: Asia/Shanghai #时区（设置时区可使页面中的`最近更新时间`使用时区时间）
+
+permissions:
+  contents: read
+
+jobs:
+  issue-check-inactive:
+    permissions:
+      issues: write  # for actions-cool/issues-helper to update issues
+     # pull-requests: write  # for actions-cool/issues-helper to update PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: check-inactive
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'check-inactive'
+          inactive-label: 'inactive'
+          inactive-day: 7
+          issue-state: open
+          exclude-labels: 'bug'

.github/workflows/issue-close-inactive.yml

@@ -0,0 +1,22 @@
+# 规则描述：每天0点(GMT+8)执行一次，将最近30天没有活跃且非BUG的ISSUE关闭
+name: Issue Close Inactive
+
+on:
+  schedule:
+    - cron: "0 3 * * *"
+
+env: # 设置环境变量
+  TZ: Asia/Shanghai #时区（设置时区可使页面中的`最近更新时间`使用时区时间）
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - name: need close
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "close-issues"
+#          token: ${{ secrets.GF_TOKEN }}
+          labels: 'inactive'
+          inactive-day: 30
+          exclude-labels: 'bug'

.github/workflows/issue-labeled.yml

@@ -0,0 +1,25 @@
+## 规则描述：当issue被标记为help wanted 时，增加评论
+
+name: Issue Labeled
+
+on:
+  issues:
+    types: [labeled]
+
+env: # 设置环境变量
+  TZ: Asia/Shanghai # 时区（设置时区可使页面中的`最近更新时间`使用时区时间）
+
+jobs:
+  reply-labeled:
+    runs-on: ubuntu-latest
+    steps:
+      - name: contribution welcome
+        if: github.event.label.name == 'help wanted'
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: "create-comment, remove-labels"
+#          token: ${{ secrets.GF_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Hello @${{ github.event.issue.user.login }}. We like your proposal/feedback and would appreciate a contribution via a Pull Request by you or another community member. We thank you in advance for your contribution and are looking forward to reviewing it!
+            你好 @${{ github.event.issue.user.login }}。我们喜欢您的提案/反馈，并希望您或其他社区成员通过拉取请求做出贡献。我们提前感谢您的贡献，并期待对其进行审查。

.github/workflows/issue-remove-inactive.yml

@@ -0,0 +1,29 @@
+# 规则描述：在issue没有活跃且尚未被关闭期间，若issue作者更新或评论该ISSUE，则移除其inactive标签
+name: Issue Remove Inactive
+
+on:
+  issues:
+    types: [edited]
+  issue_comment:
+    types: [created, edited]
+
+env: # 设置环境变量
+  TZ: Asia/Shanghai #时区（设置时区可使页面中的`最近更新时间`使用时区时间）
+
+permissions:
+  contents: read
+
+jobs:
+  issue-remove-inactive:
+    permissions:
+      issues: write  # for actions-cool/issues-helper to update issues
+     # pull-requests: write  # for actions-cool/issues-helper to update PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: remove inactive
+        if: github.event.issue.state == 'open' && github.actor == github.event.issue.user.login
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'remove-labels'
+          issue-number: ${{ github.event.issue.number }}
+          labels: 'inactive'

.github/workflows/issue-remove-need-more-details.yml

@@ -0,0 +1,29 @@
+# 规则描述：将需要提供更多细节且暂未关闭的issue，在issue作者评论后，移除 need more details 标签
+name: Issue Remove Need More Details
+
+on:
+  issues:
+    types: [edited]
+  issue_comment:
+    types: [created, edited]
+
+env: # 设置环境变量
+  TZ: Asia/Shanghai #时区（设置时区可使页面中的`最近更新时间`使用时区时间）
+
+permissions:
+  contents: read
+
+jobs:
+  issue-remove-need-more-details:
+    permissions:
+      issues: write  # for actions-cool/issues-helper to update issues
+     # pull-requests: write  # for actions-cool/issues-helper to update PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: remove need more details
+        if: github.event.issue.state == 'open' && github.actor == github.event.issue.user.login
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'remove-labels'
+          issue-number: ${{ github.event.issue.number }}
+          labels: 'need more details'

cmd/gf/internal/cmd/cmd_gen_service.go

@@ -331,6 +331,10 @@ func (c cGenService) generateServiceFiles(
 				mlog.Printf(`not overwrite, ignore generating service go file: %s`, filePath)
 				continue
 			}
+			if !utils.IsFileDoNotEdit(filePath) {
+				mlog.Printf(`ignore file as it is manually maintained: %s`, filePath)
+				continue
+			}
 			if !c.isToGenerateServiceGoFile(filePath, funcArray) {
 				mlog.Printf(`not dirty, ignore generating service go file: %s`, filePath)
 				continue
@@ -347,10 +351,6 @@ func (c cGenService) generateServiceFiles(
 
 // isToGenerateServiceGoFile checks and returns whether the service content dirty.
 func (c cGenService) isToGenerateServiceGoFile(filePath string, funcArray *garray.StrArray) bool {
-	if !utils.IsFileDoNotEdit(filePath) {
-		mlog.Debugf(`ignore file as it is manually maintained: %s`, filePath)
-		return false
-	}
 	var (
 		fileContent        = gfile.GetContents(filePath)
 		generatedFuncArray = garray.NewSortedStrArrayFrom(funcArray.Slice())

cmd/gf/internal/cmd/cmd_init.go

@@ -94,6 +94,7 @@ func (c cInit) Index(ctx context.Context, in cInitInput) (out *cInitOutput, err
 	// Update the GoFrame version.
 	if in.Update {
 		mlog.Print("update goframe...")
+		// go get -u github.com/gogf/gf/v2@latest
 		updateCommand := `go get -u github.com/gogf/gf/v2@latest`
 		if in.Name != "." {
 			updateCommand = fmt.Sprintf(`cd %s && %s`, in.Name, updateCommand)
@@ -101,6 +102,14 @@ func (c cInit) Index(ctx context.Context, in cInitInput) (out *cInitOutput, err
 		if err = gproc.ShellRun(ctx, updateCommand); err != nil {
 			mlog.Fatal(err)
 		}
+		// go mod tidy
+		gomModTidyCommand := `go mod tidy`
+		if in.Name != "." {
+			gomModTidyCommand = fmt.Sprintf(`cd %s && %s`, in.Name, gomModTidyCommand)
+		}
+		if err = gproc.ShellRun(ctx, gomModTidyCommand); err != nil {
+			mlog.Fatal(err)
+		}
 	}
 
 	mlog.Print("initialization done! ")

cmd/gf/internal/cmd/gendao/gendao.go

@@ -78,6 +78,10 @@ generated json tag case for model struct, cases are as follows:
 | Kebab           | any-kind-of-string |
 | KebabScreaming  | ANY-KIND-OF-STRING |
 `
+	CGenDaoBriefTplDaoIndexPath    = `template file path for dao index file`
+	CGenDaoBriefTplDaoInternalPath = `template file path for dao internal file`
+	CGenDaoBriefTplDaoDoPathPath   = `template file path for dao do file`
+	CGenDaoBriefTplDaoEntityPath   = `template file path for dao entity file`
 
 	tplVarTableName               = `{TplTableName}`
 	tplVarTableNameCamelCase      = `{TplTableNameCamelCase}`
@@ -89,6 +93,7 @@ generated json tag case for model struct, cases are as follows:
 	tplVarColumnNames             = `{TplColumnNames}`
 	tplVarGroupName               = `{TplGroupName}`
 	tplVarDatetimeStr             = `{TplDatetimeStr}`
+	tplVarCreatedAtDatetimeStr    = `{TplCreatedAtDatetimeStr}`
 )
 
 var (
@@ -97,58 +102,66 @@ var (
 
 func init() {
 	gtag.Sets(g.MapStrStr{
-		`CGenDaoConfig`:               CGenDaoConfig,
-		`CGenDaoUsage`:                CGenDaoUsage,
-		`CGenDaoBrief`:                CGenDaoBrief,
-		`CGenDaoEg`:                   CGenDaoEg,
-		`CGenDaoAd`:                   CGenDaoAd,
-		`CGenDaoBriefPath`:            CGenDaoBriefPath,
-		`CGenDaoBriefLink`:            CGenDaoBriefLink,
-		`CGenDaoBriefTables`:          CGenDaoBriefTables,
-		`CGenDaoBriefTablesEx`:        CGenDaoBriefTablesEx,
-		`CGenDaoBriefPrefix`:          CGenDaoBriefPrefix,
-		`CGenDaoBriefRemovePrefix`:    CGenDaoBriefRemovePrefix,
-		`CGenDaoBriefStdTime`:         CGenDaoBriefStdTime,
-		`CGenDaoBriefWithTime`:        CGenDaoBriefWithTime,
-		`CGenDaoBriefDaoPath`:         CGenDaoBriefDaoPath,
-		`CGenDaoBriefDoPath`:          CGenDaoBriefDoPath,
-		`CGenDaoBriefEntityPath`:      CGenDaoBriefEntityPath,
-		`CGenDaoBriefGJsonSupport`:    CGenDaoBriefGJsonSupport,
-		`CGenDaoBriefImportPrefix`:    CGenDaoBriefImportPrefix,
-		`CGenDaoBriefOverwriteDao`:    CGenDaoBriefOverwriteDao,
-		`CGenDaoBriefModelFile`:       CGenDaoBriefModelFile,
-		`CGenDaoBriefModelFileForDao`: CGenDaoBriefModelFileForDao,
-		`CGenDaoBriefDescriptionTag`:  CGenDaoBriefDescriptionTag,
-		`CGenDaoBriefNoJsonTag`:       CGenDaoBriefNoJsonTag,
-		`CGenDaoBriefNoModelComment`:  CGenDaoBriefNoModelComment,
-		`CGenDaoBriefGroup`:           CGenDaoBriefGroup,
-		`CGenDaoBriefJsonCase`:        CGenDaoBriefJsonCase,
+		`CGenDaoConfig`:                  CGenDaoConfig,
+		`CGenDaoUsage`:                   CGenDaoUsage,
+		`CGenDaoBrief`:                   CGenDaoBrief,
+		`CGenDaoEg`:                      CGenDaoEg,
+		`CGenDaoAd`:                      CGenDaoAd,
+		`CGenDaoBriefPath`:               CGenDaoBriefPath,
+		`CGenDaoBriefLink`:               CGenDaoBriefLink,
+		`CGenDaoBriefTables`:             CGenDaoBriefTables,
+		`CGenDaoBriefTablesEx`:           CGenDaoBriefTablesEx,
+		`CGenDaoBriefPrefix`:             CGenDaoBriefPrefix,
+		`CGenDaoBriefRemovePrefix`:       CGenDaoBriefRemovePrefix,
+		`CGenDaoBriefStdTime`:            CGenDaoBriefStdTime,
+		`CGenDaoBriefWithTime`:           CGenDaoBriefWithTime,
+		`CGenDaoBriefDaoPath`:            CGenDaoBriefDaoPath,
+		`CGenDaoBriefDoPath`:             CGenDaoBriefDoPath,
+		`CGenDaoBriefEntityPath`:         CGenDaoBriefEntityPath,
+		`CGenDaoBriefGJsonSupport`:       CGenDaoBriefGJsonSupport,
+		`CGenDaoBriefImportPrefix`:       CGenDaoBriefImportPrefix,
+		`CGenDaoBriefOverwriteDao`:       CGenDaoBriefOverwriteDao,
+		`CGenDaoBriefModelFile`:          CGenDaoBriefModelFile,
+		`CGenDaoBriefModelFileForDao`:    CGenDaoBriefModelFileForDao,
+		`CGenDaoBriefDescriptionTag`:     CGenDaoBriefDescriptionTag,
+		`CGenDaoBriefNoJsonTag`:          CGenDaoBriefNoJsonTag,
+		`CGenDaoBriefNoModelComment`:     CGenDaoBriefNoModelComment,
+		`CGenDaoBriefGroup`:              CGenDaoBriefGroup,
+		`CGenDaoBriefJsonCase`:           CGenDaoBriefJsonCase,
+		`CGenDaoBriefTplDaoIndexPath`:    CGenDaoBriefTplDaoIndexPath,
+		`CGenDaoBriefTplDaoInternalPath`: CGenDaoBriefTplDaoInternalPath,
+		`CGenDaoBriefTplDaoDoPathPath`:   CGenDaoBriefTplDaoDoPathPath,
+		`CGenDaoBriefTplDaoEntityPath`:   CGenDaoBriefTplDaoEntityPath,
 	})
 }
 
 type (
 	CGenDao      struct{}
 	CGenDaoInput struct {
-		g.Meta         `name:"dao" config:"{CGenDaoConfig}" usage:"{CGenDaoUsage}" brief:"{CGenDaoBrief}" eg:"{CGenDaoEg}" ad:"{CGenDaoAd}"`
-		Path           string `name:"path"            short:"p"  brief:"{CGenDaoBriefPath}" d:"internal"`
-		Link           string `name:"link"            short:"l"  brief:"{CGenDaoBriefLink}"`
-		Tables         string `name:"tables"          short:"t"  brief:"{CGenDaoBriefTables}"`
-		TablesEx       string `name:"tablesEx"        short:"x"  brief:"{CGenDaoBriefTablesEx}"`
-		Group          string `name:"group"           short:"g"  brief:"{CGenDaoBriefGroup}" d:"default"`
-		Prefix         string `name:"prefix"          short:"f"  brief:"{CGenDaoBriefPrefix}"`
-		RemovePrefix   string `name:"removePrefix"    short:"r"  brief:"{CGenDaoBriefRemovePrefix}"`
-		JsonCase       string `name:"jsonCase"        short:"j"  brief:"{CGenDaoBriefJsonCase}" d:"CamelLower"`
-		ImportPrefix   string `name:"importPrefix"    short:"i"  brief:"{CGenDaoBriefImportPrefix}"`
-		DaoPath        string `name:"daoPath"         short:"d"  brief:"{CGenDaoBriefDaoPath}"    d:"dao"`
-		DoPath         string `name:"doPath"          short:"o"  brief:"{CGenDaoBriefDoPath}"     d:"model/do"`
-		EntityPath     string `name:"entityPath"      short:"e"  brief:"{CGenDaoBriefEntityPath}" d:"model/entity"`
-		StdTime        bool   `name:"stdTime"         short:"s"  brief:"{CGenDaoBriefStdTime}"         orphan:"true"`
-		WithTime       bool   `name:"withTime"        short:"w"  brief:"{CGenDaoBriefWithTime}"        orphan:"true"`
-		GJsonSupport   bool   `name:"gJsonSupport"    short:"n"  brief:"{CGenDaoBriefGJsonSupport}"    orphan:"true"`
-		OverwriteDao   bool   `name:"overwriteDao"    short:"v"  brief:"{CGenDaoBriefOverwriteDao}"    orphan:"true"`
-		DescriptionTag bool   `name:"descriptionTag"  short:"c"  brief:"{CGenDaoBriefDescriptionTag}"  orphan:"true"`
-		NoJsonTag      bool   `name:"noJsonTag"       short:"k"  brief:"{CGenDaoBriefNoJsonTag"        orphan:"true"`
-		NoModelComment bool   `name:"noModelComment"  short:"m"  brief:"{CGenDaoBriefNoModelComment}"  orphan:"true"`
+		g.Meta             `name:"dao" config:"{CGenDaoConfig}" usage:"{CGenDaoUsage}" brief:"{CGenDaoBrief}" eg:"{CGenDaoEg}" ad:"{CGenDaoAd}"`
+		Path               string `name:"path"                short:"p"  brief:"{CGenDaoBriefPath}" d:"internal"`
+		Link               string `name:"link"                short:"l"  brief:"{CGenDaoBriefLink}"`
+		Tables             string `name:"tables"              short:"t"  brief:"{CGenDaoBriefTables}"`
+		TablesEx           string `name:"tablesEx"            short:"x"  brief:"{CGenDaoBriefTablesEx}"`
+		Group              string `name:"group"               short:"g"  brief:"{CGenDaoBriefGroup}" d:"default"`
+		Prefix             string `name:"prefix"              short:"f"  brief:"{CGenDaoBriefPrefix}"`
+		RemovePrefix       string `name:"removePrefix"        short:"r"  brief:"{CGenDaoBriefRemovePrefix}"`
+		JsonCase           string `name:"jsonCase"            short:"j"  brief:"{CGenDaoBriefJsonCase}" d:"CamelLower"`
+		ImportPrefix       string `name:"importPrefix"        short:"i"  brief:"{CGenDaoBriefImportPrefix}"`
+		DaoPath            string `name:"daoPath"             short:"d"  brief:"{CGenDaoBriefDaoPath}"    d:"dao"`
+		DoPath             string `name:"doPath"              short:"o"  brief:"{CGenDaoBriefDoPath}"     d:"model/do"`
+		EntityPath         string `name:"entityPath"          short:"e"  brief:"{CGenDaoBriefEntityPath}" d:"model/entity"`
+		TplDaoIndexPath    string `name:"tplDaoIndexPath"     short:"t1" brief:"{CGenDaoBriefTplDaoIndexPath}"`
+		TplDaoInternalPath string `name:"tplDaoInternalPath"  short:"t2" brief:"{CGenDaoBriefTplDaoInternalPath}"`
+		TplDaoDoPath       string `name:"tplDaoDoPath"        short:"t3" brief:"{CGenDaoBriefTplDaoDoPathPath}"`
+		TplDaoEntitylPath  string `name:"tplDaoEntityPath"    short:"t4" brief:"{CGenDaoBriefTplDaoEntityPath}"`
+		StdTime            bool   `name:"stdTime"             short:"s"  brief:"{CGenDaoBriefStdTime}"         orphan:"true"`
+		WithTime           bool   `name:"withTime"            short:"w"  brief:"{CGenDaoBriefWithTime}"        orphan:"true"`
+		GJsonSupport       bool   `name:"gJsonSupport"        short:"n"  brief:"{CGenDaoBriefGJsonSupport}"    orphan:"true"`
+		OverwriteDao       bool   `name:"overwriteDao"        short:"v"  brief:"{CGenDaoBriefOverwriteDao}"    orphan:"true"`
+		DescriptionTag     bool   `name:"descriptionTag"      short:"c"  brief:"{CGenDaoBriefDescriptionTag}"  orphan:"true"`
+		NoJsonTag          bool   `name:"noJsonTag"           short:"k"  brief:"{CGenDaoBriefNoJsonTag}"       orphan:"true"`
+		NoModelComment     bool   `name:"noModelComment"      short:"m"  brief:"{CGenDaoBriefNoModelComment}"  orphan:"true"`
 	}
 	CGenDaoOutput struct{}
 
@@ -305,12 +318,14 @@ func getImportPartContent(source string, isDo bool) string {
 }
 
 func replaceDefaultVar(in CGenDaoInternalInput, origin string) string {
-	var tplDatetimeStr string
+	var tplCreatedAtDatetimeStr string
+	var tplDatetimeStr string = createdAt.String()
 	if in.WithTime {
-		tplDatetimeStr = fmt.Sprintf(`Created at %s`, createdAt.String())
+		tplCreatedAtDatetimeStr = fmt.Sprintf(`Created at %s`, tplDatetimeStr)
 	}
 	return gstr.ReplaceByMap(origin, g.MapStrStr{
-		tplVarDatetimeStr: tplDatetimeStr,
+		tplVarDatetimeStr:          tplDatetimeStr,
+		tplVarCreatedAtDatetimeStr: tplCreatedAtDatetimeStr,
 	})
 }
 
@@ -337,3 +352,12 @@ func sortFieldKeyForDao(fieldMap map[string]*gdb.TableField) []string {
 	}
 	return result
 }
+
+func getTemplateFromPathOrDefault(filePath string, def string) string {
+	if filePath != "" {
+		if contents := gfile.GetContents(filePath); contents != "" {
+			return contents
+		}
+	}
+	return def
+}

cmd/gf/internal/cmd/gendao/gendao_dao.go

@@ -64,12 +64,14 @@ func generateDao(ctx context.Context, db gdb.DB, in CGenDaoInternalInput) {
 func generateDaoIndex(in CGenDaoInternalInput, tableNameCamelCase, tableNameCamelLowerCase, importPrefix, dirPathDao, fileName string) {
 	path := gfile.Join(dirPathDao, fileName+".go")
 	if in.OverwriteDao || !gfile.Exists(path) {
-		indexContent := gstr.ReplaceByMap(getTplDaoIndexContent(""), g.MapStrStr{
-			tplVarImportPrefix:            importPrefix,
-			tplVarTableName:               in.TableName,
-			tplVarTableNameCamelCase:      tableNameCamelCase,
-			tplVarTableNameCamelLowerCase: tableNameCamelLowerCase,
-		})
+		indexContent := gstr.ReplaceByMap(
+			getTemplateFromPathOrDefault(in.TplDaoIndexPath, consts.TemplateGenDaoIndexContent),
+			g.MapStrStr{
+				tplVarImportPrefix:            importPrefix,
+				tplVarTableName:               in.TableName,
+				tplVarTableNameCamelCase:      tableNameCamelCase,
+				tplVarTableNameCamelLowerCase: tableNameCamelLowerCase,
+			})
 		indexContent = replaceDefaultVar(in, indexContent)
 		if err := gfile.PutContents(path, strings.TrimSpace(indexContent)); err != nil {
 			mlog.Fatalf("writing content to '%s' failed: %v", path, err)
@@ -87,15 +89,17 @@ func generateDaoInternal(
 	fieldMap map[string]*gdb.TableField,
 ) {
 	path := gfile.Join(dirPathDao, "internal", fileName+".go")
-	modelContent := gstr.ReplaceByMap(getTplDaoInternalContent(""), g.MapStrStr{
-		tplVarImportPrefix:            importPrefix,
-		tplVarTableName:               in.TableName,
-		tplVarGroupName:               in.Group,
-		tplVarTableNameCamelCase:      tableNameCamelCase,
-		tplVarTableNameCamelLowerCase: tableNameCamelLowerCase,
-		tplVarColumnDefine:            gstr.Trim(generateColumnDefinitionForDao(fieldMap)),
-		tplVarColumnNames:             gstr.Trim(generateColumnNamesForDao(fieldMap)),
-	})
+	modelContent := gstr.ReplaceByMap(
+		getTemplateFromPathOrDefault(in.TplDaoInternalPath, consts.TemplateGenDaoInternalContent),
+		g.MapStrStr{
+			tplVarImportPrefix:            importPrefix,
+			tplVarTableName:               in.TableName,
+			tplVarGroupName:               in.Group,
+			tplVarTableNameCamelCase:      tableNameCamelCase,
+			tplVarTableNameCamelLowerCase: tableNameCamelLowerCase,
+			tplVarColumnDefine:            gstr.Trim(generateColumnDefinitionForDao(fieldMap)),
+			tplVarColumnNames:             gstr.Trim(generateColumnNamesForDao(fieldMap)),
+		})
 	modelContent = replaceDefaultVar(in, modelContent)
 	if err := gfile.PutContents(path, strings.TrimSpace(modelContent)); err != nil {
 		mlog.Fatalf("writing content to '%s' failed: %v", path, err)
@@ -105,20 +109,6 @@ func generateDaoInternal(
 	}
 }
 
-func getTplDaoIndexContent(tplDaoIndexPath string) string {
-	if tplDaoIndexPath != "" {
-		return gfile.GetContents(tplDaoIndexPath)
-	}
-	return consts.TemplateDaoDaoIndexContent
-}
-
-func getTplDaoInternalContent(tplDaoInternalPath string) string {
-	if tplDaoInternalPath != "" {
-		return gfile.GetContents(tplDaoInternalPath)
-	}
-	return consts.TemplateDaoDaoInternalContent
-}
-
 // generateColumnNamesForDao generates and returns the column names assignment content of column struct
 // for specified table.
 func generateColumnNamesForDao(fieldMap map[string]*gdb.TableField) string {

cmd/gf/internal/cmd/gendao/gendao_do.go

@@ -32,8 +32,9 @@ func generateDo(ctx context.Context, db gdb.DB, tableNames, newTableNames []stri
 		var (
 			newTableName     = newTableNames[i]
 			doFilePath       = gfile.Join(doDirPath, gstr.CaseSnake(newTableName)+".go")
-			structDefinition = generateStructDefinition(generateStructDefinitionInput{
+			structDefinition = generateStructDefinition(ctx, generateStructDefinitionInput{
 				CGenDaoInternalInput: in,
+				DB:                   db,
 				StructName:           gstr.CaseCamel(newTableName),
 				FieldMap:             fieldMap,
 				IsDo:                 true,
@@ -68,12 +69,14 @@ func generateDo(ctx context.Context, db gdb.DB, tableNames, newTableNames []stri
 }
 
 func generateDoContent(in CGenDaoInternalInput, tableName, tableNameCamelCase, structDefine string) string {
-	doContent := gstr.ReplaceByMap(consts.TemplateGenDaoDoContent, g.MapStrStr{
-		tplVarTableName:          tableName,
-		tplVarPackageImports:     getImportPartContent(structDefine, true),
-		tplVarTableNameCamelCase: tableNameCamelCase,
-		tplVarStructDefine:       structDefine,
-	})
+	doContent := gstr.ReplaceByMap(
+		getTemplateFromPathOrDefault(in.TplDaoDoPath, consts.TemplateGenDaoDoContent),
+		g.MapStrStr{
+			tplVarTableName:          tableName,
+			tplVarPackageImports:     getImportPartContent(structDefine, true),
+			tplVarTableNameCamelCase: tableNameCamelCase,
+			tplVarStructDefine:       structDefine,
+		})
 	doContent = replaceDefaultVar(in, doContent)
 	return doContent
 }

cmd/gf/internal/cmd/gendao/gendao_entity.go

@@ -28,8 +28,9 @@ func generateEntity(ctx context.Context, db gdb.DB, tableNames, newTableNames []
 				in,
 				newTableName,
 				gstr.CaseCamel(newTableName),
-				generateStructDefinition(generateStructDefinitionInput{
+				generateStructDefinition(ctx, generateStructDefinitionInput{
 					CGenDaoInternalInput: in,
+					DB:                   db,
 					StructName:           gstr.CaseCamel(newTableName),
 					FieldMap:             fieldMap,
 					IsDo:                 false,
@@ -47,12 +48,14 @@ func generateEntity(ctx context.Context, db gdb.DB, tableNames, newTableNames []
 }
 
 func generateEntityContent(in CGenDaoInternalInput, tableName, tableNameCamelCase, structDefine string) string {
-	entityContent := gstr.ReplaceByMap(consts.TemplateGenDaoEntityContent, g.MapStrStr{
-		tplVarTableName:          tableName,
-		tplVarPackageImports:     getImportPartContent(structDefine, false),
-		tplVarTableNameCamelCase: tableNameCamelCase,
-		tplVarStructDefine:       structDefine,
-	})
+	entityContent := gstr.ReplaceByMap(
+		getTemplateFromPathOrDefault(in.TplDaoEntitylPath, consts.TemplateGenDaoEntityContent),
+		g.MapStrStr{
+			tplVarTableName:          tableName,
+			tplVarPackageImports:     getImportPartContent(structDefine, false),
+			tplVarTableNameCamelCase: tableNameCamelCase,
+			tplVarStructDefine:       structDefine,
+		})
 	entityContent = replaceDefaultVar(in, entityContent)
 	return entityContent
 }

cmd/gf/internal/cmd/gendao/gendao_structure.go

@@ -2,8 +2,8 @@ package gendao
 
 import (
 	"bytes"
+	"context"
 	"fmt"
-	"strings"
 
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
@@ -14,18 +14,19 @@ import (
 
 type generateStructDefinitionInput struct {
 	CGenDaoInternalInput
+	DB         gdb.DB                     // Current DB.
 	StructName string                     // Struct name.
 	FieldMap   map[string]*gdb.TableField // Table field map.
 	IsDo       bool                       // Is generating DTO struct.
 }
 
-func generateStructDefinition(in generateStructDefinitionInput) string {
+func generateStructDefinition(ctx context.Context, in generateStructDefinitionInput) string {
 	buffer := bytes.NewBuffer(nil)
 	array := make([][]string, len(in.FieldMap))
 	names := sortFieldKeyForDao(in.FieldMap)
 	for index, name := range names {
 		field := in.FieldMap[name]
-		array[index] = generateStructFieldDefinition(field, in)
+		array[index] = generateStructFieldDefinition(ctx, field, in)
 	}
 	tw := tablewriter.NewWriter(buffer)
 	tw.SetBorder(false)
@@ -50,92 +51,39 @@ func generateStructDefinition(in generateStructDefinitionInput) string {
 }
 
 // generateStructFieldForModel generates and returns the attribute definition for specified field.
-func generateStructFieldDefinition(field *gdb.TableField, in generateStructDefinitionInput) []string {
+func generateStructFieldDefinition(
+	ctx context.Context, field *gdb.TableField, in generateStructDefinitionInput,
+) []string {
 	var (
+		err      error
 		typeName string
 		jsonTag  = getJsonTagFromCase(field.Name, in.JsonCase)
 	)
-	t, _ := gregex.ReplaceString(`\(.+\)`, "", field.Type)
-	t = gstr.Split(gstr.Trim(t), " ")[0]
-	t = gstr.ToLower(t)
-
-	switch t {
-	case "binary", "varbinary", "blob", "tinyblob", "mediumblob", "longblob":
-		typeName = "[]byte"
-
-	case "bit", "int", "int2", "tinyint", "small_int", "smallint", "medium_int", "mediumint", "serial":
-		if gstr.ContainsI(field.Type, "unsigned") {
-			typeName = "uint"
-		} else {
-			typeName = "int"
-		}
-
-	case "int4", "int8", "big_int", "bigint", "bigserial":
-		if gstr.ContainsI(field.Type, "unsigned") {
-			typeName = "uint64"
-		} else {
-			typeName = "int64"
-		}
-
-	// pgsql int32 slice.
-	case "_int2":
-		if gstr.ContainsI(field.Type, "unsigned") {
-			typeName = "[]uint"
-		} else {
-			typeName = "[]int"
-		}
-
-	// pgsql int64 slice.
-	case "_int4", "_int8":
-		if gstr.ContainsI(field.Type, "unsigned") {
-			typeName = "[]uint64"
-		} else {
-			typeName = "[]int64"
-		}
-
-	case "real":
-		typeName = "float32"
-
-	case "float", "double", "decimal", "smallmoney", "numeric":
-		typeName = "float64"
-
-	case "bool":
-		typeName = "bool"
-
-	case "datetime", "timestamp", "date", "time":
+	typeName, err = in.DB.CheckLocalTypeForField(ctx, field.Type, nil)
+	if err != nil {
+		panic(err)
+	}
+	switch typeName {
+	case gdb.LocalTypeDate, gdb.LocalTypeDatetime:
 		if in.StdTime {
 			typeName = "time.Time"
 		} else {
 			typeName = "*gtime.Time"
 		}
-	case "json", "jsonb":
+
+	case gdb.LocalTypeInt64Bytes:
+		typeName = "int64"
+
+	case gdb.LocalTypeUint64Bytes:
+		typeName = "uint64"
+
+	// Special type handle.
+	case gdb.LocalTypeJson, gdb.LocalTypeJsonb:
 		if in.GJsonSupport {
 			typeName = "*gjson.Json"
 		} else {
 			typeName = "string"
 		}
-	default:
-		// Automatically detect its data type.
-		switch {
-		case strings.Contains(t, "int"):
-			typeName = "int"
-		case strings.Contains(t, "text") || strings.Contains(t, "char"):
-			typeName = "string"
-		case strings.Contains(t, "float") || strings.Contains(t, "double"):
-			typeName = "float64"
-		case strings.Contains(t, "bool"):
-			typeName = "bool"
-		case strings.Contains(t, "binary") || strings.Contains(t, "blob"):
-			typeName = "[]byte"
-		case strings.Contains(t, "date") || strings.Contains(t, "time"):
-			if in.StdTime {
-				typeName = "time.Time"
-			} else {
-				typeName = "*gtime.Time"
-			}
-		default:
-			typeName = "string"
-		}
 	}
 
 	var (

cmd/gf/internal/consts/consts_gen_dao_template_dao.go

@@ -1,6 +1,6 @@
 package consts
 
-const TemplateDaoDaoIndexContent = `
+const TemplateGenDaoIndexContent = `
 // =================================================================================
 // This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
@@ -31,9 +31,9 @@ var (
 
 `
 
-const TemplateDaoDaoInternalContent = `
+const TemplateGenDaoInternalContent = `
 // ==========================================================================
-// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplDatetimeStr}
+// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplCreatedAtDatetimeStr}
 // ==========================================================================
 
 package internal

cmd/gf/internal/consts/consts_gen_dao_template_do.go

@@ -2,7 +2,7 @@ package consts
 
 const TemplateGenDaoDoContent = `
 // =================================================================================
-// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplDatetimeStr}
+// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplCreatedAtDatetimeStr}
 // =================================================================================
 
 package do

cmd/gf/internal/consts/consts_gen_dao_template_entity.go

@@ -2,7 +2,7 @@ package consts
 
 const TemplateGenDaoEntityContent = `
 // =================================================================================
-// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplDatetimeStr}
+// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplCreatedAtDatetimeStr}
 // =================================================================================
 
 package entity

cmd/gf/internal/consts/consts_gen_service_template.go

@@ -1,9 +1,10 @@
 package consts
 
 const TemplateGenServiceContent = `
-// ==========================================================================
+// ================================================================================
 // Code generated by GoFrame CLI tool. DO NOT EDIT.
-// ==========================================================================
+// You can delete these comments if you wish manually maintain this interface file.
+// ================================================================================
 
 package {PackageName}
 

contrib/drivers/clickhouse/clickhouse.go

@@ -13,6 +13,10 @@ import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
+	"net/url"
+	"strings"
+	"time"
+
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/database/gdb"
@@ -24,9 +28,6 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/google/uuid"
-	"net/url"
-	"strings"
-	"time"
 )
 
 // Driver is the driver for postgresql database.
@@ -148,7 +149,13 @@ func (d *Driver) TableFields(
 			if link, err = d.SlaveLink(useSchema); err != nil {
 				return nil
 			}
-			getColumnsSql := fmt.Sprintf("select name,position,default_expression,comment,type,is_in_partition_key,is_in_sorting_key,is_in_primary_key,is_in_sampling_key from `system`.columns c where database = '%s' and `table` = '%s'", d.GetConfig().Name, table)
+			var (
+				columns       = "name,position,default_expression,comment,type,is_in_partition_key,is_in_sorting_key,is_in_primary_key,is_in_sampling_key"
+				getColumnsSql = fmt.Sprintf(
+					"select %s from `system`.columns c where `table` = '%s'",
+					columns, table,
+				)
+			)
 			result, err = d.DoSelect(ctx, link, getColumnsSql)
 			if err != nil {
 				return nil

contrib/drivers/clickhouse/clickhouse_test.go

@@ -127,6 +127,16 @@ func clickhouseConfigDB() gdb.DB {
 	return connect
 }
 
+func clickhouseLink() gdb.DB {
+	connect, err := gdb.New(gdb.ConfigNode{
+		Link: "clickhouse://default@127.0.0.1:9000,127.0.0.1:9000/default?dial_timeout=200ms&max_execution_time=60",
+		Type: "clickhouse",
+	})
+	gtest.AssertNil(err)
+	gtest.AssertNE(connect, nil)
+	return connect
+}
+
 func createClickhouseTableVisits(connect gdb.DB) error {
 	_, err := connect.Exec(context.Background(), sqlVisitsDDL)
 	return err
@@ -204,7 +214,7 @@ func TestDriverClickhouse_TableFields_Use_Config(t *testing.T) {
 }
 
 func TestDriverClickhouse_TableFields_Use_Link(t *testing.T) {
-	connect := clickhouseConfigDB()
+	connect := clickhouseLink()
 	gtest.AssertNil(createClickhouseTableVisits(connect))
 	defer dropClickhouseTableVisits(connect)
 	field, err := connect.TableFields(context.Background(), "visits")

contrib/drivers/mysql/mysql_core_test.go

@@ -1190,24 +1190,26 @@ func Test_DB_TableField(t *testing.T) {
 		"field_varchar":   "abc",
 		"field_varbinary": "aaa",
 	}
-	res, err := db.Model(name).Data(data).Insert()
-	if err != nil {
-		gtest.Fatal(err)
-	}
+	gtest.C(t, func(t *gtest.T) {
+		res, err := db.Model(name).Data(data).Insert()
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	n, err := res.RowsAffected()
-	if err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(n, 1)
-	}
+		n, err := res.RowsAffected()
+		if err != nil {
+			t.Fatal(err)
+		} else {
+			t.Assert(n, 1)
+		}
 
-	result, err := db.Model(name).Fields("*").Where("field_int = ?", 2).All()
-	if err != nil {
-		gtest.Fatal(err)
-	}
+		result, err := db.Model(name).Fields("*").Where("field_int = ?", 2).All()
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Assert(result[0], data)
+	})
 
-	gtest.Assert(result[0], data)
 }
 
 func Test_DB_Prefix(t *testing.T) {

contrib/drivers/pgsql/pgsql.go

@@ -7,7 +7,6 @@
 // Note:
 // 1. It needs manually import: _ "github.com/lib/pq"
 // 2. It does not support Save/Replace features.
-// 3. It does not support LastInsertId.
 
 // Package pgsql implements gdb.Driver, which supports operations for PostgreSql.
 package pgsql
@@ -18,15 +17,15 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gogf/gf/v2/util/gconv"
-	_ "github.com/lib/pq"
-
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
+	_ "github.com/lib/pq"
 )
 
 // Driver is the driver for postgresql database.
@@ -39,6 +38,10 @@ var (
 	tableFieldsMap = gmap.New(true)
 )
 
+const (
+	internalPrimaryKeyInCtx gctx.StrKey = "primary_key"
+)
+
 func init() {
 	if err := gdb.Register(`pgsql`, New()); err != nil {
 		panic(err)
@@ -118,6 +121,43 @@ func (d *Driver) GetChars() (charLeft string, charRight string) {
 	return `"`, `"`
 }
 
+// CheckLocalTypeForValue checks and returns corresponding local golang type for given db type.
+func (d *Driver) CheckLocalTypeForValue(ctx context.Context, fieldType string, fieldValue interface{}) (string, error) {
+	var typeName string
+	match, _ := gregex.MatchString(`(.+?)\((.+)\)`, fieldType)
+	if len(match) == 3 {
+		typeName = gstr.Trim(match[1])
+	} else {
+		typeName = fieldType
+	}
+	typeName = strings.ToLower(typeName)
+	switch typeName {
+	case
+		// For pgsql, int2 = smallint.
+		"int2",
+		// For pgsql, int4 = integer
+		"int4":
+		return gdb.LocalTypeInt, nil
+
+	case
+		// For pgsql, int8 = bigint
+		"int8":
+		return gdb.LocalTypeInt64, nil
+
+	case
+		"_int2",
+		"_int4":
+		return gdb.LocalTypeIntSlice, nil
+
+	case
+		"_int8":
+		return gdb.LocalTypeInt64Slice, nil
+
+	default:
+		return d.Core.CheckLocalTypeForField(ctx, fieldType, fieldValue)
+	}
+}
+
 // ConvertValueForLocal converts value to local Golang type of value according field type name from database.
 // The parameter `fieldType` is in lower case, like:
 // `float(5,2)`, `unsigned double(5,2)`, `decimal(10,2)`, `char(45)`, `varchar(100)`, etc.
@@ -125,19 +165,17 @@ func (d *Driver) ConvertValueForLocal(ctx context.Context, fieldType string, fie
 	typeName, _ := gregex.ReplaceString(`\(.+\)`, "", fieldType)
 	typeName = strings.ToLower(typeName)
 	switch typeName {
+	// For pgsql, int2 = smallint and int4 = integer.
+	case "int2", "int4":
+		return gconv.Int(gconv.String(fieldValue)), nil
+
 	// For pgsql, int8 = bigint.
 	case "int8":
-		if gstr.ContainsI(fieldType, "unsigned") {
-			return gconv.Uint64(gconv.String(fieldValue)), nil
-		}
 		return gconv.Int64(gconv.String(fieldValue)), nil
 
 	// Int32 slice.
 	case
-		"_int2":
-		if gstr.ContainsI(fieldType, "unsigned") {
-			gconv.Uints(gconv.String(fieldValue))
-		}
+		"_int2", "_int4":
 		return gconv.Ints(
 			gstr.ReplaceByMap(gconv.String(fieldValue),
 				map[string]string{
@@ -149,10 +187,7 @@ func (d *Driver) ConvertValueForLocal(ctx context.Context, fieldType string, fie
 
 	// Int64 slice.
 	case
-		"_int4", "_int8":
-		if gstr.ContainsI(fieldType, "unsigned") {
-			gconv.Uint64(gconv.String(fieldValue))
-		}
+		"_int8":
 		return gconv.Int64s(
 			gstr.ReplaceByMap(gconv.String(fieldValue),
 				map[string]string{
@@ -218,6 +253,7 @@ ORDER BY
 	c.relname`,
 		querySchema,
 	)
+	query, _ = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(query))
 	result, err = d.DoSelect(ctx, link, query)
 	if err != nil {
 		return
@@ -314,7 +350,111 @@ func (d *Driver) DoInsert(ctx context.Context, link gdb.Link, table string, list
 			`Replace operation is not supported by pgsql driver`,
 		)
 
-	default:
-		return d.Core.DoInsert(ctx, link, table, list, option)
+	case gdb.InsertOptionIgnore:
+		return nil, gerror.NewCode(
+			gcode.CodeNotSupported,
+			`Insert ignore operation is not supported by pgsql driver`,
+		)
+
+	case gdb.InsertOptionDefault:
+		tableFields, err := d.TableFields(ctx, table)
+		if err == nil {
+			for _, field := range tableFields {
+				if field.Key == "pri" {
+					pkField := *field
+					ctx = context.WithValue(ctx, internalPrimaryKeyInCtx, pkField)
+				}
+			}
+		}
 	}
+	return d.Core.DoInsert(ctx, link, table, list, option)
+}
+
+func (d *Driver) DoExec(ctx context.Context, link gdb.Link, sql string, args ...interface{}) (result sql.Result, err error) {
+	var (
+		isUseCoreDoExec bool   = false // Check whether the default method needs to be used
+		primaryKey      string = ""
+		pkField         gdb.TableField
+	)
+
+	// Transaction checks.
+	if link == nil {
+		if tx := gdb.TXFromCtx(ctx, d.GetGroup()); tx != nil {
+			isUseCoreDoExec = true
+		}
+	} else if link.IsTransaction() {
+		isUseCoreDoExec = true
+	}
+
+	if value := ctx.Value(internalPrimaryKeyInCtx); value != nil {
+		var ok bool
+		pkField, ok = value.(gdb.TableField)
+		if !ok {
+			isUseCoreDoExec = true
+		}
+	} else {
+		isUseCoreDoExec = true
+	}
+
+	// check if it is a insert operation.
+	if !isUseCoreDoExec && pkField.Name != "" && strings.Contains(sql, "INSERT INTO") {
+		primaryKey = pkField.Name
+		sql += " RETURNING " + primaryKey
+	} else {
+		// use default DoExec
+		return d.Core.DoExec(ctx, link, sql, args...)
+	}
+
+	// Only the insert operation with primary key can execute the following code
+
+	if d.GetConfig().ExecTimeout > 0 {
+		var cancelFunc context.CancelFunc
+		ctx, cancelFunc = context.WithTimeout(ctx, d.GetConfig().ExecTimeout)
+		defer cancelFunc()
+	}
+
+	// Sql filtering.
+	// TODO: internal function formatSql
+	// sql, args = formatSql(sql, args)
+	sql, args, err = d.DoFilter(ctx, link, sql, args)
+	if err != nil {
+		return nil, err
+	}
+
+	// Link execution.
+	var out gdb.DoCommitOutput
+	out, err = d.DoCommit(ctx, gdb.DoCommitInput{
+		Link:          link,
+		Sql:           sql,
+		Args:          args,
+		Stmt:          nil,
+		Type:          gdb.SqlTypeQueryContext,
+		IsTransaction: link.IsTransaction(),
+	})
+
+	if err != nil {
+		return nil, err
+	}
+	affected := len(out.Records)
+	if affected > 0 {
+		if !strings.Contains(pkField.Type, "int") {
+			return Result{
+				affected:     int64(affected),
+				lastInsertId: 0,
+				lastInsertIdError: gerror.NewCodef(
+					gcode.CodeNotSupported,
+					"LastInsertId is not supported by primary key type: %s", pkField.Type),
+			}, nil
+		}
+
+		if out.Records[affected-1][primaryKey] != nil {
+			lastInsertId := out.Records[affected-1][primaryKey].Int()
+			return Result{
+				affected:     int64(affected),
+				lastInsertId: int64(lastInsertId),
+			}, nil
+		}
+	}
+
+	return Result{}, nil
 }

contrib/drivers/pgsql/pgsql_result.go

@@ -0,0 +1,18 @@
+package pgsql
+
+import "database/sql"
+
+type Result struct {
+	sql.Result
+	affected          int64
+	lastInsertId      int64
+	lastInsertIdError error
+}
+
+func (pgr Result) RowsAffected() (int64, error) {
+	return pgr.affected, nil
+}
+
+func (pgr Result) LastInsertId() (int64, error) {
+	return pgr.lastInsertId, pgr.lastInsertIdError
+}

contrib/drivers/pgsql/pgsql_test.go

@@ -15,6 +15,36 @@ import (
 	"github.com/gogf/gf/v2/test/gtest"
 )
 
+func Test_LastInsertId(t *testing.T) {
+
+	// err not nil
+	gtest.C(t, func(t *gtest.T) {
+		_, err := db.Model("notexist").Insert(g.List{
+			{"name": "user1"},
+			{"name": "user2"},
+			{"name": "user3"},
+		})
+		t.AssertNE(err, nil)
+	})
+
+	gtest.C(t, func(t *gtest.T) {
+		tableName := createTable()
+		defer dropTable(tableName)
+		res, err := db.Model(tableName).Insert(g.List{
+			{"passport": "user1", "password": "pwd", "nickname": "nickname", "create_time": CreateTime},
+			{"passport": "user2", "password": "pwd", "nickname": "nickname", "create_time": CreateTime},
+			{"passport": "user3", "password": "pwd", "nickname": "nickname", "create_time": CreateTime},
+		})
+		t.Assert(err, nil)
+		lastInsertId, err := res.LastInsertId()
+		t.Assert(err, nil)
+		t.Assert(lastInsertId, int64(3))
+		rowsAffected, err := res.RowsAffected()
+		t.Assert(err, nil)
+		t.Assert(rowsAffected, int64(3))
+	})
+}
+
 func Test_Driver_DoFilter(t *testing.T) {
 	var (
 		ctx    = gctx.New()

contrib/drivers/sqlite/sqlite.go

@@ -36,8 +36,7 @@ type Driver struct {
 var (
 	// tableFieldsMap caches the table information retrieved from database.
 	tableFieldsMap = gmap.New(true)
-	// Error
-	ErrorSave = gerror.NewCode(gcode.CodeNotSupported, `Save operation is not supported by sqlite driver`)
+	ErrorSave      = gerror.NewCode(gcode.CodeNotSupported, `Save operation is not supported by sqlite driver`)
 )
 
 func init() {

database/gdb/gdb.go

@@ -172,6 +172,7 @@ type DB interface {
 	TableFields(ctx context.Context, table string, schema ...string) (map[string]*TableField, error)         // See Core.TableFields.
 	ConvertDataForRecord(ctx context.Context, data interface{}) (map[string]interface{}, error)              // See Core.ConvertDataForRecord
 	ConvertValueForLocal(ctx context.Context, fieldType string, fieldValue interface{}) (interface{}, error) // See Core.ConvertValueForLocal
+	CheckLocalTypeForField(ctx context.Context, fieldType string, fieldValue interface{}) (string, error)    // See Core.CheckLocalTypeForField
 	FilteredLink() string                                                                                    // FilteredLink is used for filtering sensitive information in `Link` configuration before output it to tracing server.
 }
 
@@ -312,6 +313,27 @@ const (
 	SqlTypeStmtQueryRowContext = "DB.Statement.QueryRowContext"
 )
 
+const (
+	LocalTypeString      = "string"
+	LocalTypeDate        = "date"
+	LocalTypeDatetime    = "datetime"
+	LocalTypeInt         = "int"
+	LocalTypeUint        = "uint"
+	LocalTypeInt64       = "int64"
+	LocalTypeUint64      = "uint64"
+	LocalTypeIntSlice    = "[]int"
+	LocalTypeInt64Slice  = "[]int64"
+	LocalTypeUint64Slice = "[]uint64"
+	LocalTypeInt64Bytes  = "int64-bytes"
+	LocalTypeUint64Bytes = "uint64-bytes"
+	LocalTypeFloat32     = "float32"
+	LocalTypeFloat64     = "float64"
+	LocalTypeBytes       = "[]byte"
+	LocalTypeBool        = "bool"
+	LocalTypeJson        = "json"
+	LocalTypeJsonb       = "jsonb"
+)
+
 var (
 	// instances is the management map for instances.
 	instances = gmap.NewStrAnyMap(true)
@@ -374,16 +396,14 @@ func NewByGroup(group ...string) (db DB, err error) {
 		var node *ConfigNode
 		if node, err = getConfigNodeByGroup(groupName, true); err == nil {
 			return doNewByNode(*node, groupName)
-		} else {
-			return nil, err
 		}
-	} else {
-		return nil, gerror.NewCodef(
-			gcode.CodeInvalidConfiguration,
-			`database configuration node "%s" is not found, did you misspell group name "%s" or miss the database configuration?`,
-			groupName, groupName,
-		)
+		return nil, err
 	}
+	return nil, gerror.NewCodef(
+		gcode.CodeInvalidConfiguration,
+		`database configuration node "%s" is not found, did you misspell group name "%s" or miss the database configuration?`,
+		groupName, groupName,
+	)
 }
 
 // doNewByNode creates and returns an ORM object with given configuration node and group name.
@@ -459,13 +479,12 @@ func getConfigNodeByGroup(group string, master bool) (*ConfigNode, error) {
 		} else {
 			return getConfigNodeByWeight(slaveList), nil
 		}
-	} else {
-		return nil, gerror.NewCodef(
-			gcode.CodeInvalidConfiguration,
-			"empty database configuration for item name '%s'",
-			group,
-		)
 	}
+	return nil, gerror.NewCodef(
+		gcode.CodeInvalidConfiguration,
+		"empty database configuration for item name '%s'",
+		group,
+	)
 }
 
 // getConfigNodeByWeight calculates the configuration weights and randomly returns a node.
@@ -498,12 +517,13 @@ func getConfigNodeByWeight(cg ConfigGroup) *ConfigNode {
 	)
 	for i := 0; i < len(cg); i++ {
 		max = min + cg[i].Weight*100
-		// fmt.Printf("r: %d, min: %d, max: %d\n", r, min, max)
 		if random >= min && random < max {
-			return &cg[i]
-		} else {
-			min = max
+			// Return a copy of the ConfigNode.
+			node := ConfigNode{}
+			node = cg[i]
+			return &node
 		}
+		min = max
 	}
 	return nil
 }
@@ -518,6 +538,8 @@ func (c *Core) getSqlDb(master bool, schema ...string) (sqlDb *sql.DB, err error
 	)
 	// Load balance.
 	if c.group != "" {
+		configs.RLock()
+		defer configs.RUnlock()
 		node, err = getConfigNodeByGroup(c.group, master)
 		if err != nil {
 			return nil, err

database/gdb/gdb_core_structure.go

@@ -121,16 +121,19 @@ func (c *Core) ConvertDataForRecordValue(ctx context.Context, value interface{})
 	return convertedValue, nil
 }
 
-// ConvertValueForLocal converts value to local Golang type of value according field type name from database.
-// The parameter `fieldType` is in lower case, like:
-// `float(5,2)`, `unsigned double(5,2)`, `decimal(10,2)`, `char(45)`, `varchar(100)`, etc.
-func (c *Core) ConvertValueForLocal(ctx context.Context, fieldType string, fieldValue interface{}) (interface{}, error) {
-	// If there's no type retrieved, it returns the `fieldValue` directly
-	// to use its original data type, as `fieldValue` is type of interface{}.
-	if fieldType == "" {
-		return fieldValue, nil
+// CheckLocalTypeForField checks and returns corresponding type for given db type.
+func (c *Core) CheckLocalTypeForField(ctx context.Context, fieldType string, fieldValue interface{}) (string, error) {
+	var (
+		typeName    string
+		typePattern string
+	)
+	match, _ := gregex.MatchString(`(.+?)\((.+)\)`, fieldType)
+	if len(match) == 3 {
+		typeName = gstr.Trim(match[1])
+		typePattern = gstr.Trim(match[2])
+	} else {
+		typeName = gstr.Split(fieldType, " ")[0]
 	}
-	typeName, _ := gregex.ReplaceString(`\(.+\)`, "", fieldType)
 	typeName = strings.ToLower(typeName)
 	switch typeName {
 	case
@@ -140,7 +143,7 @@ func (c *Core) ConvertValueForLocal(ctx context.Context, fieldType string, field
 		"tinyblob",
 		"mediumblob",
 		"longblob":
-		return gconv.Bytes(fieldValue), nil
+		return LocalTypeBytes, nil
 
 	case
 		"int",
@@ -151,21 +154,22 @@ func (c *Core) ConvertValueForLocal(ctx context.Context, fieldType string, field
 		"mediumint",
 		"serial":
 		if gstr.ContainsI(fieldType, "unsigned") {
-			return gconv.Uint(gconv.String(fieldValue)), nil
+			return LocalTypeUint, nil
 		}
-		return gconv.Int(gconv.String(fieldValue)), nil
+		return LocalTypeInt, nil
 
 	case
 		"big_int",
 		"bigint",
 		"bigserial":
 		if gstr.ContainsI(fieldType, "unsigned") {
-			return gconv.Uint64(gconv.String(fieldValue)), nil
+			return LocalTypeUint64, nil
 		}
-		return gconv.Int64(gconv.String(fieldValue)), nil
+		return LocalTypeInt64, nil
 
-	case "real":
-		return gconv.Float32(gconv.String(fieldValue)), nil
+	case
+		"real":
+		return LocalTypeFloat32, nil
 
 	case
 		"float",
@@ -174,9 +178,124 @@ func (c *Core) ConvertValueForLocal(ctx context.Context, fieldType string, field
 		"money",
 		"numeric",
 		"smallmoney":
+		return LocalTypeFloat64, nil
+
+	case
+		"bit":
+		// It is suggested using bit(1) as boolean.
+		if typePattern == "1" {
+			return LocalTypeBool, nil
+		}
+		s := gconv.String(fieldValue)
+		// mssql is true|false string.
+		if strings.EqualFold(s, "true") || strings.EqualFold(s, "false") {
+			return LocalTypeBool, nil
+		}
+		if gstr.ContainsI(fieldType, "unsigned") {
+			return LocalTypeUint64Bytes, nil
+		}
+		return LocalTypeInt64Bytes, nil
+
+	case
+		"bool":
+		return LocalTypeBool, nil
+
+	case
+		"date":
+		return LocalTypeDate, nil
+
+	case
+		"datetime",
+		"timestamp",
+		"timestamptz":
+		return LocalTypeDatetime, nil
+
+	case
+		"json":
+		return LocalTypeJson, nil
+
+	case
+		"jsonb":
+		return LocalTypeJsonb, nil
+
+	default:
+		// Auto-detect field type, using key match.
+		switch {
+		case strings.Contains(typeName, "text") || strings.Contains(typeName, "char") || strings.Contains(typeName, "character"):
+			return LocalTypeString, nil
+
+		case strings.Contains(typeName, "float") || strings.Contains(typeName, "double") || strings.Contains(typeName, "numeric"):
+			return LocalTypeFloat64, nil
+
+		case strings.Contains(typeName, "bool"):
+			return LocalTypeBool, nil
+
+		case strings.Contains(typeName, "binary") || strings.Contains(typeName, "blob"):
+			return LocalTypeBytes, nil
+
+		case strings.Contains(typeName, "int"):
+			if gstr.ContainsI(fieldType, "unsigned") {
+				return LocalTypeUint, nil
+			}
+			return LocalTypeInt, nil
+
+		case strings.Contains(typeName, "time"):
+			return LocalTypeDatetime, nil
+
+		case strings.Contains(typeName, "date"):
+			return LocalTypeDatetime, nil
+
+		default:
+			return LocalTypeString, nil
+		}
+	}
+}
+
+// ConvertValueForLocal converts value to local Golang type of value according field type name from database.
+// The parameter `fieldType` is in lower case, like:
+// `float(5,2)`, `unsigned double(5,2)`, `decimal(10,2)`, `char(45)`, `varchar(100)`, etc.
+func (c *Core) ConvertValueForLocal(ctx context.Context, fieldType string, fieldValue interface{}) (interface{}, error) {
+	// If there's no type retrieved, it returns the `fieldValue` directly
+	// to use its original data type, as `fieldValue` is type of interface{}.
+	if fieldType == "" {
+		return fieldValue, nil
+	}
+	typeName, err := c.db.CheckLocalTypeForField(ctx, fieldType, fieldValue)
+	if err != nil {
+		return nil, err
+	}
+	switch typeName {
+	case LocalTypeBytes:
+		if strings.Contains(typeName, "binary") || strings.Contains(typeName, "blob") {
+			return fieldValue, nil
+		}
+		return gconv.Bytes(fieldValue), nil
+
+	case LocalTypeInt:
+		return gconv.Int(gconv.String(fieldValue)), nil
+
+	case LocalTypeUint:
+		return gconv.Uint(gconv.String(fieldValue)), nil
+
+	case LocalTypeInt64:
+		return gconv.Int64(gconv.String(fieldValue)), nil
+
+	case LocalTypeUint64:
+		return gconv.Uint64(gconv.String(fieldValue)), nil
+
+	case LocalTypeInt64Bytes:
+		return gbinary.BeDecodeToInt64(gconv.Bytes(fieldValue)), nil
+
+	case LocalTypeUint64Bytes:
+		return gbinary.BeDecodeToUint64(gconv.Bytes(fieldValue)), nil
+
+	case LocalTypeFloat32:
+		return gconv.Float32(gconv.String(fieldValue)), nil
+
+	case LocalTypeFloat64:
 		return gconv.Float64(gconv.String(fieldValue)), nil
 
-	case "bit":
+	case LocalTypeBool:
 		s := gconv.String(fieldValue)
 		// mssql is true|false string.
 		if strings.EqualFold(s, "true") {
@@ -185,12 +304,9 @@ func (c *Core) ConvertValueForLocal(ctx context.Context, fieldType string, field
 		if strings.EqualFold(s, "false") {
 			return 0, nil
 		}
-		return gbinary.BeDecodeToInt64(gconv.Bytes(fieldValue)), nil
-
-	case "bool":
 		return gconv.Bool(fieldValue), nil
 
-	case "date":
+	case LocalTypeDate:
 		// Date without time.
 		if t, ok := fieldValue.(time.Time); ok {
 			return gtime.NewFromTime(t).Format("Y-m-d"), nil
@@ -198,10 +314,7 @@ func (c *Core) ConvertValueForLocal(ctx context.Context, fieldType string, field
 		t, _ := gtime.StrToTime(gconv.String(fieldValue))
 		return t.Format("Y-m-d"), nil
 
-	case
-		"datetime",
-		"timestamp",
-		"timestamptz":
+	case LocalTypeDatetime:
 		if t, ok := fieldValue.(time.Time); ok {
 			return gtime.NewFromTime(t), nil
 		}
@@ -209,42 +322,7 @@ func (c *Core) ConvertValueForLocal(ctx context.Context, fieldType string, field
 		return t, nil
 
 	default:
-		// Auto-detect field type, using key match.
-		switch {
-		case strings.Contains(typeName, "text") || strings.Contains(typeName, "char") || strings.Contains(typeName, "character"):
-			return gconv.String(fieldValue), nil
-
-		case strings.Contains(typeName, "float") || strings.Contains(typeName, "double") || strings.Contains(typeName, "numeric"):
-			return gconv.Float64(gconv.String(fieldValue)), nil
-
-		case strings.Contains(typeName, "bool"):
-			return gconv.Bool(gconv.String(fieldValue)), nil
-
-		case strings.Contains(typeName, "binary") || strings.Contains(typeName, "blob"):
-			return fieldValue, nil
-
-		case strings.Contains(typeName, "int"):
-			return gconv.Int(gconv.String(fieldValue)), nil
-
-		case strings.Contains(typeName, "time"):
-			s := gconv.String(fieldValue)
-			t, err := gtime.StrToTime(s)
-			if err != nil {
-				return s, nil
-			}
-			return t, nil
-
-		case strings.Contains(typeName, "date"):
-			s := gconv.String(fieldValue)
-			t, err := gtime.StrToTime(s)
-			if err != nil {
-				return s, nil
-			}
-			return t, nil
-
-		default:
-			return gconv.String(fieldValue), nil
-		}
+		return gconv.String(fieldValue), nil
 	}
 }
 

database/gdb/gdb_core_utility.go

@@ -124,7 +124,7 @@ func (c *Core) QuoteString(s string) string {
 // if true it does nothing to the table name, or else adds the prefix to the table name.
 func (c *Core) QuotePrefixTableName(table string) string {
 	charLeft, charRight := c.db.GetChars()
-	return doHandleTableName(table, c.db.GetPrefix(), charLeft, charRight)
+	return doQuoteTableName(table, c.db.GetPrefix(), charLeft, charRight)
 }
 
 // GetChars returns the security char for current database.

database/gdb/gdb_func.go

@@ -42,11 +42,6 @@ type iInterfaces interface {
 	Interfaces() []interface{}
 }
 
-// iMapStrAny is the interface support for converting struct parameter to map.
-type iMapStrAny interface {
-	MapStrAny() map[string]interface{}
-}
-
 // iTableName is the interface for retrieving table name fro struct.
 type iTableName interface {
 	TableName() string
@@ -187,7 +182,7 @@ func DataToMapDeep(value interface{}) map[string]interface{} {
 //
 // Note that, this will automatically check the table prefix whether already added, if true it does
 // nothing to the table name, or else adds the prefix to the table name and returns new table name with prefix.
-func doHandleTableName(table, prefix, charLeft, charRight string) string {
+func doQuoteTableName(table, prefix, charLeft, charRight string) string {
 	var (
 		index  = 0
 		chars  = charLeft + charRight

database/gdb/gdb_z_mysql_internal_test.go

@@ -72,7 +72,7 @@ func Test_Func_addTablePrefix(t *testing.T) {
 			"UserCenter..user as u, user_detail as ut": "`UserCenter`..`user` as u,`user_detail` as ut",
 		}
 		for k, v := range array {
-			t.Assert(doHandleTableName(k, prefix, "`", "`"), v)
+			t.Assert(doQuoteTableName(k, prefix, "`", "`"), v)
 		}
 	})
 	gtest.C(t, func(t *gtest.T) {
@@ -91,7 +91,7 @@ func Test_Func_addTablePrefix(t *testing.T) {
 			"UserCenter..user as u, user_detail as ut": "`UserCenter`..`gf_user` as u,`gf_user_detail` as ut",
 		}
 		for k, v := range array {
-			t.Assert(doHandleTableName(k, prefix, "`", "`"), v)
+			t.Assert(doQuoteTableName(k, prefix, "`", "`"), v)
 		}
 	})
 }

debug/gdebug/gdebug_caller.go

@@ -121,7 +121,11 @@ func filterFileByFilters(file string, filters []string) (filtered bool) {
 	}
 	// GOROOT filter.
 	if goRootForFilter != "" && len(file) >= len(goRootForFilter) && file[0:len(goRootForFilter)] == goRootForFilter {
-		return true
+		// https://github.com/gogf/gf/issues/2047
+		fileSeparator := file[len(goRootForFilter)]
+		if fileSeparator == filepath.Separator || fileSeparator == '\\' || fileSeparator == '/' {
+			return true
+		}
 	}
 	return false
 }

encoding/gjson/gjson_api_new_load.go

@@ -210,7 +210,8 @@ func LoadContentType(dataType string, data interface{}, safe ...bool) (*Json, er
 		content = content[3:]
 	}
 	options := Options{
-		Type: dataType,
+		Type:      dataType,
+		StrNumber: true,
 	}
 	if len(safe) > 0 && safe[0] {
 		options.Safe = true

encoding/gjson/gjson_z_unit_feature_new_test.go

@@ -110,3 +110,13 @@ func Test_NewWithOptions(t *testing.T) {
 		t.Assert(array, []uint64{9223372036854775807, 9223372036854775806})
 	})
 }
+
+func Test_LoadContentType(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		data := []byte("value = 79937385836643329")
+		j, err := gjson.LoadContentType("toml", data)
+		t.AssertNil(err)
+		value := j.Get("value").Int64()
+		t.Assert(value, 79937385836643329)
+	})
+}

errors/gerror/gerror.go

@@ -4,316 +4,55 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gerror provides simple functions to manipulate errors.
+// Package gerror provides rich functionalities to manipulate errors.
 //
-// Very note that, this package is quite a basic package, which SHOULD NOT import extra packages
+// For maintainers, please very note that,
+// this package is quite a basic package, which SHOULD NOT import extra packages
 // except standard packages and internal packages, to avoid cycle imports.
 package gerror
 
 import (
-	"fmt"
-	"strings"
-
 	"github.com/gogf/gf/v2/errors/gcode"
 )
 
-// New creates and returns an error which is formatted from given text.
-func New(text string) error {
-	return &Error{
-		stack: callers(),
-		text:  text,
-		code:  gcode.CodeNil,
-	}
+// IIs is the interface for Is feature.
+type IIs interface {
+	Error() string
+	Is(target error) bool
 }
 
-// Newf returns an error that formats as the given format and args.
-func Newf(format string, args ...interface{}) error {
-	return &Error{
-		stack: callers(),
-		text:  fmt.Sprintf(format, args...),
-		code:  gcode.CodeNil,
-	}
+// IEqual is the interface for Equal feature.
+type IEqual interface {
+	Error() string
+	Equal(target error) bool
 }
 
-// NewSkip creates and returns an error which is formatted from given text.
-// The parameter `skip` specifies the stack callers skipped amount.
-func NewSkip(skip int, text string) error {
-	return &Error{
-		stack: callers(skip),
-		text:  text,
-		code:  gcode.CodeNil,
-	}
+// ICode is the interface for Code feature.
+type ICode interface {
+	Error() string
+	Code() gcode.Code
 }
 
-// NewSkipf returns an error that formats as the given format and args.
-// The parameter `skip` specifies the stack callers skipped amount.
-func NewSkipf(skip int, format string, args ...interface{}) error {
-	return &Error{
-		stack: callers(skip),
-		text:  fmt.Sprintf(format, args...),
-		code:  gcode.CodeNil,
-	}
+// IStack is the interface for Stack feature.
+type IStack interface {
+	Error() string
+	Stack() string
 }
 
-// Wrap wraps error with text. It returns nil if given err is nil.
-// Note that it does not lose the error code of wrapped error, as it inherits the error code from it.
-func Wrap(err error, text string) error {
-	if err == nil {
-		return nil
-	}
-	return &Error{
-		error: err,
-		stack: callers(),
-		text:  text,
-		code:  Code(err),
-	}
+// ICause is the interface for Cause feature.
+type ICause interface {
+	Error() string
+	Cause() error
 }
 
-// Wrapf returns an error annotating err with a stack trace at the point Wrapf is called, and the format specifier.
-// It returns nil if given `err` is nil.
-// Note that it does not lose the error code of wrapped error, as it inherits the error code from it.
-func Wrapf(err error, format string, args ...interface{}) error {
-	if err == nil {
-		return nil
-	}
-	return &Error{
-		error: err,
-		stack: callers(),
-		text:  fmt.Sprintf(format, args...),
-		code:  Code(err),
-	}
+// ICurrent is the interface for Current feature.
+type ICurrent interface {
+	Error() string
+	Current() error
 }
 
-// WrapSkip wraps error with text. It returns nil if given err is nil.
-// The parameter `skip` specifies the stack callers skipped amount.
-// Note that it does not lose the error code of wrapped error, as it inherits the error code from it.
-func WrapSkip(skip int, err error, text string) error {
-	if err == nil {
-		return nil
-	}
-	return &Error{
-		error: err,
-		stack: callers(skip),
-		text:  text,
-		code:  Code(err),
-	}
-}
-
-// WrapSkipf wraps error with text that is formatted with given format and args. It returns nil if given err is nil.
-// The parameter `skip` specifies the stack callers skipped amount.
-// Note that it does not lose the error code of wrapped error, as it inherits the error code from it.
-func WrapSkipf(skip int, err error, format string, args ...interface{}) error {
-	if err == nil {
-		return nil
-	}
-	return &Error{
-		error: err,
-		stack: callers(skip),
-		text:  fmt.Sprintf(format, args...),
-		code:  Code(err),
-	}
-}
-
-// NewCode creates and returns an error that has error code and given text.
-func NewCode(code gcode.Code, text ...string) error {
-	return &Error{
-		stack: callers(),
-		text:  strings.Join(text, ", "),
-		code:  code,
-	}
-}
-
-// NewCodef returns an error that has error code and formats as the given format and args.
-func NewCodef(code gcode.Code, format string, args ...interface{}) error {
-	return &Error{
-		stack: callers(),
-		text:  fmt.Sprintf(format, args...),
-		code:  code,
-	}
-}
-
-// NewCodeSkip creates and returns an error which has error code and is formatted from given text.
-// The parameter `skip` specifies the stack callers skipped amount.
-func NewCodeSkip(code gcode.Code, skip int, text ...string) error {
-	return &Error{
-		stack: callers(skip),
-		text:  strings.Join(text, ", "),
-		code:  code,
-	}
-}
-
-// NewCodeSkipf returns an error that has error code and formats as the given format and args.
-// The parameter `skip` specifies the stack callers skipped amount.
-func NewCodeSkipf(code gcode.Code, skip int, format string, args ...interface{}) error {
-	return &Error{
-		stack: callers(skip),
-		text:  fmt.Sprintf(format, args...),
-		code:  code,
-	}
-}
-
-// WrapCode wraps error with code and text.
-// It returns nil if given err is nil.
-func WrapCode(code gcode.Code, err error, text ...string) error {
-	if err == nil {
-		return nil
-	}
-	return &Error{
-		error: err,
-		stack: callers(),
-		text:  strings.Join(text, ", "),
-		code:  code,
-	}
-}
-
-// WrapCodef wraps error with code and format specifier.
-// It returns nil if given `err` is nil.
-func WrapCodef(code gcode.Code, err error, format string, args ...interface{}) error {
-	if err == nil {
-		return nil
-	}
-	return &Error{
-		error: err,
-		stack: callers(),
-		text:  fmt.Sprintf(format, args...),
-		code:  code,
-	}
-}
-
-// WrapCodeSkip wraps error with code and text.
-// It returns nil if given err is nil.
-// The parameter `skip` specifies the stack callers skipped amount.
-func WrapCodeSkip(code gcode.Code, skip int, err error, text ...string) error {
-	if err == nil {
-		return nil
-	}
-	return &Error{
-		error: err,
-		stack: callers(skip),
-		text:  strings.Join(text, ", "),
-		code:  code,
-	}
-}
-
-// WrapCodeSkipf wraps error with code and text that is formatted with given format and args.
-// It returns nil if given err is nil.
-// The parameter `skip` specifies the stack callers skipped amount.
-func WrapCodeSkipf(code gcode.Code, skip int, err error, format string, args ...interface{}) error {
-	if err == nil {
-		return nil
-	}
-	return &Error{
-		error: err,
-		stack: callers(skip),
-		text:  fmt.Sprintf(format, args...),
-		code:  code,
-	}
-}
-
-// Code returns the error code of current error.
-// It returns CodeNil if it has no error code neither it does not implement interface Code.
-func Code(err error) gcode.Code {
-	if err == nil {
-		return gcode.CodeNil
-	}
-	if e, ok := err.(iCode); ok {
-		return e.Code()
-	}
-	if e, ok := err.(iNext); ok {
-		return Code(e.Next())
-	}
-	if e, ok := err.(iUnwrap); ok {
-		return Code(e.Unwrap())
-	}
-	return gcode.CodeNil
-}
-
-// Cause returns the root cause error of `err`.
-func Cause(err error) error {
-	if err == nil {
-		return nil
-	}
-	if e, ok := err.(iCause); ok {
-		return e.Cause()
-	}
-	if e, ok := err.(iNext); ok {
-		return Cause(e.Next())
-	}
-	if e, ok := err.(iUnwrap); ok {
-		return Cause(e.Unwrap())
-	}
-	return err
-}
-
-// Stack returns the stack callers as string.
-// It returns the error string directly if the `err` does not support stacks.
-func Stack(err error) string {
-	if err == nil {
-		return ""
-	}
-	if e, ok := err.(iStack); ok {
-		return e.Stack()
-	}
-	return err.Error()
-}
-
-// Current creates and returns the current level error.
-// It returns nil if current level error is nil.
-func Current(err error) error {
-	if err == nil {
-		return nil
-	}
-	if e, ok := err.(iCurrent); ok {
-		return e.Current()
-	}
-	return err
-}
-
-// Next returns the next level error.
-// It returns nil if current level error or the next level error is nil.
-func Next(err error) error {
-	if err == nil {
-		return nil
-	}
-	if e, ok := err.(iNext); ok {
-		return e.Next()
-	}
-	return nil
-}
-
-// Unwrap is alias of function `Next`.
-// It is just for implements for stdlib errors.Unwrap from Go version 1.17.
-func Unwrap(err error) error {
-	return Next(err)
-}
-
-// HasStack checks and returns whether `err` implemented interface `iStack`.
-func HasStack(err error) bool {
-	_, ok := err.(iStack)
-	return ok
-}
-
-// Equal reports whether current error `err` equals to error `target`.
-// Please note that, in default comparison for `Error`,
-// the errors are considered the same if both the `code` and `text` of them are the same.
-func Equal(err, target error) bool {
-	if err == target {
-		return true
-	}
-	if e, ok := err.(iEqual); ok {
-		return e.Equal(target)
-	}
-	if e, ok := target.(iEqual); ok {
-		return e.Equal(err)
-	}
-	return false
-}
-
-// Is reports whether current error `err` has error `target` in its chaining errors.
-// It is just for implements for stdlib errors.Unwrap from Go version 1.17.
-func Is(err, target error) bool {
-	if e, ok := err.(iIs); ok {
-		return e.Is(target)
-	}
-	return false
+// IUnwrap is the interface for Unwrap feature.
+type IUnwrap interface {
+	Error() string
+	Unwrap() error
 }

errors/gerror/gerror_api.go

@@ -0,0 +1,110 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gerror
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+)
+
+// New creates and returns an error which is formatted from given text.
+func New(text string) error {
+	return &Error{
+		stack: callers(),
+		text:  text,
+		code:  gcode.CodeNil,
+	}
+}
+
+// Newf returns an error that formats as the given format and args.
+func Newf(format string, args ...interface{}) error {
+	return &Error{
+		stack: callers(),
+		text:  fmt.Sprintf(format, args...),
+		code:  gcode.CodeNil,
+	}
+}
+
+// NewSkip creates and returns an error which is formatted from given text.
+// The parameter `skip` specifies the stack callers skipped amount.
+func NewSkip(skip int, text string) error {
+	return &Error{
+		stack: callers(skip),
+		text:  text,
+		code:  gcode.CodeNil,
+	}
+}
+
+// NewSkipf returns an error that formats as the given format and args.
+// The parameter `skip` specifies the stack callers skipped amount.
+func NewSkipf(skip int, format string, args ...interface{}) error {
+	return &Error{
+		stack: callers(skip),
+		text:  fmt.Sprintf(format, args...),
+		code:  gcode.CodeNil,
+	}
+}
+
+// Wrap wraps error with text. It returns nil if given err is nil.
+// Note that it does not lose the error code of wrapped error, as it inherits the error code from it.
+func Wrap(err error, text string) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(),
+		text:  text,
+		code:  Code(err),
+	}
+}
+
+// Wrapf returns an error annotating err with a stack trace at the point Wrapf is called, and the format specifier.
+// It returns nil if given `err` is nil.
+// Note that it does not lose the error code of wrapped error, as it inherits the error code from it.
+func Wrapf(err error, format string, args ...interface{}) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(),
+		text:  fmt.Sprintf(format, args...),
+		code:  Code(err),
+	}
+}
+
+// WrapSkip wraps error with text. It returns nil if given err is nil.
+// The parameter `skip` specifies the stack callers skipped amount.
+// Note that it does not lose the error code of wrapped error, as it inherits the error code from it.
+func WrapSkip(skip int, err error, text string) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(skip),
+		text:  text,
+		code:  Code(err),
+	}
+}
+
+// WrapSkipf wraps error with text that is formatted with given format and args. It returns nil if given err is nil.
+// The parameter `skip` specifies the stack callers skipped amount.
+// Note that it does not lose the error code of wrapped error, as it inherits the error code from it.
+func WrapSkipf(skip int, err error, format string, args ...interface{}) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(skip),
+		text:  fmt.Sprintf(format, args...),
+		code:  Code(err),
+	}
+}

errors/gerror/gerror_api_code.go

@@ -0,0 +1,139 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gerror
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+)
+
+// NewCode creates and returns an error that has error code and given text.
+func NewCode(code gcode.Code, text ...string) error {
+	return &Error{
+		stack: callers(),
+		text:  strings.Join(text, ", "),
+		code:  code,
+	}
+}
+
+// NewCodef returns an error that has error code and formats as the given format and args.
+func NewCodef(code gcode.Code, format string, args ...interface{}) error {
+	return &Error{
+		stack: callers(),
+		text:  fmt.Sprintf(format, args...),
+		code:  code,
+	}
+}
+
+// NewCodeSkip creates and returns an error which has error code and is formatted from given text.
+// The parameter `skip` specifies the stack callers skipped amount.
+func NewCodeSkip(code gcode.Code, skip int, text ...string) error {
+	return &Error{
+		stack: callers(skip),
+		text:  strings.Join(text, ", "),
+		code:  code,
+	}
+}
+
+// NewCodeSkipf returns an error that has error code and formats as the given format and args.
+// The parameter `skip` specifies the stack callers skipped amount.
+func NewCodeSkipf(code gcode.Code, skip int, format string, args ...interface{}) error {
+	return &Error{
+		stack: callers(skip),
+		text:  fmt.Sprintf(format, args...),
+		code:  code,
+	}
+}
+
+// WrapCode wraps error with code and text.
+// It returns nil if given err is nil.
+func WrapCode(code gcode.Code, err error, text ...string) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(),
+		text:  strings.Join(text, ", "),
+		code:  code,
+	}
+}
+
+// WrapCodef wraps error with code and format specifier.
+// It returns nil if given `err` is nil.
+func WrapCodef(code gcode.Code, err error, format string, args ...interface{}) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(),
+		text:  fmt.Sprintf(format, args...),
+		code:  code,
+	}
+}
+
+// WrapCodeSkip wraps error with code and text.
+// It returns nil if given err is nil.
+// The parameter `skip` specifies the stack callers skipped amount.
+func WrapCodeSkip(code gcode.Code, skip int, err error, text ...string) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(skip),
+		text:  strings.Join(text, ", "),
+		code:  code,
+	}
+}
+
+// WrapCodeSkipf wraps error with code and text that is formatted with given format and args.
+// It returns nil if given err is nil.
+// The parameter `skip` specifies the stack callers skipped amount.
+func WrapCodeSkipf(code gcode.Code, skip int, err error, format string, args ...interface{}) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(skip),
+		text:  fmt.Sprintf(format, args...),
+		code:  code,
+	}
+}
+
+// Code returns the error code of current error.
+// It returns `CodeNil` if it has no error code neither it does not implement interface Code.
+func Code(err error) gcode.Code {
+	if err == nil {
+		return gcode.CodeNil
+	}
+	if e, ok := err.(ICode); ok {
+		return e.Code()
+	}
+	if e, ok := err.(IUnwrap); ok {
+		return Code(e.Unwrap())
+	}
+	return gcode.CodeNil
+}
+
+// HasCode checks and reports whether `err` has `code` in its chaining errors.
+func HasCode(err error, code gcode.Code) bool {
+	if err == nil {
+		return false
+	}
+	if e, ok := err.(ICode); ok {
+		return code == e.Code()
+	}
+	if e, ok := err.(IUnwrap); ok {
+		return HasCode(e.Unwrap(), code)
+	}
+	return false
+}

errors/gerror/gerror_api_stack.go

@@ -0,0 +1,118 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gerror
+
+import (
+	"runtime"
+)
+
+// stack represents a stack of program counters.
+type stack []uintptr
+
+const (
+	// maxStackDepth marks the max stack depth for error back traces.
+	maxStackDepth = 32
+)
+
+// Cause returns the root cause error of `err`.
+func Cause(err error) error {
+	if err == nil {
+		return nil
+	}
+	if e, ok := err.(ICause); ok {
+		return e.Cause()
+	}
+	if e, ok := err.(IUnwrap); ok {
+		return Cause(e.Unwrap())
+	}
+	return err
+}
+
+// Stack returns the stack callers as string.
+// It returns the error string directly if the `err` does not support stacks.
+func Stack(err error) string {
+	if err == nil {
+		return ""
+	}
+	if e, ok := err.(IStack); ok {
+		return e.Stack()
+	}
+	return err.Error()
+}
+
+// Current creates and returns the current level error.
+// It returns nil if current level error is nil.
+func Current(err error) error {
+	if err == nil {
+		return nil
+	}
+	if e, ok := err.(ICurrent); ok {
+		return e.Current()
+	}
+	return err
+}
+
+// Unwrap returns the next level error.
+// It returns nil if current level error or the next level error is nil.
+func Unwrap(err error) error {
+	if err == nil {
+		return nil
+	}
+	if e, ok := err.(IUnwrap); ok {
+		return e.Unwrap()
+	}
+	return nil
+}
+
+// HasStack checks and reports whether `err` implemented interface `gerror.IStack`.
+func HasStack(err error) bool {
+	_, ok := err.(IStack)
+	return ok
+}
+
+// Equal reports whether current error `err` equals to error `target`.
+// Please note that, in default comparison logic for `Error`,
+// the errors are considered the same if both the `code` and `text` of them are the same.
+func Equal(err, target error) bool {
+	if err == target {
+		return true
+	}
+	if e, ok := err.(IEqual); ok {
+		return e.Equal(target)
+	}
+	if e, ok := target.(IEqual); ok {
+		return e.Equal(err)
+	}
+	return false
+}
+
+// Is reports whether current error `err` has error `target` in its chaining errors.
+// It is just for implements for stdlib errors.Is from Go version 1.17.
+func Is(err, target error) bool {
+	if e, ok := err.(IIs); ok {
+		return e.Is(target)
+	}
+	return false
+}
+
+// HasError is alias of Is, which more easily understanding semantics.
+func HasError(err, target error) bool {
+	return Is(err, target)
+}
+
+// callers returns the stack callers.
+// Note that it here just retrieves the caller memory address array not the caller information.
+func callers(skip ...int) stack {
+	var (
+		pcs [maxStackDepth]uintptr
+		n   = 3
+	)
+	if len(skip) > 0 {
+		n += skip[0]
+	}
+	return pcs[:runtime.Callers(n, pcs[:])]
+}

errors/gerror/gerror_error.go

@@ -68,7 +68,7 @@ func (err *Error) Cause() error {
 			if e, ok := loop.error.(*Error); ok {
 				// Internal Error struct.
 				loop = e
-			} else if e, ok := loop.error.(iCause); ok {
+			} else if e, ok := loop.error.(ICause); ok {
 				// Other Error that implements ApiCause interface.
 				return e.Cause()
 			} else {
@@ -76,6 +76,7 @@ func (err *Error) Cause() error {
 			}
 		} else {
 			// return loop
+			//
 			// To be compatible with Case of https://github.com/pkg/errors.
 			return errors.New(loop.text)
 		}
@@ -97,21 +98,15 @@ func (err *Error) Current() error {
 	}
 }
 
-// Next returns the next level error.
-// It returns nil if current level error or the next level error is nil.
-func (err *Error) Next() error {
+// Unwrap is alias of function `Next`.
+// It is just for implements for stdlib errors.Unwrap from Go version 1.17.
+func (err *Error) Unwrap() error {
 	if err == nil {
 		return nil
 	}
 	return err.error
 }
 
-// Unwrap is alias of function `Next`.
-// It is just for implements for stdlib errors.Unwrap from Go version 1.17.
-func (err *Error) Unwrap() error {
-	return err.Next()
-}
-
 // Equal reports whether current error `err` equals to error `target`.
 // Please note that, in default comparison for `Error`,
 // the errors are considered the same if both the `code` and `text` of them are the same.
@@ -132,19 +127,19 @@ func (err *Error) Equal(target error) bool {
 }
 
 // Is reports whether current error `err` has error `target` in its chaining errors.
-// It is just for implements for stdlib errors.Unwrap from Go version 1.17.
+// It is just for implements for stdlib errors.Is from Go version 1.17.
 func (err *Error) Is(target error) bool {
 	if Equal(err, target) {
 		return true
 	}
-	nextErr := err.Next()
+	nextErr := err.Unwrap()
 	if nextErr == nil {
 		return false
 	}
 	if Equal(nextErr, target) {
 		return true
 	}
-	if e, ok := nextErr.(iIs); ok {
+	if e, ok := nextErr.(IIs); ok {
 		return e.Is(target)
 	}
 	return false

errors/gerror/gerror_error_code.go

@@ -17,7 +17,7 @@ func (err *Error) Code() gcode.Code {
 		return gcode.CodeNil
 	}
 	if err.code == gcode.CodeNil {
-		return Code(err.Next())
+		return Code(err.Unwrap())
 	}
 	return err.code
 }

errors/gerror/gerror_interface.go

@@ -1,57 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gerror
-
-import (
-	"github.com/gogf/gf/v2/errors/gcode"
-)
-
-// iIs is the interface for Is feature.
-type iIs interface {
-	Is(target error) bool
-}
-
-// iEqual is the interface for Equal feature.
-type iEqual interface {
-	Equal(target error) bool
-}
-
-// iCode is the interface for Code feature.
-type iCode interface {
-	Error() string
-	Code() gcode.Code
-}
-
-// iStack is the interface for Stack feature.
-type iStack interface {
-	Error() string
-	Stack() string
-}
-
-// iCause is the interface for Cause feature.
-type iCause interface {
-	Error() string
-	Cause() error
-}
-
-// iCurrent is the interface for Current feature.
-type iCurrent interface {
-	Error() string
-	Current() error
-}
-
-// iNext is the interface for Next feature.
-type iNext interface {
-	Error() string
-	Next() error
-}
-
-// iUnwrap is the interface for Unwrap feature.
-type iUnwrap interface {
-	Error() string
-	Unwrap() error
-}

errors/gerror/gerror_stack.go

@@ -1,30 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gerror
-
-import "runtime"
-
-// stack represents a stack of program counters.
-type stack []uintptr
-
-const (
-	// maxStackDepth marks the max stack depth for error back traces.
-	maxStackDepth = 32
-)
-
-// callers returns the stack callers.
-// Note that it here just retrieves the caller memory address array not the caller information.
-func callers(skip ...int) stack {
-	var (
-		pcs [maxStackDepth]uintptr
-		n   = 3
-	)
-	if len(skip) > 0 {
-		n += skip[0]
-	}
-	return pcs[:runtime.Callers(n, pcs[:])]
-}

errors/gerror/gerror_z_unit_test.go

@@ -237,24 +237,6 @@ func Test_Current(t *testing.T) {
 	})
 }
 
-func Test_Next(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		err := errors.New("1")
-		err = gerror.Wrap(err, "2")
-		err = gerror.Wrap(err, "3")
-		t.Assert(err.Error(), "3: 2: 1")
-
-		err = gerror.Next(err)
-		t.Assert(err.Error(), "2: 1")
-
-		err = gerror.Next(err)
-		t.Assert(err.Error(), "1")
-
-		err = gerror.Next(err)
-		t.AssertNil(err)
-	})
-}
-
 func Test_Unwrap(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		err := errors.New("1")
@@ -381,3 +363,25 @@ func Test_Is(t *testing.T) {
 		t.Assert(gerror.Is(err2, err1), true)
 	})
 }
+
+func Test_HashError(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		err1 := errors.New("1")
+		err2 := gerror.Wrap(err1, "2")
+		err2 = gerror.Wrap(err2, "3")
+		t.Assert(gerror.HasError(err2, err1), true)
+	})
+}
+
+func Test_HashCode(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		err1 := errors.New("1")
+		err2 := gerror.WrapCode(gcode.CodeNotAuthorized, err1, "2")
+		err3 := gerror.Wrap(err2, "3")
+		err4 := gerror.Wrap(err3, "4")
+		t.Assert(gerror.HasCode(err1, gcode.CodeNotAuthorized), false)
+		t.Assert(gerror.HasCode(err2, gcode.CodeNotAuthorized), true)
+		t.Assert(gerror.HasCode(err3, gcode.CodeNotAuthorized), true)
+		t.Assert(gerror.HasCode(err4, gcode.CodeNotAuthorized), true)
+	})
+}

internal/intlog/intlog.go

@@ -100,6 +100,7 @@ func doPrint(ctx context.Context, content string, stack bool) {
 	buffer.WriteString(content)
 	buffer.WriteString("\n")
 	if stack {
+		buffer.WriteString("Caller Stack:\n")
 		buffer.WriteString(gdebug.StackWithFilter([]string{stackFilterKey}))
 	}
 	fmt.Print(buffer.String())

net/ghttp/ghttp.go

@@ -12,6 +12,8 @@ import (
 	"reflect"
 	"time"
 
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gorilla/websocket"
 
 	"github.com/gogf/gf/v2/container/gmap"
@@ -98,6 +100,9 @@ type (
 	// Listening file descriptor mapping.
 	// The key is either "http" or "https" and the value is its FD.
 	listenerFdMap = map[string]string
+
+	// internalPanic is the custom panic for internal usage.
+	internalPanic string
 )
 
 const (
@@ -119,9 +124,6 @@ const (
 const (
 	supportedHttpMethods    = "GET,PUT,POST,DELETE,PATCH,HEAD,CONNECT,OPTIONS,TRACE"
 	defaultMethod           = "ALL"
-	exceptionExit           = "exit"
-	exceptionExitAll        = "exit_all"
-	exceptionExitHook       = "exit_hook"
 	routeCacheDuration      = time.Hour
 	ctxKeyForRequest        = "gHttpRequestObject"
 	contentTypeXml          = "text/xml"
@@ -135,6 +137,12 @@ const (
 	gracefulShutdownTimeout = 5 * time.Second
 )
 
+const (
+	exceptionExit     internalPanic = "exit"
+	exceptionExitAll  internalPanic = "exit_all"
+	exceptionExitHook internalPanic = "exit_hook"
+)
+
 var (
 	// methodsMap stores all supported HTTP method.
 	// It is used for quick HTTP method searching using map.
@@ -169,3 +177,10 @@ var (
 	// defaultValueTags are the struct tag names for default value storing.
 	defaultValueTags = []string{"d", "default"}
 )
+
+var (
+	ErrNeedJsonBody = gerror.NewOption(gerror.Option{
+		Text: "the request body content should be JSON format",
+		Code: gcode.CodeInvalidRequest,
+	})
+)

net/ghttp/ghttp_middleware_json_body.go

@@ -0,0 +1,23 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package ghttp
+
+import (
+	"github.com/gogf/gf/v2/internal/json"
+)
+
+// MiddlewareJsonBody validates and returns request body whether JSON format.
+func MiddlewareJsonBody(r *Request) {
+	requestBody := r.GetBody()
+	if len(requestBody) > 0 {
+		if !json.Valid(requestBody) {
+			r.SetError(ErrNeedJsonBody)
+			return
+		}
+	}
+	r.Middleware.Next()
+}

net/ghttp/ghttp_request.go

@@ -263,7 +263,7 @@ func (r *Request) SetError(err error) {
 
 // ReloadParam is used for modifying request parameter.
 // Sometimes, we want to modify request parameters through middleware, but directly modifying Request.Body
-// is invalid, so it clears the parsed* marks to make the parameters re-parsed.
+// is invalid, so it clears the parsed* marks of Request to make the parameters reparsed.
 func (r *Request) ReloadParam() {
 	r.parsedBody = false
 	r.parsedForm = false

net/ghttp/ghttp_server_handler.go

@@ -148,6 +148,11 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if request.Response.Status == 0 {
 		if request.StaticFile != nil || request.Middleware.served || request.Response.buffer.Len() > 0 {
 			request.Response.WriteHeader(http.StatusOK)
+		} else if err := request.GetError(); err != nil {
+			if request.Response.BufferLength() == 0 {
+				request.Response.Write(err.Error())
+			}
+			request.Response.WriteHeader(http.StatusInternalServerError)
 		} else {
 			request.Response.WriteHeader(http.StatusNotFound)
 		}

net/ghttp/ghttp_z_unit_feature_middleware_basic_test.go

@@ -674,3 +674,26 @@ func Test_Middleware_Panic(t *testing.T) {
 		t.Assert(client.GetContent(ctx, "/"), "exception recovered: error")
 	})
 }
+
+func Test_Middleware_JsonBody(t *testing.T) {
+	s := g.Server(guid.S())
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.Middleware(ghttp.MiddlewareJsonBody)
+		group.ALL("/", func(r *ghttp.Request) {
+			r.Response.Write("hello")
+		})
+	})
+	s.SetDumpRouterMap(false)
+	s.Start()
+	defer s.Shutdown()
+	time.Sleep(100 * time.Millisecond)
+	gtest.C(t, func(t *gtest.T) {
+		client := g.Client()
+		client.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort()))
+
+		t.Assert(client.GetContent(ctx, "/"), "hello")
+		t.Assert(client.PutContent(ctx, "/"), "hello")
+		t.Assert(client.PutContent(ctx, "/", `{"name":"john"}`), "hello")
+		t.Assert(client.PutContent(ctx, "/", `{"name":}`), "the request body content should be JSON format")
+	})
+}

net/goai/goai.go

@@ -202,6 +202,9 @@ func (oai *OpenApiV3) golangTypeToOAIFormat(t reflect.Type) string {
 		return FormatBinary
 
 	default:
+		if oai.isEmbeddedStructDefinition(t) {
+			return `EmbeddedStructDefinition`
+		}
 		return format
 	}
 }

net/goai/goai_path.go

@@ -311,6 +311,12 @@ func (oai *OpenApiV3) removeOperationDuplicatedProperties(operation Operation) {
 	}
 
 	for _, requestBodyContent := range operation.RequestBody.Value.Content {
+
+		// Check request body schema
+		if requestBodyContent.Schema == nil {
+			continue
+		}
+
 		// Check request body schema ref.
 		if schema := oai.Components.Schemas.Get(requestBodyContent.Schema.Ref); schema != nil {
 			schema.Value.Required = oai.removeItemsFromArray(schema.Value.Required, duplicatedParameterNames)

net/goai/goai_shema.go

@@ -174,8 +174,11 @@ func (oai *OpenApiV3) structToSchema(object interface{}) (*Schema, error) {
 			continue
 		}
 		var fieldName = structField.Name()
-		if jsonName := structField.TagJsonName(); jsonName != "" {
-			fieldName = jsonName
+		for _, tagName := range gconv.StructTagPriority {
+			if tagValue := structField.Tag(tagName); tagValue != "" {
+				fieldName = tagValue
+				break
+			}
 		}
 		schemaRef, err := oai.newSchemaRefWithGolangType(
 			structField.Type().Type,

net/goai/goai_shema_ref.go

@@ -10,6 +10,7 @@ import (
 	"reflect"
 
 	"github.com/gogf/gf/v2/internal/json"
+	"github.com/gogf/gf/v2/text/gstr"
 )
 
 type SchemaRefs []SchemaRef
@@ -19,8 +20,25 @@ type SchemaRef struct {
 	Value *Schema
 }
 
+// isEmbeddedStructDefine checks and returns whether given golang type is embedded struct definition, like:
+// struct A struct{
+//     B struct{
+//         // ...
+//     }
+// }
+// The `B` in `A` is called `embedded struct definition`.
+func (oai *OpenApiV3) isEmbeddedStructDefinition(golangType reflect.Type) bool {
+	s := golangType.String()
+	if gstr.Contains(s, `struct {`) {
+		return true
+	}
+	return false
+}
+
+// newSchemaRefWithGolangType creates a new Schema and returns its SchemaRef.
 func (oai *OpenApiV3) newSchemaRefWithGolangType(golangType reflect.Type, tagMap map[string]string) (*SchemaRef, error) {
 	var (
+		err       error
 		oaiType   = oai.golangTypeToOAIType(golangType)
 		oaiFormat = oai.golangTypeToOAIFormat(golangType)
 		schemaRef = &SchemaRef{}
@@ -85,15 +103,24 @@ func (oai *OpenApiV3) newSchemaRefWithGolangType(golangType reflect.Type, tagMap
 			schemaRef.Value = nil
 
 		default:
-			// Normal struct object.
-			var structTypeName = oai.golangTypeToSchemaName(golangType)
-			if oai.Components.Schemas.Get(structTypeName) == nil {
-				if err := oai.addSchema(reflect.New(golangType).Elem().Interface()); err != nil {
+			golangTypeInstance := reflect.New(golangType).Elem().Interface()
+			if oai.isEmbeddedStructDefinition(golangType) {
+				schema, err = oai.structToSchema(golangTypeInstance)
+				if err != nil {
 					return nil, err
 				}
+				schemaRef.Ref = ""
+				schemaRef.Value = schema
+			} else {
+				var structTypeName = oai.golangTypeToSchemaName(golangType)
+				if oai.Components.Schemas.Get(structTypeName) == nil {
+					if err := oai.addSchema(golangTypeInstance); err != nil {
+						return nil, err
+					}
+				}
+				schemaRef.Ref = structTypeName
+				schemaRef.Value = nil
 			}
-			schemaRef.Ref = structTypeName
-			schemaRef.Value = nil
 		}
 	}
 	return schemaRef, nil

net/goai/goai_z_unit_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/net/goai"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gmeta"
@@ -936,3 +937,66 @@ func Test_EnumOfSchemaItems(t *testing.T) {
 		)
 	})
 }
+
+func Test_AliasNameOfAttribute(t *testing.T) {
+	type CreateResourceReq struct {
+		gmeta.Meta `path:"/CreateResourceReq" method:"POST"`
+		Name       string `p:"n"`
+		Age        string `json:"a"`
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err error
+			oai = goai.New()
+			req = new(CreateResourceReq)
+		)
+		err = oai.Add(goai.AddInput{
+			Object: req,
+		})
+		t.AssertNil(err)
+
+		t.Assert(
+			oai.Components.Schemas.Get(`github.com.gogf.gf.v2.net.goai_test.CreateResourceReq`).Value.
+				Properties.Get(`Name`), nil,
+		)
+		t.Assert(
+			oai.Components.Schemas.Get(`github.com.gogf.gf.v2.net.goai_test.CreateResourceReq`).Value.
+				Properties.Get(`Age`), nil,
+		)
+		t.AssertNE(
+			oai.Components.Schemas.Get(`github.com.gogf.gf.v2.net.goai_test.CreateResourceReq`).Value.
+				Properties.Get(`n`), nil,
+		)
+		t.AssertNE(
+			oai.Components.Schemas.Get(`github.com.gogf.gf.v2.net.goai_test.CreateResourceReq`).Value.
+				Properties.Get(`a`), nil,
+		)
+	})
+}
+
+func Test_EmbeddedStructAttribute(t *testing.T) {
+	type CreateResourceReq struct {
+		gmeta.Meta `path:"/CreateResourceReq" method:"POST"`
+		Name       string `dc:"This is name."`
+		Embedded   struct {
+			Age uint `dc:"This is embedded age."`
+		}
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err error
+			oai = goai.New()
+			req = new(CreateResourceReq)
+		)
+		err = oai.Add(goai.AddInput{
+			Object: req,
+		})
+		t.AssertNil(err)
+
+		b, err := json.Marshal(oai)
+		t.AssertNil(err)
+		t.Assert(b, `{"openapi":"3.0.0","components":{"schemas":{"github.com.gogf.gf.v2.net.goai_test.CreateResourceReq":{"properties":{"Name":{"description":"This is name.","format":"string","properties":{},"type":"string"},"Embedded":{"properties":{"Age":{"description":"This is embedded age.","format":"uint","properties":{},"type":"integer"}},"type":"object"}},"type":"object"}}},"info":{"title":"","version":""},"paths":null}`)
+	})
+}

os/gcache/gcache_adapter_memory_lru.go

@@ -71,14 +71,6 @@ func (lru *adapterMemoryLru) Pop() interface{} {
 	return nil
 }
 
-// Print is used for test only.
-// func (lru *adapterMemoryLru) Print() {
-//    for _, v := range lru.list.FrontAll() {
-//        fmt.Printf("%v ", v)
-//    }
-//    fmt.Println()
-// }
-
 // SyncAndClear synchronizes the keys from `rawList` to `list` and `data`
 // using Least Recently Used algorithm.
 func (lru *adapterMemoryLru) SyncAndClear(ctx context.Context) {
@@ -87,9 +79,7 @@ func (lru *adapterMemoryLru) SyncAndClear(ctx context.Context) {
 		return
 	}
 	// Data synchronization.
-	var (
-		alreadyExistItem interface{}
-	)
+	var alreadyExistItem interface{}
 	for {
 		if rawListItem := lru.rawList.PopFront(); rawListItem != nil {
 			// Deleting the key from list.
@@ -104,9 +94,9 @@ func (lru *adapterMemoryLru) SyncAndClear(ctx context.Context) {
 		}
 	}
 	// Data cleaning up.
-	for i := lru.Size() - lru.cache.cap; i > 0; i-- {
-		if s := lru.Pop(); s != nil {
-			lru.cache.clearByKey(s, true)
+	for clearLength := lru.Size() - lru.cache.cap; clearLength > 0; clearLength-- {
+		if topKey := lru.Pop(); topKey != nil {
+			lru.cache.clearByKey(topKey, true)
 		}
 	}
 }

os/gcmd/gcmd_command_object.go

@@ -28,9 +28,9 @@ import (
 )
 
 const (
-	tagNameDc   = `dc`
-	tagNameAd   = `ad`
-	tagNameEg   = `eg`
+	tagNameDc   = `dc` // description.
+	tagNameAd   = `ad` // additional
+	tagNameEg   = `eg` // examples.
 	tagNameArg  = `arg`
 	tagNameRoot = `root`
 )
@@ -61,7 +61,7 @@ func NewFromObject(object interface{}) (rootCmd *Command, err error) {
 	}
 
 	// Root command creating.
-	rootCmd, err = newCommandFromObjectMeta(object)
+	rootCmd, err = newCommandFromObjectMeta(object, "")
 	if err != nil {
 		return
 	}
@@ -76,17 +76,19 @@ func NewFromObject(object interface{}) (rootCmd *Command, err error) {
 	}
 	for i := 0; i < reflectValue.NumMethod(); i++ {
 		var (
-			method    = reflectValue.Method(i)
-			methodCmd *Command
+			method      = reflectValue.Type().Method(i)
+			methodValue = reflectValue.Method(i)
+			methodType  = methodValue.Type()
+			methodCmd   *Command
 		)
-		methodCmd, err = newCommandFromMethod(object, method)
+		methodCmd, err = newCommandFromMethod(object, method, methodValue, methodType)
 		if err != nil {
 			return
 		}
 		if nameSet.Contains(methodCmd.Name) {
 			err = gerror.Newf(
 				`command name should be unique, found duplicated command name in method "%s"`,
-				method.Type().String(),
+				methodType.String(),
 			)
 			return
 		}
@@ -135,27 +137,23 @@ func methodToRootCmdWhenNameEqual(rootCmd *Command, methodCmd *Command) {
 	}
 }
 
-func newCommandFromObjectMeta(object interface{}) (command *Command, err error) {
-	var (
-		metaData = gmeta.Data(object)
-	)
-	if len(metaData) == 0 {
-		err = gerror.Newf(
-			`no meta data found in struct "%s"`,
-			reflect.TypeOf(object).String(),
-		)
-		return
-	}
+// The `object` is the Meta attribute from business object, and the `name` is the command name,
+// commonly from method name, which is used when no name tag is defined in Meta.
+func newCommandFromObjectMeta(object interface{}, name string) (command *Command, err error) {
+	var metaData = gmeta.Data(object)
 	if err = gconv.Scan(metaData, &command); err != nil {
 		return
 	}
 	// Name filed is necessary.
 	if command.Name == "" {
-		err = gerror.Newf(
-			`command name cannot be empty, "name" tag not found in meta of struct "%s"`,
-			reflect.TypeOf(object).String(),
-		)
-		return
+		if name == "" {
+			err = gerror.Newf(
+				`command name cannot be empty, "name" tag not found in meta of struct "%s"`,
+				reflect.TypeOf(object).String(),
+			)
+			return
+		}
+		command.Name = name
 	}
 	if command.Description == "" {
 		command.Description = metaData[tagNameDc]
@@ -169,71 +167,70 @@ func newCommandFromObjectMeta(object interface{}) (command *Command, err error)
 	return
 }
 
-func newCommandFromMethod(object interface{}, method reflect.Value) (command *Command, err error) {
-	var (
-		reflectType = method.Type()
-	)
+func newCommandFromMethod(
+	object interface{}, method reflect.Method, methodValue reflect.Value, methodType reflect.Type,
+) (command *Command, err error) {
 	// Necessary validation for input/output parameters and naming.
-	if reflectType.NumIn() != 2 || reflectType.NumOut() != 2 {
-		if reflectType.PkgPath() != "" {
+	if methodType.NumIn() != 2 || methodType.NumOut() != 2 {
+		if methodType.PkgPath() != "" {
 			err = gerror.NewCodef(
 				gcode.CodeInvalidParameter,
 				`invalid command: %s.%s.%s defined as "%s", but "func(context.Context, Input)(Output, error)" is required`,
-				reflectType.PkgPath(), reflect.TypeOf(object).Name(), reflectType.Name(), reflectType.String(),
+				methodType.PkgPath(), reflect.TypeOf(object).Name(), methodType.Name(), methodType.String(),
 			)
 		} else {
 			err = gerror.NewCodef(
 				gcode.CodeInvalidParameter,
 				`invalid command: defined as "%s", but "func(context.Context, Input)(Output, error)" is required`,
-				reflectType.String(),
+				methodType.String(),
 			)
 		}
 		return
 	}
-	if reflectType.In(0).String() != "context.Context" {
+	if methodType.In(0).String() != "context.Context" {
 		err = gerror.NewCodef(
 			gcode.CodeInvalidParameter,
 			`invalid command: defined as "%s", but the first input parameter should be type of "context.Context"`,
-			reflectType.String(),
+			methodType.String(),
 		)
 		return
 	}
-	if reflectType.Out(1).String() != "error" {
+	if methodType.Out(1).String() != "error" {
 		err = gerror.NewCodef(
 			gcode.CodeInvalidParameter,
 			`invalid command: defined as "%s", but the last output parameter should be type of "error"`,
-			reflectType.String(),
+			methodType.String(),
 		)
 		return
 	}
 	// The input struct should be named as `xxxInput`.
-	if !gstr.HasSuffix(reflectType.In(1).String(), `Input`) {
+	if !gstr.HasSuffix(methodType.In(1).String(), `Input`) {
 		err = gerror.NewCodef(
 			gcode.CodeInvalidParameter,
 			`invalid struct naming for input: defined as "%s", but it should be named with "Input" suffix like "xxxInput"`,
-			reflectType.In(1).String(),
+			methodType.In(1).String(),
 		)
 		return
 	}
 	// The output struct should be named as `xxxOutput`.
-	if !gstr.HasSuffix(reflectType.Out(0).String(), `Output`) {
+	if !gstr.HasSuffix(methodType.Out(0).String(), `Output`) {
 		err = gerror.NewCodef(
 			gcode.CodeInvalidParameter,
 			`invalid struct naming for output: defined as "%s", but it should be named with "Output" suffix like "xxxOutput"`,
-			reflectType.Out(0).String(),
+			methodType.Out(0).String(),
 		)
 		return
 	}
 
 	var inputObject reflect.Value
-	if method.Type().In(1).Kind() == reflect.Ptr {
-		inputObject = reflect.New(method.Type().In(1).Elem()).Elem()
+	if methodType.In(1).Kind() == reflect.Ptr {
+		inputObject = reflect.New(methodType.In(1).Elem()).Elem()
 	} else {
-		inputObject = reflect.New(method.Type().In(1)).Elem()
+		inputObject = reflect.New(methodType.In(1)).Elem()
 	}
 
 	// Command creating.
-	if command, err = newCommandFromObjectMeta(inputObject.Interface()); err != nil {
+	if command, err = newCommandFromObjectMeta(inputObject.Interface(), method.Name); err != nil {
 		return
 	}
 
@@ -312,7 +309,7 @@ func newCommandFromMethod(object interface{}, method reflect.Value) (command *Co
 		inputValues = append(inputValues, inputObject)
 
 		// Call handler with dynamic created parameter values.
-		results := method.Call(inputValues)
+		results := methodValue.Call(inputValues)
 		out = results[0].Interface()
 		if !results[1].IsNil() {
 			if v, ok := results[1].Interface().(error); ok {

os/gcmd/gcmd_z_unit_feature_object4_test.go

@@ -0,0 +1,49 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gcmd_test
+
+import (
+	"context"
+	"os"
+	"testing"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gcmd"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/test/gtest"
+)
+
+type TestNoNameTagCase struct {
+	g.Meta `name:"root"`
+}
+
+type TestNoNameTagCaseRootInput struct {
+	Name string
+}
+type TestNoNameTagCaseRootOutput struct {
+	Content string
+}
+
+func (c *TestNoNameTagCase) TEST(ctx context.Context, in TestNoNameTagCaseRootInput) (out *TestNoNameTagCaseRootOutput, err error) {
+	out = &TestNoNameTagCaseRootOutput{
+		Content: in.Name,
+	}
+	return
+}
+
+func Test_Command_NoNameTagCase(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var ctx = gctx.New()
+		cmd, err := gcmd.NewFromObject(TestNoNameTagCase{})
+		t.AssertNil(err)
+
+		os.Args = []string{"root", "TEST", "-name=john"}
+		value, err := cmd.RunWithValueError(ctx)
+		t.AssertNil(err)
+		t.Assert(value, `{"Content":"john"}`)
+	})
+}

os/gcron/gcron_entry.go

@@ -137,7 +137,7 @@ func (entry *Entry) Close() {
 // gcron.Entry relies on gtimer to implement a scheduled task check for gcron.Entry per second.
 func (entry *Entry) checkAndRun(ctx context.Context) {
 	currentTime := time.Now()
-	if !entry.schedule.checkMeetAndUpdateLastSeconds(currentTime) {
+	if !entry.schedule.checkMeetAndUpdateLastSeconds(ctx, currentTime) {
 		intlog.Printf(
 			ctx,
 			`timely check, current time does not meet cron job "%s"`,

os/gcron/gcron_schedule.go

@@ -15,23 +15,22 @@ import (
 	"github.com/gogf/gf/v2/container/gtype"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/internal/intlog"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/text/gregex"
 )
 
 // cronSchedule is the schedule for cron job.
 type cronSchedule struct {
-	create        int64            // Created timestamp.
-	every         int64            // Running interval in seconds.
-	pattern       string           // The raw cron pattern string.
-	second        map[int]struct{} // Job can run in these second numbers.
-	minute        map[int]struct{} // Job can run in these minute numbers.
-	hour          map[int]struct{} // Job can run in these hour numbers.
-	day           map[int]struct{} // Job can run in these day numbers.
-	week          map[int]struct{} // Job can run in these week numbers.
-	month         map[int]struct{} // Job can run in these moth numbers.
-	lastTimestamp *gtype.Int64     // Last timestamp number, for seconds fix.
+	createTimestamp int64            // Created timestamp in seconds.
+	everySeconds    int64            // Running interval in seconds.
+	pattern         string           // The raw cron pattern string.
+	secondMap       map[int]struct{} // Job can run in these second numbers.
+	minuteMap       map[int]struct{} // Job can run in these minute numbers.
+	hourMap         map[int]struct{} // Job can run in these hour numbers.
+	dayMap          map[int]struct{} // Job can run in these day numbers.
+	weekMap         map[int]struct{} // Job can run in these week numbers.
+	monthMap        map[int]struct{} // Job can run in these moth numbers.
+	lastTimestamp   *gtype.Int64     // Last timestamp number, for timestamp fix in some delay.
 }
 
 const (
@@ -107,6 +106,7 @@ var (
 
 // newSchedule creates and returns a schedule object for given cron pattern.
 func newSchedule(pattern string) (*cronSchedule, error) {
+	var currentTimestamp = time.Now().Unix()
 	// Check if the predefined patterns.
 	if match, _ := gregex.MatchString(`(@\w+)\s*(\w*)\s*`, pattern); len(match) > 0 {
 		key := strings.ToLower(match[1])
@@ -118,10 +118,10 @@ func newSchedule(pattern string) (*cronSchedule, error) {
 				return nil, err
 			}
 			return &cronSchedule{
-				create:        time.Now().Unix(),
-				every:         int64(d.Seconds()),
-				pattern:       pattern,
-				lastTimestamp: gtype.NewInt64(),
+				createTimestamp: currentTimestamp,
+				everySeconds:    int64(d.Seconds()),
+				pattern:         pattern,
+				lastTimestamp:   gtype.NewInt64(currentTimestamp),
 			}, nil
 		}
 		return nil, gerror.NewCodef(gcode.CodeInvalidParameter, `invalid pattern: "%s"`, pattern)
@@ -130,46 +130,46 @@ func newSchedule(pattern string) (*cronSchedule, error) {
 	// 0 0 0 1 1 2
 	if match, _ := gregex.MatchString(regexForCron, pattern); len(match) == 7 {
 		schedule := &cronSchedule{
-			create:        time.Now().Unix(),
-			every:         0,
-			pattern:       pattern,
-			lastTimestamp: gtype.NewInt64(),
+			createTimestamp: currentTimestamp,
+			everySeconds:    0,
+			pattern:         pattern,
+			lastTimestamp:   gtype.NewInt64(currentTimestamp),
 		}
 		// Second.
 		if m, err := parsePatternItem(match[1], 0, 59, false); err != nil {
 			return nil, err
 		} else {
-			schedule.second = m
+			schedule.secondMap = m
 		}
 		// Minute.
 		if m, err := parsePatternItem(match[2], 0, 59, false); err != nil {
 			return nil, err
 		} else {
-			schedule.minute = m
+			schedule.minuteMap = m
 		}
 		// Hour.
 		if m, err := parsePatternItem(match[3], 0, 23, false); err != nil {
 			return nil, err
 		} else {
-			schedule.hour = m
+			schedule.hourMap = m
 		}
 		// Day.
 		if m, err := parsePatternItem(match[4], 1, 31, true); err != nil {
 			return nil, err
 		} else {
-			schedule.day = m
+			schedule.dayMap = m
 		}
 		// Month.
 		if m, err := parsePatternItem(match[5], 1, 12, false); err != nil {
 			return nil, err
 		} else {
-			schedule.month = m
+			schedule.monthMap = m
 		}
 		// Week.
 		if m, err := parsePatternItem(match[6], 0, 6, true); err != nil {
 			return nil, err
 		} else {
-			schedule.week = m
+			schedule.weekMap = m
 		}
 		return schedule, nil
 	}
@@ -208,6 +208,7 @@ func parsePatternItem(item string, min int, max int, allowQuestionMark bool) (ma
 		case 6:
 			// It's checking week field.
 			itemType = patternItemTypeWeek
+
 		case 12:
 			// It's checking month field.
 			itemType = patternItemTypeMonth
@@ -268,78 +269,48 @@ func parsePatternItemValue(value string, itemType int) (int, error) {
 }
 
 // checkMeetAndUpdateLastSeconds checks if the given time `t` meets the runnable point for the job.
-func (s *cronSchedule) checkMeetAndUpdateLastSeconds(t time.Time) bool {
-	if s.every != 0 {
+func (s *cronSchedule) checkMeetAndUpdateLastSeconds(ctx context.Context, t time.Time) bool {
+	if s.everySeconds != 0 {
 		// It checks using interval.
-		if diff := t.Unix() - s.create; diff > 0 {
-			return diff%s.every == 0
+		secondsAfterCreated := t.Unix() - s.createTimestamp
+		secondsAfterCreated += int64(s.getFixedTimestampDelta(ctx, t))
+		if secondsAfterCreated > 0 {
+			return secondsAfterCreated%s.everySeconds == 0
 		}
 		return false
 	}
+
 	// It checks using normal cron pattern.
-	if _, ok := s.second[s.getFixedSecond(t)]; !ok {
+	if _, ok := s.secondMap[s.getFixedSecond(ctx, t)]; !ok {
 		return false
 	}
-	if _, ok := s.minute[t.Minute()]; !ok {
+	if _, ok := s.minuteMap[t.Minute()]; !ok {
 		return false
 	}
-	if _, ok := s.hour[t.Hour()]; !ok {
+	if _, ok := s.hourMap[t.Hour()]; !ok {
 		return false
 	}
-	if _, ok := s.day[t.Day()]; !ok {
+	if _, ok := s.dayMap[t.Day()]; !ok {
 		return false
 	}
-	if _, ok := s.month[int(t.Month())]; !ok {
+	if _, ok := s.monthMap[int(t.Month())]; !ok {
 		return false
 	}
-	if _, ok := s.week[int(t.Weekday())]; !ok {
+	if _, ok := s.weekMap[int(t.Weekday())]; !ok {
 		return false
 	}
 	return true
 }
 
-// getFixedSecond checks, fixes and returns the seconds that have delay in some seconds.
-// Reference: https://github.com/golang/go/issues/14410
-func (s *cronSchedule) getFixedSecond(t time.Time) int {
-	var (
-		second           = t.Second()
-		currentTimestamp = t.Unix()
-		lastTimestamp    = s.lastTimestamp.Val()
-	)
-	switch {
-	case
-		lastTimestamp == 0,
-		lastTimestamp == currentTimestamp-1:
-		lastTimestamp = currentTimestamp
-
-	case
-		lastTimestamp == currentTimestamp-2,
-		lastTimestamp == currentTimestamp-3,
-		lastTimestamp == currentTimestamp:
-		lastTimestamp += 1
-		second += 1
-
-	default:
-		// Too much delay, let's update the last timestamp to current one.
-		lastTimestamp = currentTimestamp
-		intlog.Printf(
-			context.Background(),
-			`too much delay, last "%d", current "%d"`,
-			lastTimestamp, currentTimestamp,
-		)
-	}
-	second %= 60
-	s.lastTimestamp.Set(lastTimestamp)
-	return second
-}
-
 // Next returns the next time this schedule is activated, greater than the given
 // time.  If no time can be found to satisfy the schedule, return the zero time.
 func (s *cronSchedule) Next(t time.Time) time.Time {
-	if s.every != 0 {
-		diff := t.Unix() - s.create
-		cnt := diff/s.every + 1
-		return t.Add(time.Duration(cnt*s.every) * time.Second)
+	if s.everySeconds != 0 {
+		var (
+			diff  = t.Unix() - s.createTimestamp
+			count = diff/s.everySeconds + 1
+		)
+		return t.Add(time.Duration(count*s.everySeconds) * time.Second)
 	}
 
 	// Start at the earliest possible time (the upcoming second).
@@ -355,7 +326,7 @@ WRAP:
 		return t // who will care the job that run in five years later
 	}
 
-	for !s.match(s.month, int(t.Month())) {
+	for !s.match(s.monthMap, int(t.Month())) {
 		if !added {
 			added = true
 			t = time.Date(t.Year(), t.Month(), 1, 0, 0, 0, 0, loc)
@@ -387,7 +358,7 @@ WRAP:
 			goto WRAP
 		}
 	}
-	for !s.match(s.hour, t.Hour()) {
+	for !s.match(s.hourMap, t.Hour()) {
 		if !added {
 			added = true
 			t = time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), 0, 0, 0, loc)
@@ -398,7 +369,7 @@ WRAP:
 			goto WRAP
 		}
 	}
-	for !s.match(s.minute, t.Minute()) {
+	for !s.match(s.minuteMap, t.Minute()) {
 		if !added {
 			added = true
 			t = t.Truncate(time.Minute)
@@ -409,7 +380,7 @@ WRAP:
 			goto WRAP
 		}
 	}
-	for !s.match(s.second, t.Second()) {
+	for !s.match(s.secondMap, t.Second()) {
 		if !added {
 			added = true
 			t = t.Truncate(time.Second)
@@ -425,8 +396,8 @@ WRAP:
 // dayMatches returns true if the schedule's day-of-week and day-of-month
 // restrictions are satisfied by the given time.
 func (s *cronSchedule) dayMatches(t time.Time) bool {
-	_, ok1 := s.day[t.Day()]
-	_, ok2 := s.week[int(t.Weekday())]
+	_, ok1 := s.dayMap[t.Day()]
+	_, ok2 := s.weekMap[int(t.Weekday())]
 	return ok1 && ok2
 }
 

os/gcron/gcron_schedule_fix.go

@@ -0,0 +1,53 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gcron
+
+import (
+	"context"
+	"time"
+
+	"github.com/gogf/gf/v2/internal/intlog"
+)
+
+// getFixedSecond checks, fixes and returns the seconds that have delay fix in some seconds.
+// Reference: https://github.com/golang/go/issues/14410
+func (s *cronSchedule) getFixedSecond(ctx context.Context, t time.Time) int {
+	return (t.Second() + s.getFixedTimestampDelta(ctx, t)) % 60
+}
+
+// getFixedTimestampDelta checks, fixes and returns the timestamp delta that have delay fix in some seconds.
+// The tolerated timestamp delay is `3` seconds in default.
+func (s *cronSchedule) getFixedTimestampDelta(ctx context.Context, t time.Time) int {
+	var (
+		currentTimestamp = t.Unix()
+		lastTimestamp    = s.lastTimestamp.Val()
+		delta            int
+	)
+	switch {
+	case
+		lastTimestamp == currentTimestamp-1:
+		lastTimestamp = currentTimestamp
+
+	case
+		lastTimestamp == currentTimestamp-2,
+		lastTimestamp == currentTimestamp-3,
+		lastTimestamp == currentTimestamp:
+		lastTimestamp += 1
+		delta = 1
+
+	default:
+		// Too much delay, let's update the last timestamp to current one.
+		intlog.Printf(
+			ctx,
+			`too much delay, last timestamp "%d", current "%d"`,
+			lastTimestamp, currentTimestamp,
+		)
+		lastTimestamp = currentTimestamp
+	}
+	s.lastTimestamp.Set(lastTimestamp)
+	return delta
+}

os/gcron/gcron_z_unit_schedule_test.go

@@ -29,7 +29,7 @@ func TestSlash(t *testing.T) {
 				t.Fatal(err)
 
 			}
-			t.AssertEQ(sched.week, c.expected)
+			t.AssertEQ(sched.weekMap, c.expected)
 		}
 	})
 

os/gcron/gcron_z_unit_test.go

@@ -88,6 +88,17 @@ func TestCron_Remove(t *testing.T) {
 }
 
 func TestCron_Add_FixedPattern(t *testing.T) {
+	//debug := utils.IsDebugEnabled()
+	//utils.SetDebugEnabled(true)
+	//defer func() {
+	//	utils.SetDebugEnabled(debug)
+	//}()
+	for i := 0; i < 5; i++ {
+		doTestCronAddFixedPattern(t)
+	}
+}
+
+func doTestCronAddFixedPattern(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var (
 			now     = time.Now()
@@ -96,6 +107,8 @@ func TestCron_Add_FixedPattern(t *testing.T) {
 			minutes = now.Minute()
 			seconds = now.Second() + 2
 		)
+		defer cron.Close()
+
 		if seconds >= 60 {
 			seconds %= 60
 			minutes++

os/gctx/gctx.go

@@ -23,8 +23,8 @@ type (
 )
 
 var (
-	// processCtx is the context initialized from process environment.
-	processCtx context.Context
+	processCtx context.Context // processCtx is the context initialized from process environment.
+	initCtx    context.Context // initCtx is the context for init function of packages.
 )
 
 func init() {
@@ -33,6 +33,9 @@ func init() {
 	i := 0
 	for _, s := range os.Environ() {
 		i = strings.IndexByte(s, '=')
+		if i == -1 {
+			continue
+		}
 		m[s[0:i]] = s[i+1:]
 	}
 	// OpenTelemetry from environments.
@@ -40,6 +43,8 @@ func init() {
 		context.Background(),
 		propagation.MapCarrier(m),
 	)
+	// Initialize initialization context.
+	initCtx = New()
 }
 
 // New creates and returns a context which contains context id.
@@ -64,3 +69,14 @@ func WithCtx(ctx context.Context) context.Context {
 func CtxId(ctx context.Context) string {
 	return gtrace.GetTraceID(ctx)
 }
+
+// SetInitCtx sets custom initialization context.
+// Note that this function cannot be called in multiple goroutines.
+func SetInitCtx(ctx context.Context) {
+	initCtx = ctx
+}
+
+// GetInitCtx returns the initialization context.
+func GetInitCtx() context.Context {
+	return initCtx
+}

os/gctx/gctx_z_unit_test.go

@@ -30,3 +30,12 @@ func Test_WithCtx(t *testing.T) {
 		t.Assert(ctx.Value("TEST"), 1)
 	})
 }
+
+func Test_SetInitCtx(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		ctx := context.WithValue(context.TODO(), "TEST", 1)
+		gctx.SetInitCtx(ctx)
+		t.AssertNE(gctx.GetInitCtx(), "")
+		t.Assert(gctx.GetInitCtx().Value("TEST"), 1)
+	})
+}

os/gfsnotify/gfsnotify.go

@@ -56,6 +56,9 @@ type Event struct {
 // Op is the bits union for file operations.
 type Op uint32
 
+// internalPanic is the custom panic for internal usage.
+type internalPanic string
+
 const (
 	CREATE Op = 1 << iota
 	WRITE
@@ -65,8 +68,8 @@ const (
 )
 
 const (
-	repeatEventFilterDuration = time.Millisecond // Duration for repeated event filter.
-	callbackExitEventPanicStr = "exit"           // Custom exit event for internal usage.
+	repeatEventFilterDuration               = time.Millisecond // Duration for repeated event filter.
+	callbackExitEventPanicStr internalPanic = "exit"           // Custom exit event for internal usage.
 )
 
 var (

os/glog/glog_logger.go

@@ -136,56 +136,55 @@ func (l *Logger) print(ctx context.Context, level int, stack string, values ...i
 	}
 	input.handlers = append(input.handlers, defaultPrintHandler)
 
-	if l.config.HeaderPrint {
-		// Time.
-		timeFormat := ""
-		if l.config.Flags&F_TIME_DATE > 0 {
-			timeFormat += "2006-01-02"
+	// Time.
+	timeFormat := ""
+	if l.config.Flags&F_TIME_DATE > 0 {
+		timeFormat += "2006-01-02"
+	}
+	if l.config.Flags&F_TIME_TIME > 0 {
+		if timeFormat != "" {
+			timeFormat += " "
 		}
-		if l.config.Flags&F_TIME_TIME > 0 {
-			if timeFormat != "" {
-				timeFormat += " "
-			}
-			timeFormat += "15:04:05"
-		}
-		if l.config.Flags&F_TIME_MILLI > 0 {
-			if timeFormat != "" {
-				timeFormat += " "
-			}
-			timeFormat += "15:04:05.000"
-		}
-		if len(timeFormat) > 0 {
-			input.TimeFormat = now.Format(timeFormat)
+		timeFormat += "15:04:05"
+	}
+	if l.config.Flags&F_TIME_MILLI > 0 {
+		if timeFormat != "" {
+			timeFormat += " "
 		}
+		timeFormat += "15:04:05.000"
+	}
+	if len(timeFormat) > 0 {
+		input.TimeFormat = now.Format(timeFormat)
+	}
 
-		// Level string.
-		input.LevelFormat = l.GetLevelPrefix(level)
+	// Level string.
+	input.LevelFormat = l.GetLevelPrefix(level)
 
-		// Caller path and Fn name.
-		if l.config.Flags&(F_FILE_LONG|F_FILE_SHORT|F_CALLER_FN) > 0 {
-			callerFnName, path, line := gdebug.CallerWithFilter(
-				[]string{utils.StackFilterKeyForGoFrame},
-				l.config.StSkip,
-			)
-			if l.config.Flags&F_CALLER_FN > 0 {
-				if len(callerFnName) > 2 {
-					input.CallerFunc = fmt.Sprintf(`[%s]`, callerFnName)
-				}
-			}
-			if line >= 0 && len(path) > 1 {
-				if l.config.Flags&F_FILE_LONG > 0 {
-					input.CallerPath = fmt.Sprintf(`%s:%d:`, path, line)
-				}
-				if l.config.Flags&F_FILE_SHORT > 0 {
-					input.CallerPath = fmt.Sprintf(`%s:%d:`, gfile.Basename(path), line)
-				}
+	// Caller path and Fn name.
+	if l.config.Flags&(F_FILE_LONG|F_FILE_SHORT|F_CALLER_FN) > 0 {
+		callerFnName, path, line := gdebug.CallerWithFilter(
+			[]string{utils.StackFilterKeyForGoFrame},
+			l.config.StSkip,
+		)
+		if l.config.Flags&F_CALLER_FN > 0 {
+			if len(callerFnName) > 2 {
+				input.CallerFunc = fmt.Sprintf(`[%s]`, callerFnName)
 			}
 		}
-		// Prefix.
-		if len(l.config.Prefix) > 0 {
-			input.Prefix = l.config.Prefix
+		if line >= 0 && len(path) > 1 {
+			if l.config.Flags&F_FILE_LONG > 0 {
+				input.CallerPath = fmt.Sprintf(`%s:%d:`, path, line)
+			}
+			if l.config.Flags&F_FILE_SHORT > 0 {
+				input.CallerPath = fmt.Sprintf(`%s:%d:`, gfile.Basename(path), line)
+			}
 		}
 	}
+	// Prefix.
+	if len(l.config.Prefix) > 0 {
+		input.Prefix = l.config.Prefix
+	}
+
 	// Convert value to string.
 	if ctx != nil {
 		// Tracing values.

os/glog/glog_logger_handler.go

@@ -81,17 +81,19 @@ func (in *HandlerInput) String(withColor ...bool) string {
 
 func (in *HandlerInput) getDefaultBuffer(withColor bool) *bytes.Buffer {
 	buffer := bytes.NewBuffer(nil)
-	if in.TimeFormat != "" {
-		buffer.WriteString(in.TimeFormat)
-	}
-	if in.LevelFormat != "" {
-		var levelStr = "[" + in.LevelFormat + "]"
-		if withColor {
-			in.addStringToBuffer(buffer, in.Logger.getColoredStr(
-				in.Logger.getColorByLevel(in.Level), levelStr,
-			))
-		} else {
-			in.addStringToBuffer(buffer, levelStr)
+	if in.Logger.config.HeaderPrint {
+		if in.TimeFormat != "" {
+			buffer.WriteString(in.TimeFormat)
+		}
+		if in.LevelFormat != "" {
+			var levelStr = "[" + in.LevelFormat + "]"
+			if withColor {
+				in.addStringToBuffer(buffer, in.Logger.getColoredStr(
+					in.Logger.getColorByLevel(in.Level), levelStr,
+				))
+			} else {
+				in.addStringToBuffer(buffer, levelStr)
+			}
 		}
 	}
 	if in.TraceId != "" {
@@ -100,14 +102,16 @@ func (in *HandlerInput) getDefaultBuffer(withColor bool) *bytes.Buffer {
 	if in.CtxStr != "" {
 		in.addStringToBuffer(buffer, "{"+in.CtxStr+"}")
 	}
-	if in.Prefix != "" {
-		in.addStringToBuffer(buffer, in.Prefix)
-	}
-	if in.CallerFunc != "" {
-		in.addStringToBuffer(buffer, in.CallerFunc)
-	}
-	if in.CallerPath != "" {
-		in.addStringToBuffer(buffer, in.CallerPath)
+	if in.Logger.config.HeaderPrint {
+		if in.Prefix != "" {
+			in.addStringToBuffer(buffer, in.Prefix)
+		}
+		if in.CallerFunc != "" {
+			in.addStringToBuffer(buffer, in.CallerFunc)
+		}
+		if in.CallerPath != "" {
+			in.addStringToBuffer(buffer, in.CallerPath)
+		}
 	}
 	if in.Content != "" {
 		if in.Stack != "" {

os/gtimer/gtimer.go

@@ -44,14 +44,17 @@ type TimerOptions struct {
 	Interval time.Duration // Interval is the interval escaped of the timer.
 }
 
+// internalPanic is the custom panic for internal usage.
+type internalPanic string
+
 const (
-	StatusReady              = 0                    // Job or Timer is ready for running.
-	StatusRunning            = 1                    // Job or Timer is already running.
-	StatusStopped            = 2                    // Job or Timer is stopped.
-	StatusClosed             = -1                   // Job or Timer is closed and waiting to be deleted.
-	panicExit                = "exit"               // panicExit is used for custom job exit with panic.
-	defaultTimerInterval     = "100"                // defaultTimerInterval is the default timer interval in milliseconds.
-	commandEnvKeyForInterval = "gf.gtimer.interval" // commandEnvKeyForInterval is the key for command argument or environment configuring default interval duration for timer.
+	StatusReady                            = 0                    // Job or Timer is ready for running.
+	StatusRunning                          = 1                    // Job or Timer is already running.
+	StatusStopped                          = 2                    // Job or Timer is stopped.
+	StatusClosed                           = -1                   // Job or Timer is closed and waiting to be deleted.
+	panicExit                internalPanic = "exit"               // panicExit is used for custom job exit with panic.
+	defaultTimerInterval                   = "100"                // defaultTimerInterval is the default timer interval in milliseconds.
+	commandEnvKeyForInterval               = "gf.gtimer.interval" // commandEnvKeyForInterval is the key for command argument or environment configuring default interval duration for timer.
 )
 
 var (
@@ -154,11 +157,3 @@ func DelayAddOnce(ctx context.Context, delay time.Duration, interval time.Durati
 func DelayAddTimes(ctx context.Context, delay time.Duration, interval time.Duration, times int, job JobFunc) {
 	defaultTimer.DelayAddTimes(ctx, delay, interval, times, job)
 }
-
-// Exit is used in timing job internally, which exits and marks it closed from timer.
-// The timing job will be automatically removed from timer later. It uses "panic-recover"
-// mechanism internally implementing this feature, which is designed for simplification
-// and convenience.
-func Exit() {
-	panic(panicExit)
-}

os/gtimer/gtimer_exit.go

@@ -0,0 +1,15 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gtimer
+
+// Exit is used in timing job internally, which exits and marks it closed from timer.
+// The timing job will be automatically removed from timer later. It uses "panic-recover"
+// mechanism internally implementing this feature, which is designed for simplification
+// and convenience.
+func Exit() {
+	panic(panicExit)
+}

os/gtimer/gtimer_z_unit_entry_test.go

@@ -20,7 +20,7 @@ import (
 
 func TestJob_Start_Stop_Close(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		job := timer.Add(ctx, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -43,7 +43,7 @@ func TestJob_Start_Stop_Close(t *testing.T) {
 
 func TestJob_Singleton(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		job := timer.Add(ctx, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -62,7 +62,7 @@ func TestJob_Singleton(t *testing.T) {
 
 func TestJob_SetTimes(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		job := timer.Add(ctx, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -76,7 +76,7 @@ func TestJob_SetTimes(t *testing.T) {
 
 func TestJob_Run(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		job := timer.Add(ctx, 1000*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)

os/gtimer/gtimer_z_unit_test.go

@@ -94,12 +94,12 @@ func TestDelayAdd(t *testing.T) {
 func TestDelayAddEntry(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		array := garray.New(true)
-		gtimer.DelayAddEntry(ctx, 200*time.Millisecond, 200*time.Millisecond, func(ctx context.Context) {
+		gtimer.DelayAddEntry(ctx, 500*time.Millisecond, 500*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
 		}, false, 2, gtimer.StatusReady)
-		time.Sleep(300 * time.Millisecond)
+		time.Sleep(500 * time.Millisecond)
 		t.Assert(array.Len(), 0)
-		time.Sleep(1000 * time.Millisecond)
+		time.Sleep(2000 * time.Millisecond)
 		t.Assert(array.Len(), 2)
 	})
 }

os/gtimer/gtimer_z_unit_timer_test.go

@@ -18,13 +18,9 @@ import (
 	"github.com/gogf/gf/v2/test/gtest"
 )
 
-func New() *gtimer.Timer {
-	return gtimer.New()
-}
-
 func TestTimer_Add_Close(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		//fmt.Println("start", time.Now())
 		timer.Add(ctx, 200*time.Millisecond, func(ctx context.Context) {
@@ -53,7 +49,7 @@ func TestTimer_Add_Close(t *testing.T) {
 
 func TestTimer_Start_Stop_Close(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.Add(ctx, 1000*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -75,7 +71,7 @@ func TestTimer_Start_Stop_Close(t *testing.T) {
 
 func TestJob_Reset(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		job := timer.AddSingleton(ctx, 500*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -93,7 +89,7 @@ func TestJob_Reset(t *testing.T) {
 
 func TestTimer_AddSingleton(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.AddSingleton(ctx, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -109,7 +105,7 @@ func TestTimer_AddSingleton(t *testing.T) {
 
 func TestTimer_AddOnce(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.AddOnce(ctx, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -131,7 +127,7 @@ func TestTimer_AddOnce(t *testing.T) {
 
 func TestTimer_AddTimes(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.AddTimes(ctx, 200*time.Millisecond, 2, func(ctx context.Context) {
 			array.Append(1)
@@ -143,7 +139,7 @@ func TestTimer_AddTimes(t *testing.T) {
 
 func TestTimer_DelayAdd(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.DelayAdd(ctx, 200*time.Millisecond, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -157,7 +153,7 @@ func TestTimer_DelayAdd(t *testing.T) {
 
 func TestTimer_DelayAddJob(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.DelayAddEntry(ctx, 200*time.Millisecond, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -171,7 +167,7 @@ func TestTimer_DelayAddJob(t *testing.T) {
 
 func TestTimer_DelayAddSingleton(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.DelayAddSingleton(ctx, 200*time.Millisecond, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -187,7 +183,7 @@ func TestTimer_DelayAddSingleton(t *testing.T) {
 
 func TestTimer_DelayAddOnce(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.DelayAddOnce(ctx, 200*time.Millisecond, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)
@@ -205,7 +201,7 @@ func TestTimer_DelayAddOnce(t *testing.T) {
 
 func TestTimer_DelayAddTimes(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.DelayAddTimes(ctx, 200*time.Millisecond, 500*time.Millisecond, 2, func(ctx context.Context) {
 			array.Append(1)
@@ -246,24 +242,21 @@ func TestTimer_AddLessThanInterval(t *testing.T) {
 
 func TestTimer_AddLeveledJob1(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
-		//glog.Print("start")
 		timer.DelayAdd(ctx, 1000*time.Millisecond, 1000*time.Millisecond, func(ctx context.Context) {
-			//glog.Print("add")
 			array.Append(1)
 		})
 		time.Sleep(1500 * time.Millisecond)
 		t.Assert(array.Len(), 0)
 		time.Sleep(1300 * time.Millisecond)
-		//glog.Print("check")
 		t.Assert(array.Len(), 1)
 	})
 }
 
 func TestTimer_Exit(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		timer := New()
+		timer := gtimer.New()
 		array := garray.New(true)
 		timer.Add(ctx, 200*time.Millisecond, func(ctx context.Context) {
 			array.Append(1)

os/gview/gview_z_unit_test.go

@@ -501,6 +501,12 @@ func Test_BuildInFuncPlus(t *testing.T) {
 		t.AssertNil(err)
 		t.Assert(r, `6`)
 	})
+	gtest.C(t, func(t *gtest.T) {
+		v := gview.New()
+		r, err := v.ParseContent(gctx.New(), "{{1| plus 2}}")
+		t.AssertNil(err)
+		t.Assert(r, `3`)
+	})
 }
 
 func Test_BuildInFuncMinus(t *testing.T) {
@@ -510,6 +516,12 @@ func Test_BuildInFuncMinus(t *testing.T) {
 		t.AssertNil(err)
 		t.Assert(r, `-4`)
 	})
+	gtest.C(t, func(t *gtest.T) {
+		v := gview.New()
+		r, err := v.ParseContent(gctx.New(), "{{2 | minus 3}}")
+		t.AssertNil(err)
+		t.Assert(r, `1`)
+	})
 }
 
 func Test_BuildInFuncTimes(t *testing.T) {
@@ -519,6 +531,12 @@ func Test_BuildInFuncTimes(t *testing.T) {
 		t.AssertNil(err)
 		t.Assert(r, `24`)
 	})
+	gtest.C(t, func(t *gtest.T) {
+		v := gview.New()
+		r, err := v.ParseContent(gctx.New(), "{{2 | times 3}}")
+		t.AssertNil(err)
+		t.Assert(r, `6`)
+	})
 }
 
 func Test_BuildInFuncDivide(t *testing.T) {
@@ -528,6 +546,12 @@ func Test_BuildInFuncDivide(t *testing.T) {
 		t.AssertNil(err)
 		t.Assert(r, `2`)
 	})
+	gtest.C(t, func(t *gtest.T) {
+		v := gview.New()
+		r, err := v.ParseContent(gctx.New(), "{{2 | divide 4}}")
+		t.AssertNil(err)
+		t.Assert(r, `2`)
+	})
 }
 
 func Test_Issue1416(t *testing.T) {

text/gstr/gstr_convert.go

@@ -162,7 +162,7 @@ func Nl2Br(str string, isXhtml ...bool) string {
 		}
 		switch v {
 		case n, r:
-			if (i+1 < length) && (v == r && runes[i+1] == n) || (v == n && runes[i+1] == r) {
+			if (i+1 < length) && ((v == r && runes[i+1] == n) || (v == n && runes[i+1] == r)) {
 				buf.Write(br)
 				skip = true
 				continue

util/gconv/gconv_int.go

@@ -7,6 +7,7 @@
 package gconv
 
 import (
+	"math"
 	"strconv"
 
 	"github.com/gogf/gf/v2/encoding/gbinary"
@@ -126,6 +127,10 @@ func Int64(any interface{}) int64 {
 			return v
 		}
 		// Float64
-		return int64(Float64(value))
+		if valueInt64 := Float64(value); math.IsNaN(valueInt64) {
+			return 0
+		} else {
+			return int64(valueInt64)
+		}
 	}
 }

util/gconv/gconv_uint.go

@@ -7,6 +7,7 @@
 package gconv
 
 import (
+	"math"
 	"strconv"
 
 	"github.com/gogf/gf/v2/encoding/gbinary"
@@ -109,6 +110,10 @@ func Uint64(any interface{}) uint64 {
 			return v
 		}
 		// Float64
-		return uint64(Float64(value))
+		if valueFloat64 := Float64(value); math.IsNaN(valueFloat64) {
+			return 0
+		} else {
+			return uint64(valueFloat64)
+		}
 	}
 }

util/gconv/gconv_z_unit_all_test.go

@@ -7,6 +7,7 @@
 package gconv_test
 
 import (
+	"math"
 	"testing"
 	"time"
 
@@ -199,6 +200,7 @@ func Test_Int_All(t *testing.T) {
 		t.AssertEQ(gconv.Int(123.456), 123)
 		t.AssertEQ(gconv.Int(boolStruct{}), 0)
 		t.AssertEQ(gconv.Int(&boolStruct{}), 0)
+		t.AssertEQ(gconv.Int("NaN"), 0)
 	})
 }
 
@@ -233,6 +235,8 @@ func Test_Int8_All(t *testing.T) {
 		t.AssertEQ(gconv.Int8(123.456), int8(123))
 		t.AssertEQ(gconv.Int8(boolStruct{}), int8(0))
 		t.AssertEQ(gconv.Int8(&boolStruct{}), int8(0))
+		t.AssertEQ(gconv.Int8("NaN"), int8(0))
+
 	})
 }
 
@@ -267,6 +271,7 @@ func Test_Int16_All(t *testing.T) {
 		t.AssertEQ(gconv.Int16(123.456), int16(123))
 		t.AssertEQ(gconv.Int16(boolStruct{}), int16(0))
 		t.AssertEQ(gconv.Int16(&boolStruct{}), int16(0))
+		t.AssertEQ(gconv.Int16("NaN"), int16(0))
 	})
 }
 
@@ -301,6 +306,7 @@ func Test_Int32_All(t *testing.T) {
 		t.AssertEQ(gconv.Int32(123.456), int32(123))
 		t.AssertEQ(gconv.Int32(boolStruct{}), int32(0))
 		t.AssertEQ(gconv.Int32(&boolStruct{}), int32(0))
+		t.AssertEQ(gconv.Int32("NaN"), int32(0))
 	})
 }
 
@@ -355,6 +361,7 @@ func Test_Int64_All(t *testing.T) {
 		t.AssertEQ(gconv.Int64(123.456), int64(123))
 		t.AssertEQ(gconv.Int64(boolStruct{}), int64(0))
 		t.AssertEQ(gconv.Int64(&boolStruct{}), int64(0))
+		t.AssertEQ(gconv.Int64("NaN"), int64(0))
 	})
 }
 
@@ -390,6 +397,7 @@ func Test_Uint_All(t *testing.T) {
 		t.AssertEQ(gconv.Uint(123.456), uint(123))
 		t.AssertEQ(gconv.Uint(boolStruct{}), uint(0))
 		t.AssertEQ(gconv.Uint(&boolStruct{}), uint(0))
+		t.AssertEQ(gconv.Uint("NaN"), uint(0))
 	})
 }
 
@@ -425,6 +433,7 @@ func Test_Uint8_All(t *testing.T) {
 		t.AssertEQ(gconv.Uint8(123.456), uint8(123))
 		t.AssertEQ(gconv.Uint8(boolStruct{}), uint8(0))
 		t.AssertEQ(gconv.Uint8(&boolStruct{}), uint8(0))
+		t.AssertEQ(gconv.Uint8("NaN"), uint8(0))
 	})
 }
 
@@ -460,6 +469,7 @@ func Test_Uint16_All(t *testing.T) {
 		t.AssertEQ(gconv.Uint16(123.456), uint16(123))
 		t.AssertEQ(gconv.Uint16(boolStruct{}), uint16(0))
 		t.AssertEQ(gconv.Uint16(&boolStruct{}), uint16(0))
+		t.AssertEQ(gconv.Uint16("NaN"), uint16(0))
 	})
 }
 
@@ -495,6 +505,7 @@ func Test_Uint32_All(t *testing.T) {
 		t.AssertEQ(gconv.Uint32(123.456), uint32(123))
 		t.AssertEQ(gconv.Uint32(boolStruct{}), uint32(0))
 		t.AssertEQ(gconv.Uint32(&boolStruct{}), uint32(0))
+		t.AssertEQ(gconv.Uint32("NaN"), uint32(0))
 	})
 }
 
@@ -549,6 +560,7 @@ func Test_Uint64_All(t *testing.T) {
 		t.AssertEQ(gconv.Uint64(123.456), uint64(123))
 		t.AssertEQ(gconv.Uint64(boolStruct{}), uint64(0))
 		t.AssertEQ(gconv.Uint64(&boolStruct{}), uint64(0))
+		t.AssertEQ(gconv.Uint64("NaN"), uint64(0))
 	})
 }
 
@@ -583,6 +595,7 @@ func Test_Float32_All(t *testing.T) {
 		t.AssertEQ(gconv.Float32(123.456), float32(123.456))
 		t.AssertEQ(gconv.Float32(boolStruct{}), float32(0))
 		t.AssertEQ(gconv.Float32(&boolStruct{}), float32(0))
+		t.AssertEQ(gconv.Float32("NaN"), float32(math.NaN()))
 	})
 }
 
@@ -617,6 +630,7 @@ func Test_Float64_All(t *testing.T) {
 		t.AssertEQ(gconv.Float64(123.456), float64(123.456))
 		t.AssertEQ(gconv.Float64(boolStruct{}), float64(0))
 		t.AssertEQ(gconv.Float64(&boolStruct{}), float64(0))
+		t.AssertEQ(gconv.Float64("NaN"), float64(math.NaN()))
 	})
 }
 

util/gutil/gutil.go

@@ -42,7 +42,7 @@ func Try(ctx context.Context, try func(ctx context.Context)) (err error) {
 }
 
 // TryCatch implements try...catch... logistics using internal panic...recover.
-// It automatically calls function `catch` if any exception occurs ans passes the exception as an error.
+// It automatically calls function `catch` if any exception occurs and passes the exception as an error.
 func TryCatch(ctx context.Context, try func(ctx context.Context), catch ...func(ctx context.Context, exception error)) {
 	defer func() {
 		if exception := recover(); exception != nil && len(catch) > 0 {

util/gvalid/gvalid_validator_check_map.go

@@ -93,7 +93,8 @@ func (v *Validator) doCheckMap(ctx context.Context, params interface{}) Error {
 	)
 
 	// It checks the struct recursively if its attribute is an embedded struct.
-	// Ignore inputParamMap, rules and messages from parent.
+	// Ignore inputParamMap, assoc, rules and messages from parent.
+	validator.assoc = nil
 	validator.rules = nil
 	validator.messages = nil
 	for _, item := range inputParamMap {

util/gvalid/gvalid_validator_check_value.go

@@ -557,11 +557,20 @@ func (v *Validator) doCheckValueRecursively(ctx context.Context, in doCheckValue
 		})
 
 	case reflect.Struct:
-		// Ignore data, rules and messages from parent.
-		validator := v.Clone()
+		// Ignore data, assoc, rules and messages from parent.
+		var (
+			validator           = v.Clone()
+			toBeValidatedObject interface{}
+		)
+		if in.Type.Kind() == reflect.Ptr {
+			toBeValidatedObject = reflect.New(in.Type.Elem()).Interface()
+		} else {
+			toBeValidatedObject = reflect.New(in.Type).Interface()
+		}
+		validator.assoc = nil
 		validator.rules = nil
 		validator.messages = nil
-		if err := validator.Data(reflect.New(in.Type).Interface()).Assoc(in.Value).Run(ctx); err != nil {
+		if err := validator.Data(toBeValidatedObject).Assoc(in.Value).Run(ctx); err != nil {
 			// It merges the errors into single error map.
 			for k, m := range err.(*validationError).errors {
 				in.ErrorMaps[k] = m

util/gvalid/gvalid_z_unit_feature_recursive_test.go

@@ -341,3 +341,83 @@ func Test_CheckStruct_Recursively_MapAttribute(t *testing.T) {
 		t.Assert(err, `Student Name is required`)
 	})
 }
+
+// https://github.com/gogf/gf/issues/1983
+func Test_Issue1983(t *testing.T) {
+	// Error as the attribute Student in Teacher is a initialized struct, which has default value.
+	gtest.C(t, func(t *gtest.T) {
+		type Student struct {
+			Name string `v:"required"`
+			Age  int
+		}
+		type Teacher struct {
+			Students Student
+		}
+		var (
+			teacher = Teacher{}
+			data    = g.Map{
+				"students": nil,
+			}
+		)
+		err := g.Validator().Assoc(data).Data(teacher).Run(ctx)
+		t.Assert(err, `The Name field is required`)
+	})
+	// The same as upper, it is not affected by association values.
+	gtest.C(t, func(t *gtest.T) {
+		type Student struct {
+			Name string `v:"required"`
+			Age  int
+		}
+		type Teacher struct {
+			Students Student
+		}
+		var (
+			teacher = Teacher{}
+			data    = g.Map{
+				"name":     "john",
+				"students": nil,
+			}
+		)
+		err := g.Validator().Assoc(data).Data(teacher).Run(ctx)
+		t.Assert(err, `The Name field is required`)
+	})
+	gtest.C(t, func(t *gtest.T) {
+		type Student struct {
+			Name string `v:"required"`
+			Age  int
+		}
+		type Teacher struct {
+			Students *Student
+		}
+		var (
+			teacher = Teacher{}
+			data    = g.Map{
+				"students": nil,
+			}
+		)
+		err := g.Validator().Assoc(data).Data(teacher).Run(ctx)
+		t.AssertNil(err)
+	})
+}
+
+// https://github.com/gogf/gf/issues/1921
+func Test_Issue1921(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		type SearchOption struct {
+			Size int `v:"max:100"`
+		}
+		type SearchReq struct {
+			Option *SearchOption `json:"option,omitempty"`
+		}
+
+		var (
+			req = SearchReq{
+				Option: &SearchOption{
+					Size: 10000,
+				},
+			}
+		)
+		err := g.Validator().Data(req).Run(ctx)
+		t.Assert(err, "The Size value `10000` must be equal or lesser than 100")
+	})
+}

version.go

@@ -1,4 +1,4 @@
 package gf
 
-const VERSION = "v2.1.2"
+const VERSION = "v2.1.4"
 const AUTHORS = "john<john@goframe.org>"