Merge branch 'master' of https://github.com/gogf/gf

.github/workflows/apollo/docker-compose.yml

@@ -1,42 +0,0 @@
-version: '2'
-
-services:
-  apollo-quick-start:
-    image: "loads/apollo-quick-start:latest"
-    container_name: apollo-quick-start
-    depends_on:
-      - apollo-db
-    ports:
-      - "8080:8080"
-      - "8070:8070"
-      - "8060:8060"
-    links:
-      - apollo-db
-    #environment:
-      #JAVA_OPTS: '-Xms100m -Xmx1000m -Xmn100m -Xss256k -XX:MetaspaceSize=10m -XX:MaxMetaspaceSize=250m'
-      #APOLLO_CONFIG_DB_USERNAME: 'root'
-      #APOLLO_CONFIG_DB_PASSWORD: 'apollo'
-      #APOLLO_PORTAL_DB_USERNAME: 'root'
-      #APOLLO_PORTAL_DB_PASSWORD: 'apollo'
-
-  apollo-db:
-    image: "loads/mysql:5.7"
-    container_name: apollo-db
-    environment:
-      TZ: Asia/Shanghai
-      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-      #MYSQL_ROOT_PASSWORD: 'apollo'
-    depends_on:
-      - apollo-dbdata
-    ports:
-      - "13306:3306"
-    volumes:
-      - ./sql:/docker-entrypoint-initdb.d
-    volumes_from:
-      - apollo-dbdata
-
-  apollo-dbdata:
-    image: "loads/alpine:3.8"
-    container_name: apollo-dbdata
-    volumes:
-      - /var/lib/mysql

.github/workflows/apollo/sql/apolloconfigdb.sql

@@ -1,467 +0,0 @@
---
--- Copyright 2022 Apollo Authors
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
-# Create Database
-# ------------------------------------------------------------
-CREATE DATABASE IF NOT EXISTS ApolloConfigDB DEFAULT CHARACTER SET = utf8mb4;
-
-Use ApolloConfigDB;
-
-# Dump of table app
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `App`;
-
-CREATE TABLE `App` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
-  `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
-  `OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
-  `OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
-  `OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_DeletedAt` (`AppId`,`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_Name` (`Name`(191))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用表';
-
-
-
-# Dump of table appnamespace
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `AppNamespace`;
-
-CREATE TABLE `AppNamespace` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
-  `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
-  `Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT 'namespace的format类型',
-  `IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
-  `Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_Name_DeletedAt` (`AppId`,`Name`,`DeletedAt`),
-  KEY `Name_AppId` (`Name`,`AppId`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用namespace定义';
-
-
-
-# Dump of table audit
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Audit`;
-
-CREATE TABLE `Audit` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `EntityName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '表名',
-  `EntityId` int(10) unsigned DEFAULT NULL COMMENT '记录ID',
-  `OpName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '操作类型',
-  `Comment` varchar(500) DEFAULT NULL COMMENT '备注',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='日志审计表';
-
-
-
-# Dump of table cluster
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Cluster`;
-
-CREATE TABLE `Cluster` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `Name` varchar(32) NOT NULL DEFAULT '' COMMENT '集群名字',
-  `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'App id',
-  `ParentClusterId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '父cluster',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_Name_DeletedAt` (`AppId`,`Name`,`DeletedAt`),
-  KEY `IX_ParentClusterId` (`ParentClusterId`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集群';
-
-
-
-# Dump of table commit
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Commit`;
-
-CREATE TABLE `Commit` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `ChangeSets` longtext NOT NULL COMMENT '修改变更集',
-  `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
-  `Comment` varchar(500) DEFAULT NULL COMMENT '备注',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `AppId` (`AppId`(191)),
-  KEY `ClusterName` (`ClusterName`(191)),
-  KEY `NamespaceName` (`NamespaceName`(191))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='commit 历史表';
-
-# Dump of table grayreleaserule
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `GrayReleaseRule`;
-
-CREATE TABLE `GrayReleaseRule` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
-  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
-  `BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'branch name',
-  `Rules` varchar(16000) DEFAULT '[]' COMMENT '灰度规则',
-  `ReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '灰度对应的release',
-  `BranchStatus` tinyint(2) DEFAULT '1' COMMENT '灰度分支状态: 0:删除分支,1:正在使用的规则 2：全量发布',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='灰度规则表';
-
-
-# Dump of table instance
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Instance`;
-
-CREATE TABLE `Instance` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `DataCenter` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Data Center Name',
-  `Ip` varchar(32) NOT NULL DEFAULT '' COMMENT 'instance ip',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `IX_UNIQUE_KEY` (`AppId`,`ClusterName`,`Ip`,`DataCenter`),
-  KEY `IX_IP` (`Ip`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='使用配置的应用实例';
-
-
-
-# Dump of table instanceconfig
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `InstanceConfig`;
-
-CREATE TABLE `InstanceConfig` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `InstanceId` int(11) unsigned DEFAULT NULL COMMENT 'Instance Id',
-  `ConfigAppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Config App Id',
-  `ConfigClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config Cluster Name',
-  `ConfigNamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config Namespace Name',
-  `ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
-  `ReleaseDeliveryTime` timestamp NULL DEFAULT NULL COMMENT '配置获取时间',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `IX_UNIQUE_KEY` (`InstanceId`,`ConfigAppId`,`ConfigNamespaceName`),
-  KEY `IX_ReleaseKey` (`ReleaseKey`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_Valid_Namespace` (`ConfigAppId`,`ConfigClusterName`,`ConfigNamespaceName`,`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用实例的配置信息';
-
-
-
-# Dump of table item
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Item`;
-
-CREATE TABLE `Item` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `NamespaceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
-  `Key` varchar(128) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
-  `Value` longtext NOT NULL COMMENT '配置项值',
-  `Comment` varchar(1024) DEFAULT '' COMMENT '注释',
-  `LineNum` int(10) unsigned DEFAULT '0' COMMENT '行号',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  KEY `IX_GroupId` (`NamespaceId`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置项目';
-
-
-
-# Dump of table namespace
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Namespace`;
-
-CREATE TABLE `Namespace` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_ClusterName_NamespaceName_DeletedAt` (`AppId`(191),`ClusterName`(191),`NamespaceName`(191),`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_NamespaceName` (`NamespaceName`(191))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='命名空间';
-
-
-
-# Dump of table namespacelock
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `NamespaceLock`;
-
-CREATE TABLE `NamespaceLock` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
-  `NamespaceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  `IsDeleted` bit(1) DEFAULT b'0' COMMENT '软删除',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_NamespaceId_DeletedAt` (`NamespaceId`,`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='namespace的编辑锁';
-
-
-
-# Dump of table release
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Release`;
-
-CREATE TABLE `Release` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
-  `Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
-  `Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
-  `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
-  `Configurations` longtext NOT NULL COMMENT '发布配置',
-  `IsAbandoned` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否废弃',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_ReleaseKey_DeletedAt` (`ReleaseKey`,`DeletedAt`),
-  KEY `AppId_ClusterName_GroupName` (`AppId`(191),`ClusterName`(191),`NamespaceName`(191)),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布';
-
-
-# Dump of table releasehistory
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `ReleaseHistory`;
-
-CREATE TABLE `ReleaseHistory` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
-  `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
-  `BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT '发布分支名',
-  `ReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '关联的Release Id',
-  `PreviousReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '前一次发布的ReleaseId',
-  `Operation` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '发布类型，0: 普通发布，1: 回滚，2: 灰度发布，3: 灰度规则更新，4: 灰度合并回主分支发布，5: 主分支发布灰度自动发布，6: 主分支回滚灰度自动发布，7: 放弃灰度',
-  `OperationContext` longtext NOT NULL COMMENT '发布上下文信息',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`,`BranchName`),
-  KEY `IX_ReleaseId` (`ReleaseId`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布历史';
-
-
-# Dump of table releasemessage
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `ReleaseMessage`;
-
-CREATE TABLE `ReleaseMessage` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `Message` varchar(1024) NOT NULL DEFAULT '' COMMENT '发布的消息内容',
-  `DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_Message` (`Message`(191))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布消息';
-
-
-
-# Dump of table serverconfig
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `ServerConfig`;
-
-CREATE TABLE `ServerConfig` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
-  `Cluster` varchar(32) NOT NULL DEFAULT 'default' COMMENT '配置对应的集群，default为不针对特定的集群',
-  `Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
-  `Comment` varchar(1024) DEFAULT '' COMMENT '注释',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_Key_Cluster_DeletedAt` (`Key`,`Cluster`,`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置服务自身配置';
-
-# Dump of table accesskey
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `AccessKey`;
-
-CREATE TABLE `AccessKey` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `Secret` varchar(128) NOT NULL DEFAULT '' COMMENT 'Secret',
-  `IsEnabled` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: enabled, 0: disabled',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_Secret_DeletedAt` (`AppId`,`Secret`,`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='访问密钥';
-
-# Config
-# ------------------------------------------------------------
-INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`, `Comment`)
-VALUES
-    ('eureka.service.url', 'default', 'http://localhost:8080/eureka/', 'Eureka服务Url，多个service以英文逗号分隔'),
-    ('namespace.lock.switch', 'default', 'false', '一次发布只能有一个人修改开关'),
-    ('item.value.length.limit', 'default', '20000', 'item value最大长度限制'),
-    ('config-service.cache.enabled', 'default', 'false', 'ConfigService是否开启缓存，开启后能提高性能，但是会增大内存消耗！'),
-    ('item.key.length.limit', 'default', '128', 'item key 最大长度限制');
-
-# Sample Data
-# ------------------------------------------------------------
-INSERT INTO `App` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`)
-VALUES
-  ('SampleApp', 'Sample App', 'TEST1', '样例部门1', 'apollo', 'apollo@acme.com');
-
-INSERT INTO `AppNamespace` (`Name`, `AppId`, `Format`, `IsPublic`, `Comment`)
-VALUES
-  ('application', 'SampleApp', 'properties', 0, 'default app namespace');
-
-INSERT INTO `Cluster` (`Name`, `AppId`)
-VALUES
-  ('default', 'SampleApp');
-
-INSERT INTO `Namespace` (`Id`, `AppId`, `ClusterName`, `NamespaceName`)
-VALUES
-  (1, 'SampleApp', 'default', 'application');
-
-
-INSERT INTO `Item` VALUES (1,1,'timeout','100','sample timeout配置',1,_binary '\0',0,'default','2022-09-28 15:43:17','','2022-09-28 15:43:17'),
-                          (2,1,'','','',2,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (3,1,'server.address',':8000','',3,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (4,1,'server.dumpRouterMap','true','',4,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (5,1,'server.routeOverWrite','true','',5,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (6,1,'server.accessLogEnabled','true','',6,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (7,1,'server.openapiPath','/api.json','',7,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (8,1,'server.swaggerPath','/swagger','',8,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (9,1,'','','',9,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (10,1,'','','# Global logging.',10,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (11,1,'logger.level','all','',11,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55'),
-                          (12,1,'logger.stdout','true','',12,_binary '\0',0,'apollo','2022-09-28 15:47:55','apollo','2022-09-28 15:47:55');
-
-INSERT INTO `Release` VALUES (1,'20161009155425-d3a0749c6e20bc15','20161009155424-release','Sample发布','SampleApp','default','application','{\"timeout\":\"100\"}',_binary '\0',_binary '\0',0,'default','2022-09-28 15:59:38','','2022-09-28 15:59:38'),
-                             (2,'20220929000151-1dc5634459e19171','20220929000148-release','','SampleApp','default','application','{\"timeout\":\"100\",\"server.address\":\":8000\",\"server.dumpRouterMap\":\"true\",\"server.routeOverWrite\":\"true\",\"server.accessLogEnabled\":\"true\",\"server.openapiPath\":\"/api.json\",\"server.swaggerPath\":\"/swagger\",\"logger.level\":\"all\",\"logger.stdout\":\"true\"}',_binary '\0',_binary '\0',0,'apollo','2022-09-28 16:01:51','apollo','2022-09-28 16:01:51');
-
-INSERT INTO `ReleaseHistory` VALUES (1,'SampleApp','default','application','default',1,0,0,'{}',_binary '\0',0,'apollo','2022-09-28 15:59:38','apollo','2022-09-28 15:59:38'),
-                                    (2,'SampleApp','default','application','default',2,1,0,'{\"isEmergencyPublish\":false}',_binary '\0',0,'apollo','2022-09-28 16:01:51','apollo','2022-09-28 16:01:51');
-
-INSERT INTO `ReleaseMessage` VALUES (1,'SampleApp+default+application','2022-09-28 15:59:38'),
-                                    (2,'SampleApp+default+application','2022-09-28 16:01:51');
-
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

.github/workflows/apollo/sql/apolloportaldb.sql

@@ -1,420 +0,0 @@
---
--- Copyright 2022 Apollo Authors
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
-# Create Database
-# ------------------------------------------------------------
-CREATE DATABASE IF NOT EXISTS ApolloPortalDB DEFAULT CHARACTER SET = utf8mb4;
-
-Use ApolloPortalDB;
-
-# Dump of table app
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `App`;
-
-CREATE TABLE `App` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
-  `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
-  `OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
-  `OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
-  `OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_DeletedAt` (`AppId`,`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_Name` (`Name`(191))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用表';
-
-
-
-# Dump of table appnamespace
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `AppNamespace`;
-
-CREATE TABLE `AppNamespace` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
-  `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
-  `Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT 'namespace的format类型',
-  `IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
-  `Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_Name_DeletedAt` (`AppId`,`Name`,`DeletedAt`),
-  KEY `Name_AppId` (`Name`,`AppId`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用namespace定义';
-
-
-
-# Dump of table consumer
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Consumer`;
-
-CREATE TABLE `Consumer` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
-  `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
-  `OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
-  `OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
-  `OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_AppId_DeletedAt` (`AppId`,`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='开放API消费者';
-
-
-
-# Dump of table consumeraudit
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `ConsumerAudit`;
-
-CREATE TABLE `ConsumerAudit` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'Consumer Id',
-  `Uri` varchar(1024) NOT NULL DEFAULT '' COMMENT '访问的Uri',
-  `Method` varchar(16) NOT NULL DEFAULT '' COMMENT '访问的Method',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_ConsumerId` (`ConsumerId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer审计表';
-
-
-
-# Dump of table consumerrole
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `ConsumerRole`;
-
-CREATE TABLE `ConsumerRole` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'Consumer Id',
-  `RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_ConsumerId_RoleId_DeletedAt` (`ConsumerId`,`RoleId`,`DeletedAt`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_RoleId` (`RoleId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer和role的绑定表';
-
-
-
-# Dump of table consumertoken
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `ConsumerToken`;
-
-CREATE TABLE `ConsumerToken` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `ConsumerId` int(11) unsigned DEFAULT NULL COMMENT 'ConsumerId',
-  `Token` varchar(128) NOT NULL DEFAULT '' COMMENT 'token',
-  `Expires` datetime NOT NULL DEFAULT '2099-01-01 00:00:00' COMMENT 'token失效时间',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_Token_DeletedAt` (`Token`,`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='consumer token表';
-
-# Dump of table favorite
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Favorite`;
-
-CREATE TABLE `Favorite` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `UserId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '收藏的用户',
-  `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
-  `Position` int(32) NOT NULL DEFAULT '10000' COMMENT '收藏顺序',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_UserId_AppId_DeletedAt` (`UserId`,`AppId`,`DeletedAt`),
-  KEY `AppId` (`AppId`(191)),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COMMENT='应用收藏表';
-
-# Dump of table permission
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Permission`;
-
-CREATE TABLE `Permission` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `PermissionType` varchar(32) NOT NULL DEFAULT '' COMMENT '权限类型',
-  `TargetId` varchar(256) NOT NULL DEFAULT '' COMMENT '权限对象类型',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_TargetId_PermissionType_DeletedAt` (`TargetId`,`PermissionType`,`DeletedAt`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='permission表';
-
-
-
-# Dump of table role
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Role`;
-
-CREATE TABLE `Role` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `RoleName` varchar(256) NOT NULL DEFAULT '' COMMENT 'Role name',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_RoleName_DeletedAt` (`RoleName`,`DeletedAt`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色表';
-
-
-
-# Dump of table rolepermission
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `RolePermission`;
-
-CREATE TABLE `RolePermission` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
-  `PermissionId` int(10) unsigned DEFAULT NULL COMMENT 'Permission Id',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_RoleId_PermissionId_DeletedAt` (`RoleId`,`PermissionId`,`DeletedAt`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_PermissionId` (`PermissionId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色和权限的绑定表';
-
-
-
-# Dump of table serverconfig
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `ServerConfig`;
-
-CREATE TABLE `ServerConfig` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
-  `Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
-  `Comment` varchar(1024) DEFAULT '' COMMENT '注释',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_Key_DeletedAt` (`Key`,`DeletedAt`),
-  KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置服务自身配置';
-
-
-
-# Dump of table userrole
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `UserRole`;
-
-CREATE TABLE `UserRole` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `UserId` varchar(128) DEFAULT '' COMMENT '用户身份标识',
-  `RoleId` int(10) unsigned DEFAULT NULL COMMENT 'Role Id',
-  `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
-  `DeletedAt` BIGINT(20) NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on milliseconds',
-  `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
-  `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
-  `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_UserId_RoleId_DeletedAt` (`UserId`,`RoleId`,`DeletedAt`),
-  KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
-  KEY `IX_RoleId` (`RoleId`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户和role的绑定表';
-
-# Dump of table Users
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Users`;
-
-CREATE TABLE `Users` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `Username` varchar(64) NOT NULL DEFAULT 'default' COMMENT '用户登录账户',
-  `Password` varchar(512) NOT NULL DEFAULT 'default' COMMENT '密码',
-  `UserDisplayName` varchar(512) NOT NULL DEFAULT 'default' COMMENT '用户名称',
-  `Email` varchar(64) NOT NULL DEFAULT 'default' COMMENT '邮箱地址',
-  `Enabled` tinyint(4) DEFAULT NULL COMMENT '是否有效',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY `UK_Username` (`Username`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户表';
-
-
-# Dump of table Authorities
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `Authorities`;
-
-CREATE TABLE `Authorities` (
-  `Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
-  `Username` varchar(64) NOT NULL,
-  `Authority` varchar(50) NOT NULL,
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-# Config
-# ------------------------------------------------------------
-INSERT INTO `ServerConfig` (`Key`, `Value`, `Comment`)
-VALUES
-    ('apollo.portal.envs', 'dev', '可支持的环境列表'),
-    ('organizations', '[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
-    ('superAdmin', 'apollo', 'Portal超级管理员'),
-    ('api.readTimeout', '10000', 'http接口read timeout'),
-    ('consumer.token.salt', 'someSalt', 'consumer token salt'),
-    ('admin.createPrivateNamespace.switch', 'true', '是否允许项目管理员创建私有namespace'),
-    ('configView.memberOnly.envs', 'dev', '只对项目成员显示配置信息的环境列表，多个env以英文逗号分隔'),
-    ('apollo.portal.meta.servers', '{}', '各环境Meta Service列表');
-
-INSERT INTO `Users` (`Username`, `Password`, `UserDisplayName`, `Email`, `Enabled`)
-VALUES
-    ('apollo', '$2a$10$7r20uS.BQ9uBpf3Baj3uQOZvMVvB1RN3PYoKE94gtz2.WAOuiiwXS', 'apollo', 'apollo@acme.com', 1);
-
-INSERT INTO `Authorities` (`Username`, `Authority`) VALUES ('apollo', 'ROLE_user');
-
-# Sample Data
-# ------------------------------------------------------------
-INSERT INTO `App` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`)
-VALUES
-  ('SampleApp', 'Sample App', 'TEST1', '样例部门1', 'apollo', 'apollo@acme.com');
-
-INSERT INTO `AppNamespace` (`Name`, `AppId`, `Format`, `IsPublic`, `Comment`)
-VALUES
-  ('application', 'SampleApp', 'properties', 0, 'default app namespace');
-
-INSERT INTO `Permission` (`Id`, `PermissionType`, `TargetId`)
-VALUES
-  (1, 'CreateCluster', 'SampleApp'),
-  (2, 'CreateNamespace', 'SampleApp'),
-  (3, 'AssignRole', 'SampleApp'),
-  (4, 'ModifyNamespace', 'SampleApp+application'),
-  (5, 'ReleaseNamespace', 'SampleApp+application');
-
-INSERT INTO `Role` (`Id`, `RoleName`)
-VALUES
-  (1, 'Master+SampleApp'),
-  (2, 'ModifyNamespace+SampleApp+application'),
-  (3, 'ReleaseNamespace+SampleApp+application');
-
-INSERT INTO `RolePermission` (`RoleId`, `PermissionId`)
-VALUES
-  (1, 1),
-  (1, 2),
-  (1, 3),
-  (2, 4),
-  (3, 5);
-
-INSERT INTO `UserRole` (`UserId`, `RoleId`)
-VALUES
-  ('apollo', 1),
-  ('apollo', 2),
-  ('apollo', 3);
-
--- spring session (https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql)
-CREATE TABLE SPRING_SESSION (
-  PRIMARY_ID CHAR(36) NOT NULL,
-  SESSION_ID CHAR(36) NOT NULL,
-  CREATION_TIME BIGINT NOT NULL,
-  LAST_ACCESS_TIME BIGINT NOT NULL,
-  MAX_INACTIVE_INTERVAL INT NOT NULL,
-  EXPIRY_TIME BIGINT NOT NULL,
-  PRINCIPAL_NAME VARCHAR(100),
-  CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID)
-) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
-
-CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID);
-CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME);
-CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME);
-
-CREATE TABLE SPRING_SESSION_ATTRIBUTES (
-  SESSION_PRIMARY_ID CHAR(36) NOT NULL,
-  ATTRIBUTE_NAME VARCHAR(200) NOT NULL,
-  ATTRIBUTE_BYTES BLOB NOT NULL,
-  CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_PRIMARY_ID, ATTRIBUTE_NAME),
-  CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_PRIMARY_ID) REFERENCES SPRING_SESSION(PRIMARY_ID) ON DELETE CASCADE
-) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
-
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

.github/workflows/before_script.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-find . -name "*.go" | xargs gofmt -w
-git diff --name-only --exit-code || if [ $? != 0 ]; then echo "Notice: gofmt check failed,please gofmt before pr." && exit 1; fi
-echo "gofmt check pass."
-sudo echo "127.0.0.1   local" | sudo tee -a /etc/hosts

.github/workflows/build_and_test.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-GOARCH=${{ matrix.goarch }}
-for file in `find . -name go.mod`; do
-    dirpath=$(dirname $file)
-    echo $dirpath
-
-    # package oracle needs golang >= v1.17
-    if [ "oracle" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.17"; then
-          echo "ignore oracle as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package kuhecm needs golang >= v1.18
-    if [ "kubecm" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.18"; then
-          echo "ignore kubecm as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package example needs golang >= v1.18
-    if [ "example" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.18"; then
-          echo "ignore example as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    cd $dirpath
-    go mod tidy
-    go build ./...
-    go test ./... -race -coverprofile=coverage.out -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1
-    if grep -q "/gogf/gf/.*/v2" go.mod; then
-        sed -i "s/gogf\/gf\(\/.*\)\/v2/gogf\/gf\/v2\1/g" coverage.out
-    fi
-    cd -
-done

.github/workflows/cli.yml

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

.github/workflows/gf.yml

@@ -8,7 +8,6 @@ on:
     - develop
     - personal/**
     - feature/**
-    - enhance/**
     - fix/**
 
   pull_request:
@@ -17,14 +16,8 @@ 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"
 
@@ -58,7 +51,6 @@ jobs:
           - 3306:3306
 
       # PostgreSQL backend server.
-      # docker run -d --name postgres -p 5432:5432 -e POSTGRES_PASSWORD=12345678 -e POSTGRES_USER=postgres -e POSTGRES_DB=test -v postgres:/Users/john/Temp/postgresql/data loads/postgres:13
       postgres:
         image: loads/postgres:13
         env:
@@ -94,7 +86,6 @@ jobs:
           --health-retries 10
 
       # ClickHouse backend server.
-      # docker run -d --name clickhouse -p 9000:9000 -p 8123:8123 -p 9001:9001 loads/clickhouse-server:latest
       clickhouse-server:
         image: loads/clickhouse-server:latest
         ports:
@@ -102,15 +93,13 @@ jobs:
           - 8123:8123
           - 9001:9001
 
-      # Polaris backend server.
       polaris:
-        image: loads/polaris-server-standalone:latest
+        image: polarismesh/polaris-server-standalone:latest
         ports:
           - 8090:8090
           - 8091:8091
-          - 8093:8093
 
-      # Oracle 11g server
+      #oracle 11g server
       oracle-server:
         image: loads/oracle-xe-11g-r2:latest
         env:
@@ -121,19 +110,16 @@ jobs:
         ports:
           - 1521:1521
 
-      # dm8 server
-      dm-server:
-        image: loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4
-        ports:
-          - 5236:5236
+
 
     strategy:
       matrix:
-        go-version: [ "1.15", "1.16", "1.17", "1.18" ]
+        go: [ "1.15", "1.16", "1.17" ]
         goarch: [ "386", "amd64" ]
 
+
     steps:
-    - name: Setup Timezone
+    - name: Set Up Timezone
       uses: szenius/set-timezone@v1.0
       with:
         timezoneLinux: "Asia/Shanghai"
@@ -141,52 +127,48 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
-    - name: Start Apollo Containers
-      run:  docker-compose -f ".github/workflows/apollo/docker-compose.yml" up -d --build
-      
-    - name: Start Nacos Containers
-      run:  docker-compose -f ".github/workflows/nacos/docker-compose.yml" up -d --build
-
-    - name: Start Redis Cluster Containers
-      run:  docker-compose -f ".github/workflows/redis/docker-compose.yml" up -d --build
-
-    - name: Start Minikube
-      uses: medyagh/setup-minikube@master
-
-    - name: Setup Golang ${{ matrix.go-version }}
+    - name: Set Up Go
       uses: actions/setup-go@v2
       with:
-        go-version: ${{ matrix.go-version }}
+        go-version: ${{ matrix.go }}
 
-    - name: Setup Golang caches
-      uses: actions/cache@v3
-      with:
-        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
 
     - name: Before Script
-      run:  bash .github/workflows/before_script.sh
+      run: |
+        find . -name "*.go" | xargs gofmt -w
+        git diff --name-only --exit-code || if [ $? != 0 ]; then echo "Notice: gofmt check failed,please gofmt before pr." && exit 1; fi
+        echo "gofmt check pass."
+        sudo echo "127.0.0.1   local" | sudo tee -a /etc/hosts
 
     - name: Build & Test
-      run:  bash .github/workflows/build_and_test.sh
+      run: |
+        GOARCH=${{ matrix.goarch }}
+        for file in `find . -name go.mod`; do
+            dirpath=$(dirname $file)
 
-    - name: Stop Redis Cluster Containers
-      run:  docker-compose -f ".github/workflows/redis/docker-compose.yml" down
+            if [ "oracle" = $(basename $dirpath) ]; then
+                if ! go version|grep -q "1.17"; then
+                  continue 1
+                fi
+            fi
 
-    - name: Stop Apollo Containers
-      run:  docker-compose -f ".github/workflows/apollo/docker-compose.yml" down
+            cd $dirpath
+            go mod tidy
+            go build ./...
+            go test ./... -race -coverprofile=coverage.out -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1
+            if grep -q "/gogf/gf/.*/v2" go.mod; then
+                sed -i "s/gogf\/gf\(\/.*\)\/v2/gogf\/gf\/v2\1/g" coverage.out
+            fi
+            cd -
+        done
 
-    - name: Stop Nacos Containers
-      run:  docker-compose -f ".github/workflows/nacos/docker-compose.yml" down
+    - name: Stop containers
+      run: docker-compose -f ".github/workflows/docker-compose.yml" down
 
     - name: Report Coverage
       uses: codecov/codecov-action@v2
       with:
-        flags: go-${{ matrix.go-version }}-${{ matrix.goarch }}
+        flags: go-${{ matrix.go }}-${{ matrix.goarch }}
 

.github/workflows/golangci-lint.yml

@@ -1,50 +0,0 @@
-# Tencent is pleased to support the open source community by making Polaris available.
-#
-# Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
-#
-# Licensed under the BSD 3-Clause License (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://opensource.org/licenses/BSD-3-Clause
-#
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-
-name: GolangCI-Lint
-on:
-  push:
-    branches:
-    - master
-    - develop
-    - personal/**
-    - feature/**
-    - enhance/**
-    - fix/**
-  pull_request:
-    branches:
-    - master
-    - develop
-    - personal/**
-    - feature/**
-    - enhance/**
-    - fix/**
-
-jobs:
-  golangci:
-    strategy:
-      matrix:
-        go-version: [1.15.x,1.16.x,1.17.x,1.18.x]
-    name: golangci-lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-go@v3
-      - uses: actions/checkout@v3
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3.3.0
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: latest
-          args: --timeout 3m0s

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

@@ -1,28 +0,0 @@
-# 规则描述：每天凌晨3点(GMT+8)执行一次，将最近7天没有活跃且非BUG的ISSUE设置标签:inactive
-name: Issue Check Inactive
-
-on:
-  schedule:
-    - cron: "0 19 * * *"
-
-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,$exclude-empty'

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

@@ -1,23 +0,0 @@
-# 规则描述：每天凌晨4点(GMT+8)执行一次，将最近30天没有活跃且非BUG的ISSUE关闭
-name: Issue Close Inactive
-
-on:
-  schedule:
-    - cron: "0 20 * * *"
-
-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,$exclude-empty'
-          close-reason: 'not active'

.github/workflows/issue-labeled.yml

@@ -1,25 +0,0 @@
-## 规则描述：当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

@@ -1,29 +0,0 @@
-# 规则描述：在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

@@ -1,29 +0,0 @@
-# 规则描述：将需要提供更多细节且暂未关闭的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'

.github/workflows/nacos/docker-compose.yml

@@ -1,40 +0,0 @@
-version: "3.8"
-
-services:
-  nacos:
-    image: loads/nacos-server:v2.1.2
-    container_name: nacos
-    env_file:
-      - ./env/nacos.env
-    ports:
-      - "8848:8848"
-      - "9848:9848"
-      - "9555:9555"
-    healthcheck:
-      test: [ "CMD", "curl" ,"http://localhost:8848/nacos" ]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-    depends_on:
-      mysql:
-        condition: service_healthy
-
-  mysql:
-    build:
-      context: .
-      dockerfile: ./image/mysql/Dockerfile
-    container_name: mysql
-    env_file:
-      - ./env/mysql.env
-    healthcheck:
-      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-
-  initializer:
-    image: loads/curl:latest
-    depends_on:
-      nacos:
-        condition: service_healthy
-    command: [ "sh", "-c", "curl -X POST 'http://nacos:8848/nacos/v1/cs/configs?dataId=config.toml&group=test&content=%5Bserver%5D%0A%09address%3D%22%3A8000%22'" ]

.github/workflows/nacos/env/mysql.env

@@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=root
-MYSQL_DATABASE=nacos_devtest
-MYSQL_USER=nacos
-MYSQL_PASSWORD=nacos

.github/workflows/nacos/env/nacos.env

@@ -1,9 +0,0 @@
-PREFER_HOST_MODE=hostname
-MODE=standalone
-SPRING_DATASOURCE_PLATFORM=mysql
-MYSQL_SERVICE_HOST=mysql
-MYSQL_SERVICE_DB_NAME=nacos_devtest
-MYSQL_SERVICE_PORT=3306
-MYSQL_SERVICE_USER=nacos
-MYSQL_SERVICE_PASSWORD=nacos
-MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true

.github/workflows/nacos/image/mysql/Dockerfile

@@ -1,5 +0,0 @@
-FROM loads/mysql:5.7
-ADD https://raw.githubusercontent.com/alibaba/nacos/develop/distribution/conf/mysql-schema.sql /docker-entrypoint-initdb.d/nacos-mysql.sql
-RUN chown -R mysql:mysql /docker-entrypoint-initdb.d/nacos-mysql.sql
-EXPOSE 3306
-CMD ["mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci"]

.gitignore

@@ -17,4 +17,3 @@ cbuild
 cmd/gf/main
 cmd/gf/gf
 go.work
-temp/

.golangci.yml

@@ -2,56 +2,31 @@
 ## with their default values.
 
 # See https://github.com/golangci/golangci-lint#config-file
-# See https://golangci-lint.run/usage/configuration/
-
-# Options for analysis running.
 run:
-  # Exit code when at least one issue was found.
-  # Default: 1
-  issues-exit-code: 2
+  issues-exit-code: 1 #Default
+  tests: true #Default
 
-  # Include test files or not.
-  # Default: true
-  tests: false
-
-  # Which dirs to skip: issues from them won't be reported.
-  # Can use regexp here: `generated.*`, regexp is applied on full path.
-  # Default value is empty list,
-  # but default dirs are skipped independently of this option's value (see skip-dirs-use-default).
-  # "/" will be replaced by current OS file path separator to properly work on Windows.
-  skip-dirs: []
-
-  # Which files to skip: they will be analyzed, but issues from them won't be reported.
-  # Default value is empty list,
-  # but there is no need to include all autogenerated files,
-  # we confidently recognize autogenerated files.
-  # If it's not please let us know.
-  # "/" will be replaced by current OS file path separator to properly work on Windows.
-  skip-files: []
-
-
-# Main linters configurations.
-# See https://golangci-lint.run/usage/linters
 linters:
-  # Disable all default enabled linters.
+  # Disable everything by default so upgrades to not include new "default
+  # enabled" linters.
   disable-all: true
-  # Custom enable linters we want to use.
+  # Specifically enable linters we want to use.
   enable:
-    - errcheck      # Errcheck is a program for checking for unchecked errors in go programs.
-    - errchkjson    # Checks types passed to the json encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted.
-    - funlen        # Tool for detection of long functions
-    - goconst       # Finds repeated strings that could be replaced by a constant
-    - gocritic      # Provides diagnostics that check for bugs, performance and style issues.
-    - gofmt         # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
-    - gosimple      # Linter for Go source code that specializes in simplifying code
-    - govet         # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
-    - misspell      # Finds commonly misspelled English words in comments
-    - nolintlint    # Reports ill-formed or insufficient nolint directives
-    - revive        # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint.
-    - staticcheck   # It's a set of rules from staticcheck. It's not the same thing as the staticcheck binary.
-    - typecheck     # Like the front-end of a Go compiler, parses and type-checks Go code
-    - usestdlibvars # A linter that detect the possibility to use variables/constants from the Go standard library.
-    - whitespace    # Tool for detection of leading and trailing whitespace
+    - deadcode
+    - errcheck
+    - gofmt
+    - goimports
+    - gosimple
+    - govet
+    - godot
+    - ineffassign
+    - misspell
+    - revive
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
 
 
 issues:
@@ -66,218 +41,26 @@ issues:
       text: "exported func.*returns unexported type.*which can be annoying to use"
       linters:
         - revive
-    # https://github.com/go-critic/go-critic/issues/926
-    - linters:
-        - gocritic
-      text: "unnecessaryDefer:"
 
-
-# https://golangci-lint.run/usage/linters
 linters-settings:
-  # https://golangci-lint.run/usage/linters/#misspell
   misspell:
     locale: US
     ignore-words:
       - cancelled
-
-  # https://golangci-lint.run/usage/linters/#revive
-  # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
-  revive:
-    ignore-generated-header: true
-    severity: error
-    rules:
-      - name: atomic
-      - name: line-length-limit
-        severity: error
-        arguments: [ 380 ]
-      - name: unhandled-error
-        severity: warning
-        disabled: true
-        arguments: []
-      - name: var-naming
-        severity: warning
-        disabled: true
-        arguments:
-          # AllowList
-          - [ "ID","URL","IP","HTTP","JSON","API","UID","Id","Api","Uid","Http","Json","Ip","Url" ]
-          # DenyList
-          - [ "VM" ]
-      - name: string-format
-        severity: warning
-        disabled: false
-        arguments:
-          - - 'core.WriteError[1].Message'
-            - '/^([^A-Z]|$)/'
-            - must not start with a capital letter
-          - - 'fmt.Errorf[0]'
-            - '/(^|[^\.!?])$/'
-            - must not end in punctuation
-          - - panic
-            - '/^[^\n]*$/'
-            - must not contain line breaks
-      - name: function-result-limit
-        severity: warning
-        disabled: false
-        arguments: [ 4 ]
-
-  # https://golangci-lint.run/usage/linters/#funlen
-  funlen:
-    # Checks the number of lines in a function.
-    # If lower than 0, disable the check.
-    # Default: 60
-    lines: 330
-    # Checks the number of statements in a function.
-    # If lower than 0, disable the check.
-    # Default: 40
-    statements: -1
-
-  # https://golangci-lint.run/usage/linters/#goconst
-  goconst:
-    # Minimal length of string constant.
-    # Default: 3
-    min-len: 2
-    # Minimum occurrences of constant string count to trigger issue.
-    # Default: 3
-    # For subsequent optimization, the value is reduced.
-    min-occurrences: 30
-    # Ignore test files.
-    # Default: false
-    ignore-tests: true
-    # Look for existing constants matching the values.
+  goimports:
+    local-prefixes: github.com/gogf/gf
+  godot:
+    # Comments to be checked: `declarations`, `toplevel`, or `all`.
+    # Default: declarations
+    scope: toplevel
+    exclude:
+      # Exclude sentence fragments for lists.
+      - '^[ ]*[-•]'
+      # Exclude sentences prefixing a list.
+      - ':$'
+    # Check that each sentence ends with a period.
     # Default: true
-    match-constant: false
-    # Search also for duplicated numbers.
+    period: false
+    # Check that each sentence starts with a capital letter.
     # Default: false
-    numbers: true
-    # Minimum value, only works with goconst.numbers
-    # Default: 3
-    min: 5
-    # Maximum value, only works with goconst.numbers
-    # Default: 3
-    max: 20
-    # Ignore when constant is not used as function argument.
-    # Default: true
-    ignore-calls: false
-
-  # https://golangci-lint.run/usage/linters/#gocritic
-  gocritic:
-    disabled-checks:
-      - ifElseChain
-      - assignOp
-      - appendAssign
-      - singleCaseSwitch
-      - regexpMust
-      - typeSwitchVar
-      - elseif
-
-  # https://golangci-lint.run/usage/linters/#gosimple
-  gosimple:
-    # Select the Go version to target.
-    # Default: 1.13
-    # Deprecated: use the global `run.go` instead.
-    go: "1.15"
-    # Sxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
-    # Default: ["*"]
-    checks: [
-      "all", "-S1000", "-S1001", "-S1002", "-S1008", "-S1009", "-S1016", "-S1023", "-S1025", "-S1029", "-S1034", "-S1040"
-    ]
-
-  # https://golangci-lint.run/usage/linters/#govet
-  govet:
-    # Report about shadowed variables.
-    # Default: false
-    check-shadowing: true
-    # Settings per analyzer.
-    settings:
-      # Analyzer name, run `go tool vet help` to see all analyzers.
-      printf:
-        # Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`).
-        # Default: []
-        funcs:
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
-        # shadow:
-        # Whether to be strict about shadowing; can be noisy.
-        # Default: false
-        # strict: false
-      unusedresult:
-        # Comma-separated list of functions whose results must be used
-        # (in addition to defaults context.WithCancel,context.WithDeadline,context.WithTimeout,context.WithValue,
-        # errors.New,fmt.Errorf,fmt.Sprint,fmt.Sprintf,sort.Reverse)
-        # Default []
-        funcs:
-          - pkg.MyFunc
-          - context.WithCancel
-        # Comma-separated list of names of methods of type func() string whose results must be used
-        # (in addition to default Error,String)
-        # Default []
-        stringmethods:
-          - MyMethod
-    # Enable all analyzers.
-    # Default: false
-    enable-all: true
-    # Disable analyzers by name.
-    # Run `go tool vet help` to see all analyzers.
-    # Default: []
-    disable:
-      - asmdecl
-      - assign
-      - atomic
-      - atomicalign
-      - bools
-      - buildtag
-      - cgocall
-      - composites
-      - copylocks
-      - deepequalerrors
-      - errorsas
-      - fieldalignment
-      - findcall
-      - framepointer
-      - httpresponse
-      - ifaceassert
-      - loopclosure
-      - lostcancel
-      - nilfunc
-      - nilness
-      - reflectvaluecompare
-      - shift
-      - shadow
-      - sigchanyzer
-      - sortslice
-      - stdmethods
-      - stringintconv
-      - structtag
-      - testinggoroutine
-      - tests
-      - unmarshal
-      - unreachable
-      - unsafeptr
-      - unusedwrite
-
-  # https://golangci-lint.run/usage/linters/#staticcheck
-  staticcheck:
-    # Select the Go version to target.
-    # Default: "1.13"
-    # Deprecated: use the global `run.go` instead.
-    go: "1.15"
-    # SAxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
-    # Default: ["*"]
-    checks: [ "all","-SA1019","-SA4015","-SA1029","-SA1016","-SA9003","-SA4006","-SA6003" ]
-
-  # https://golangci-lint.run/usage/linters/#gofmt
-  gofmt:
-    # Simplify code: gofmt with `-s` option.
-    # Default: true
-    simplify: true
-    # Apply the rewrite rules to the source before reformatting.
-    # https://pkg.go.dev/cmd/gofmt
-    # Default: []
-    rewrite-rules:
-      # - pattern: 'interface{}'
-      #   replacement: 'any'
-      # - pattern: 'a[b:len(a)]'
-      #   replacement: 'a[b:]'
-
+    capital: false

Makefile

@@ -11,6 +11,3 @@ tidy:
 		cd -; \
 	done
 
-.PHONY: lint
-lint:
-	golangci-lint run

README.MD

@@ -53,7 +53,7 @@ golang version >= 1.15
 # Documentation
 
 * Chinese Official Site(中文官网): [https://goframe.org](https://goframe.org/display/gf)
-* GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2)
+* GoDoc API: [https://pkg.go.dev/github.com/gogf/gf](https://pkg.go.dev/github.com/gogf/gf)
 
 
 # License

cmd/gf/go.mod

@@ -1,6 +1,6 @@
 module github.com/gogf/gf/cmd/gf/v2
 
-go 1.16
+go 1.15
 
 require (
 	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.1.0

cmd/gf/go.sum

@@ -43,6 +43,7 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -83,6 +84,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
 github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
@@ -172,6 +174,7 @@ golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -180,6 +183,7 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

cmd/gf/internal/cmd/cmd.go

@@ -4,12 +4,11 @@ import (
 	"context"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/service"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/service"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (
@@ -39,7 +38,6 @@ type cGFInput struct {
 	Version bool `short:"v" name:"version" brief:"show version information of current binary"   orphan:"true"`
 	Debug   bool `short:"d" name:"debug"   brief:"show internal detailed debugging information" orphan:"true"`
 }
-
 type cGFOutput struct{}
 
 func (c cGF) Index(ctx context.Context, in cGFInput) (out *cGFOutput, err error) {

cmd/gf/internal/cmd/cmd_build.go

@@ -9,6 +9,7 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/encoding/gbase64"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
@@ -19,8 +20,6 @@ import (
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (
@@ -125,7 +124,6 @@ type cBuildInput struct {
 	PackDst       string `short:"pd" name:"packDst" brief:"temporary go file path for pack, this go file will be automatically removed after built" d:"internal/packed/build_pack_data.go"`
 	ExitWhenError bool   `short:"ew" name:"exitWhenError" brief:"exit building when any error occurs, default is false" orphan:"true"`
 }
-
 type cBuildOutput struct{}
 
 func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, err error) {
@@ -206,9 +204,7 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 				mlog.Printf(`remove the automatically generated resource go file: %s`, in.PackDst)
 			}()
 		}
-		// remove black space in separator.
-		in.PackSrc, _ = gregex.ReplaceString(`,\s+`, `,`, in.PackSrc)
-		packCmd := fmt.Sprintf(`gf pack %s %s --keepPath=true`, in.PackSrc, in.PackDst)
+		packCmd := fmt.Sprintf(`gf pack %s %s`, in.PackSrc, in.PackDst)
 		mlog.Print(packCmd)
 		gproc.MustShellRun(ctx, packCmd)
 	}

cmd/gf/internal/cmd/cmd_docker.go

@@ -5,13 +5,12 @@ import (
 	"fmt"
 	"runtime"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (
@@ -78,7 +77,6 @@ type cDockerInput struct {
 	Push        bool     `name:"push"        short:"p"  brief:"{cDockerPushBrief}" orphan:"true"`
 	Extra       string   `name:"extra"       short:"e"  brief:"{cDockerExtraBrief}"`
 }
-
 type cDockerOutput struct{}
 
 func (c cDocker) Index(ctx context.Context, in cDockerInput) (out *cDockerOutput, err error) {

cmd/gf/internal/cmd/cmd_env.go

@@ -4,13 +4,12 @@ import (
 	"bytes"
 	"context"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/olekukonko/tablewriter"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (
@@ -24,7 +23,6 @@ type cEnv struct {
 type cEnvInput struct {
 	g.Meta `name:"env"`
 }
-
 type cEnvOutput struct{}
 
 func (c cEnv) Index(ctx context.Context, in cEnvInput) (out *cEnvOutput, err error) {

cmd/gf/internal/cmd/cmd_gen_dao.go

@@ -5,6 +5,7 @@ import (
 	_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
 	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
 	_ "github.com/gogf/gf/contrib/drivers/sqlite/v2"
+	//_ "github.com/gogf/gf/contrib/drivers/oracle/v2"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
 )

cmd/gf/internal/cmd/cmd_gen_pbentity.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
@@ -15,9 +17,6 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gtag"
 	"github.com/olekukonko/tablewriter"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type (

cmd/gf/internal/cmd/cmd_gen_service.go

@@ -1,9 +1,441 @@
 package cmd
 
 import (
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genservice"
+	"context"
+	"fmt"
+	"go/parser"
+	"go/token"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
+	"github.com/gogf/gf/v2/container/garray"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gproc"
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/gtag"
 )
 
-type (
-	cGenService = genservice.CGenService
+const (
+	cGenServiceConfig = `gfcli.gen.service`
+	cGenServiceUsage  = `gf gen service [OPTION]`
+	cGenServiceBrief  = `parse struct and associated functions from packages to generate service go file`
+	cGenServiceEg     = `
+gf gen service
+gf gen service -f Snake
+`
+	cGenServiceBriefSrcFolder    = `source folder path to be parsed. default: internal/logic`
+	cGenServiceBriefDstFolder    = `destination folder path storing automatically generated go files. default: internal/service`
+	cGenServiceBriefFileNameCase = `
+destination file name storing automatically generated go files, cases are as follows:
+| Case            | Example            |
+|---------------- |--------------------|
+| Lower           | anykindofstring    |
+| Camel           | AnyKindOfString    |
+| CamelLower      | anyKindOfString    |
+| Snake           | any_kind_of_string | default
+| SnakeScreaming  | ANY_KIND_OF_STRING |
+| SnakeFirstUpper | rgb_code_md5       |
+| Kebab           | any-kind-of-string |
+| KebabScreaming  | ANY-KIND-OF-STRING |
+`
+	cGenServiceBriefWatchFile    = `used in file watcher, it generates service go files only if given file is under srcFolder`
+	cGenServiceBriefStPattern    = `regular expression matching struct name for generating service. default: s([A-Z]\\\\w+)`
+	cGenServiceBriefPackages     = `produce go files only for given source packages`
+	cGenServiceBriefImportPrefix = `custom import prefix to calculate import path for generated importing go file of logic`
+	cGenServiceBriefOverWrite    = `overwrite service go files that already exist in generating folder. default: true`
 )
+
+func init() {
+	gtag.Sets(g.MapStrStr{
+		`cGenServiceConfig`:            cGenServiceConfig,
+		`cGenServiceUsage`:             cGenServiceUsage,
+		`cGenServiceBrief`:             cGenServiceBrief,
+		`cGenServiceEg`:                cGenServiceEg,
+		`cGenServiceBriefSrcFolder`:    cGenServiceBriefSrcFolder,
+		`cGenServiceBriefDstFolder`:    cGenServiceBriefDstFolder,
+		`cGenServiceBriefFileNameCase`: cGenServiceBriefFileNameCase,
+		`cGenServiceBriefWatchFile`:    cGenServiceBriefWatchFile,
+		`cGenServiceBriefStPattern`:    cGenServiceBriefStPattern,
+		`cGenServiceBriefPackages`:     cGenServiceBriefPackages,
+		`cGenServiceBriefImportPrefix`: cGenServiceBriefImportPrefix,
+		`cGenServiceBriefOverWrite`:    cGenServiceBriefOverWrite,
+	})
+}
+
+type (
+	cGenService      struct{}
+	cGenServiceInput struct {
+		g.Meta          `name:"service" config:"{cGenServiceConfig}" usage:"{cGenServiceUsage}" brief:"{cGenServiceBrief}" eg:"{cGenServiceEg}"`
+		SrcFolder       string   `short:"s" name:"srcFolder" brief:"{cGenServiceBriefSrcFolder}" d:"internal/logic"`
+		DstFolder       string   `short:"d" name:"dstFolder" brief:"{cGenServiceBriefDstFolder}" d:"internal/service"`
+		DstFileNameCase string   `short:"f" name:"dstFileNameCase" brief:"{cGenServiceBriefFileNameCase}" d:"Snake"`
+		WatchFile       string   `short:"w" name:"watchFile" brief:"{cGenServiceBriefWatchFile}"`
+		StPattern       string   `short:"a" name:"stPattern" brief:"{cGenServiceBriefStPattern}" d:"s([A-Z]\\w+)"`
+		Packages        []string `short:"p" name:"packages" brief:"{cGenServiceBriefPackages}"`
+		ImportPrefix    string   `short:"i" name:"importPrefix" brief:"{cGenServiceBriefImportPrefix}"`
+		OverWrite       bool     `short:"o" name:"overwrite" brief:"{cGenServiceBriefOverWrite}" d:"true" orphan:"true"`
+	}
+	cGenServiceOutput struct{}
+)
+
+const (
+	genServiceFileLockSeconds = 10
+)
+
+func (c cGenService) Service(ctx context.Context, in cGenServiceInput) (out *cGenServiceOutput, err error) {
+	// File lock to avoid multiple processes.
+	var (
+		flockFilePath = gfile.Temp("gf.cli.gen.service.lock")
+		flockContent  = gfile.GetContents(flockFilePath)
+	)
+	if flockContent != "" {
+		if gtime.Timestamp()-gconv.Int64(flockContent) < genServiceFileLockSeconds {
+			// If another "gen service" process is running, it just exits.
+			mlog.Debug(`another "gen service" process is running, exit`)
+			return
+		}
+	}
+	defer gfile.Remove(flockFilePath)
+	_ = gfile.PutContents(flockFilePath, gtime.TimestampStr())
+
+	in.SrcFolder = gstr.TrimRight(in.SrcFolder, `\/`)
+	in.SrcFolder = gstr.Replace(in.SrcFolder, "\\", "/")
+	in.WatchFile = gstr.TrimRight(in.WatchFile, `\/`)
+	in.WatchFile = gstr.Replace(in.WatchFile, "\\", "/")
+
+	// Watch file handling.
+	if in.WatchFile != "" {
+		// It works only if given WatchFile is in SrcFolder.
+		var (
+			watchFileDir = gfile.Dir(in.WatchFile)
+			srcFolderDir = gfile.Dir(watchFileDir)
+		)
+		mlog.Debug("watchFileDir:", watchFileDir)
+		mlog.Debug("logicFolderDir:", srcFolderDir)
+		if !gstr.HasSuffix(gstr.Replace(srcFolderDir, `\`, `/`), in.SrcFolder) {
+			mlog.Printf(`ignore watch file "%s", not in source path "%s"`, in.WatchFile, in.SrcFolder)
+			return
+		}
+		var newWorkingDir = gfile.Dir(gfile.Dir(srcFolderDir))
+		if err = gfile.Chdir(newWorkingDir); err != nil {
+			mlog.Fatalf(`%+v`, err)
+		}
+		mlog.Debug("Chdir:", newWorkingDir)
+		_ = gfile.Remove(flockFilePath)
+		var command = fmt.Sprintf(
+			`%s gen service -packages=%s`,
+			gfile.SelfName(), gfile.Basename(watchFileDir),
+		)
+		err = gproc.ShellRun(ctx, command)
+		return
+	}
+
+	if !gfile.Exists(in.SrcFolder) {
+		mlog.Fatalf(`source folder path "%s" does not exist`, in.SrcFolder)
+	}
+
+	if in.ImportPrefix == "" {
+		if !gfile.Exists("go.mod") {
+			mlog.Fatal("ImportPrefix is empty and go.mod does not exist in current working directory")
+		}
+		var (
+			goModContent = gfile.GetContents("go.mod")
+			match, _     = gregex.MatchString(`^module\s+(.+)\s*`, goModContent)
+		)
+		if len(match) > 1 {
+			in.ImportPrefix = fmt.Sprintf(`%s/%s`, gstr.Trim(match[1]), gstr.Replace(in.SrcFolder, `\`, `/`))
+		}
+	}
+
+	var (
+		isDirty               bool
+		files                 []string
+		fileContent           string
+		initImportSrcPackages []string
+		inputPackages         = in.Packages
+		dstPackageName        = gstr.ToLower(gfile.Basename(in.DstFolder))
+	)
+	srcFolders, err := gfile.ScanDir(in.SrcFolder, "*", false)
+	if err != nil {
+		return nil, err
+	}
+	for _, srcFolder := range srcFolders {
+		if !gfile.IsDir(srcFolder) {
+			continue
+		}
+		if files, err = gfile.ScanDir(srcFolder, "*.go", false); err != nil {
+			return nil, err
+		}
+		if len(files) == 0 {
+			continue
+		}
+		var (
+			// StructName => FunctionDefinitions
+			srcPkgInterfaceMap  = make(map[string]*garray.StrArray)
+			srcImportedPackages = garray.NewSortedStrArray().SetUnique(true)
+			ok                  bool
+		)
+		for _, file := range files {
+			fileContent = gfile.GetContents(file)
+			// Calculate imported packages of source go files.
+			err = c.calculateImportedPackages(fileContent, srcImportedPackages)
+			if err != nil {
+				return nil, err
+			}
+			// Calculate functions and interfaces for service generating.
+			err = c.calculateInterfaceFunctions(in, fileContent, srcPkgInterfaceMap, dstPackageName)
+			if err != nil {
+				return nil, err
+			}
+		}
+		initImportSrcPackages = append(
+			initImportSrcPackages,
+			fmt.Sprintf(`%s/%s`, in.ImportPrefix, gfile.Basename(srcFolder)),
+		)
+		// Ignore source packages if input packages given.
+		if len(inputPackages) > 0 && !gstr.InArray(inputPackages, gfile.Basename(srcFolder)) {
+			mlog.Debugf(
+				`ignore source package "%s" as it is not in desired packages: %+v`,
+				gfile.Basename(srcFolder), inputPackages,
+			)
+			continue
+		}
+		// Generating go files for service.
+		if ok, err = c.generateServiceFiles(in, srcPkgInterfaceMap, srcImportedPackages.Slice(), dstPackageName); err != nil {
+			return
+		}
+		if ok {
+			isDirty = true
+		}
+	}
+
+	if isDirty {
+		// Generate initialization go file.
+		if len(initImportSrcPackages) > 0 {
+			if err = c.generateInitializationFile(in, initImportSrcPackages); err != nil {
+				return
+			}
+		}
+
+		// Replace v1 to v2 for GoFrame.
+		if err = c.replaceGeneratedServiceContentGFV2(in); err != nil {
+			return nil, err
+		}
+		mlog.Printf(`gofmt go files in "%s"`, in.DstFolder)
+		utils.GoFmt(in.DstFolder)
+	}
+
+	mlog.Print(`done!`)
+	return
+}
+
+func (c cGenService) calculateImportedPackages(fileContent string, srcImportedPackages *garray.SortedStrArray) (err error) {
+	f, err := parser.ParseFile(token.NewFileSet(), "", fileContent, parser.ImportsOnly)
+	if err != nil {
+		return err
+	}
+	for _, s := range f.Imports {
+		if s.Path != nil {
+			if s.Name != nil {
+				// has alias and is not `_`
+				if pkgAlias := s.Name.String(); pkgAlias != "_" {
+					srcImportedPackages.Add(pkgAlias + " " + s.Path.Value)
+				}
+			} else {
+				// no alias
+				srcImportedPackages.Add(s.Path.Value)
+			}
+		}
+	}
+	return nil
+}
+
+func (c cGenService) calculateInterfaceFunctions(
+	in cGenServiceInput, fileContent string, srcPkgInterfaceMap map[string]*garray.StrArray, dstPackageName string,
+) (err error) {
+	var (
+		ok                       bool
+		matches                  [][]string
+		srcPkgInterfaceFuncArray *garray.StrArray
+	)
+	matches, err = gregex.MatchAllString(`func \((.+?)\) ([\s\S]+?) {`, fileContent)
+	if err != nil {
+		return err
+	}
+	for _, match := range matches {
+		var (
+			structName    string
+			structMatch   []string
+			funcReceiver  = gstr.Trim(match[1])
+			receiverArray = gstr.SplitAndTrim(funcReceiver, " ")
+			functionHead  = gstr.Trim(gstr.Replace(match[2], "\n", ""))
+		)
+		if len(receiverArray) > 1 {
+			structName = receiverArray[1]
+		} else {
+			structName = receiverArray[0]
+		}
+		structName = gstr.Trim(structName, "*")
+
+		// Xxx(\n    ctx context.Context, req *v1.XxxReq,\n) -> Xxx(ctx context.Context, req *v1.XxxReq)
+		functionHead = gstr.Replace(functionHead, `,)`, `)`)
+		functionHead, _ = gregex.ReplaceString(`\(\s+`, `(`, functionHead)
+		functionHead, _ = gregex.ReplaceString(`\s{2,}`, ` `, functionHead)
+		if !gstr.IsLetterUpper(functionHead[0]) {
+			continue
+		}
+		if structMatch, err = gregex.MatchString(in.StPattern, structName); err != nil {
+			return err
+		}
+		if len(structMatch) < 1 {
+			continue
+		}
+		structName = gstr.CaseCamel(structMatch[1])
+		if srcPkgInterfaceFuncArray, ok = srcPkgInterfaceMap[structName]; !ok {
+			srcPkgInterfaceMap[structName] = garray.NewStrArray()
+			srcPkgInterfaceFuncArray = srcPkgInterfaceMap[structName]
+		}
+		// Remove package name calls of `dstPackageName` in produced codes.
+		functionHead, _ = gregex.ReplaceString(fmt.Sprintf(`\*{0,1}%s\.`, dstPackageName), ``, functionHead)
+		srcPkgInterfaceFuncArray.Append(functionHead)
+	}
+	return nil
+}
+
+func (c cGenService) generateServiceFiles(
+	in cGenServiceInput,
+	srcPkgInterfaceMap map[string]*garray.StrArray,
+	srcImportedPackages []string,
+	dstPackageName string,
+) (ok bool, err error) {
+	srcImportedPackagesContent := fmt.Sprintf(
+		"import (\n%s\n)", gstr.Join(srcImportedPackages, "\n"),
+	)
+	for structName, funcArray := range srcPkgInterfaceMap {
+		var (
+			filePath         = gfile.Join(in.DstFolder, c.getDstFileNameCase(structName, in.DstFileNameCase)+".go")
+			generatedContent = gstr.ReplaceByMap(consts.TemplateGenServiceContent, g.MapStrStr{
+				"{Imports}":        srcImportedPackagesContent,
+				"{StructName}":     structName,
+				"{PackageName}":    dstPackageName,
+				"{FuncDefinition}": funcArray.Join("\n\t"),
+			})
+		)
+		if gfile.Exists(filePath) {
+			if !in.OverWrite {
+				mlog.Printf(`not overwrite, ignore generating service go file: %s`, filePath)
+				continue
+			}
+			if !c.isToGenerateServiceGoFile(filePath, funcArray) {
+				mlog.Printf(`not dirty, ignore generating service go file: %s`, filePath)
+				continue
+			}
+		}
+		ok = true
+		mlog.Printf(`generating service go file: %s`, filePath)
+		if err = gfile.PutContents(filePath, generatedContent); err != nil {
+			return ok, err
+		}
+	}
+	return ok, nil
+}
+
+// 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())
+		contentFuncArray   = garray.NewSortedStrArray()
+	)
+	if fileContent == "" {
+		return true
+	}
+	match, _ := gregex.MatchString(`interface\s+{([\s\S]+?)}`, fileContent)
+	if len(match) != 2 {
+		return false
+	}
+	contentFuncArray.Append(gstr.SplitAndTrim(match[1], "\n")...)
+	if generatedFuncArray.Len() != contentFuncArray.Len() {
+		return true
+	}
+	for i := 0; i < generatedFuncArray.Len(); i++ {
+		if generatedFuncArray.At(i) != contentFuncArray.At(i) {
+			mlog.Debugf(`dirty, %s != %s`, generatedFuncArray.At(i), contentFuncArray.At(i))
+			return true
+		}
+	}
+	return false
+}
+
+func (c cGenService) generateInitializationFile(in cGenServiceInput, importSrcPackages []string) (err error) {
+	var (
+		srcPackageName   = gstr.ToLower(gfile.Basename(in.SrcFolder))
+		srcFilePath      = gfile.Join(in.SrcFolder, srcPackageName+".go")
+		srcImports       string
+		generatedContent string
+	)
+	if !utils.IsFileDoNotEdit(srcFilePath) {
+		mlog.Debugf(`ignore file as it is manually maintained: %s`, srcFilePath)
+		return nil
+	}
+	for _, importSrcPackage := range importSrcPackages {
+		srcImports += fmt.Sprintf(`%s_ "%s"%s`, "\t", importSrcPackage, "\n")
+	}
+	generatedContent = gstr.ReplaceByMap(consts.TemplateGenServiceLogicContent, g.MapStrStr{
+		"{PackageName}": srcPackageName,
+		"{Imports}":     srcImports,
+	})
+	mlog.Printf(`generating init go file: %s`, srcFilePath)
+	if err = gfile.PutContents(srcFilePath, generatedContent); err != nil {
+		return err
+	}
+	utils.GoFmt(srcFilePath)
+	return nil
+}
+
+func (c cGenService) replaceGeneratedServiceContentGFV2(in cGenServiceInput) (err error) {
+	return gfile.ReplaceDirFunc(func(path, content string) string {
+		if gstr.Contains(content, `"github.com/gogf/gf`) && !gstr.Contains(content, `"github.com/gogf/gf/v2`) {
+			content = gstr.Replace(content, `"github.com/gogf/gf"`, `"github.com/gogf/gf/v2"`)
+			content = gstr.Replace(content, `"github.com/gogf/gf/`, `"github.com/gogf/gf/v2/`)
+			return content
+		}
+		return content
+	}, in.DstFolder, "*.go", false)
+}
+
+// getDstFileNameCase call gstr.Case* function to convert the s to specified case.
+func (c cGenService) getDstFileNameCase(str, caseStr string) string {
+	switch gstr.ToLower(caseStr) {
+	case gstr.ToLower("Lower"):
+		return gstr.ToLower(str)
+
+	case gstr.ToLower("Camel"):
+		return gstr.CaseCamel(str)
+
+	case gstr.ToLower("CamelLower"):
+		return gstr.CaseCamelLower(str)
+
+	case gstr.ToLower("Kebab"):
+		return gstr.CaseKebab(str)
+
+	case gstr.ToLower("KebabScreaming"):
+		return gstr.CaseKebabScreaming(str)
+
+	case gstr.ToLower("SnakeFirstUpper"):
+		return gstr.CaseSnakeFirstUpper(str)
+
+	case gstr.ToLower("SnakeScreaming"):
+		return gstr.CaseSnakeScreaming(str)
+	}
+	return gstr.CaseSnake(str)
+}

cmd/gf/internal/cmd/cmd_init.go

@@ -5,15 +5,14 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/os/gres"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (
@@ -53,7 +52,6 @@ type cInitInput struct {
 	Mono   bool   `name:"mono"   short:"m" brief:"initialize a mono-repo instead a single-repo" orphan:"true"`
 	Update bool   `name:"update" short:"u" brief:"update to the latest goframe version" orphan:"true"`
 }
-
 type cInitOutput struct{}
 
 func (c cInit) Index(ctx context.Context, in cInitInput) (out *cInitOutput, err error) {
@@ -96,7 +94,6 @@ 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)
@@ -104,14 +101,6 @@ 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/cmd_install.go

@@ -3,9 +3,8 @@ package cmd
 import (
 	"context"
 
-	"github.com/gogf/gf/v2/frame/g"
-
 	"github.com/gogf/gf/cmd/gf/v2/internal/service"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 var (
@@ -19,7 +18,6 @@ type cInstall struct {
 type cInstallInput struct {
 	g.Meta `name:"install"`
 }
-
 type cInstallOutput struct{}
 
 func (c cInstall) Index(ctx context.Context, in cInstallInput) (out *cInstallOutput, err error) {

cmd/gf/internal/cmd/cmd_pack.go

@@ -4,14 +4,13 @@ import (
 	"context"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gres"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (
@@ -38,33 +37,29 @@ gf pack /var/www/public packed/data.go -n=packed
 destination file path for packed file. if extension of the filename is ".go" and "-n" option is given, 
 it enables packing SRC to go file, or else it packs SRC into a binary file.
 `
-	cPackNameBrief     = `package name for output go file, it's set as its directory name if no name passed`
-	cPackPrefixBrief   = `prefix for each file packed into the resource file`
-	cPackKeepPathBrief = `keep the source path from system to resource file, usually for relative path`
+	cPackNameBrief   = `package name for output go file, it's set as its directory name if no name passed`
+	cPackPrefixBrief = `prefix for each file packed into the resource file`
 )
 
 func init() {
 	gtag.Sets(g.MapStrStr{
-		`cPackUsage`:         cPackUsage,
-		`cPackBrief`:         cPackBrief,
-		`cPackEg`:            cPackEg,
-		`cPackSrcBrief`:      cPackSrcBrief,
-		`cPackDstBrief`:      cPackDstBrief,
-		`cPackNameBrief`:     cPackNameBrief,
-		`cPackPrefixBrief`:   cPackPrefixBrief,
-		`cPackKeepPathBrief`: cPackKeepPathBrief,
+		`cPackUsage`:       cPackUsage,
+		`cPackBrief`:       cPackBrief,
+		`cPackEg`:          cPackEg,
+		`cPackSrcBrief`:    cPackSrcBrief,
+		`cPackDstBrief`:    cPackDstBrief,
+		`cPackNameBrief`:   cPackNameBrief,
+		`cPackPrefixBrief`: cPackPrefixBrief,
 	})
 }
 
 type cPackInput struct {
-	g.Meta   `name:"pack"`
-	Src      string `name:"SRC" arg:"true" v:"required" brief:"{cPackSrcBrief}"`
-	Dst      string `name:"DST" arg:"true" v:"required" brief:"{cPackDstBrief}"`
-	Name     string `name:"name"     short:"n" brief:"{cPackNameBrief}"`
-	Prefix   string `name:"prefix"   short:"p" brief:"{cPackPrefixBrief}"`
-	KeepPath bool   `name:"keepPath" short:"k" brief:"{cPackKeepPathBrief}" orphan:"true"`
+	g.Meta `name:"pack"`
+	Src    string `name:"SRC" arg:"true" v:"required" brief:"{cPackSrcBrief}"`
+	Dst    string `name:"DST" arg:"true" v:"required" brief:"{cPackDstBrief}"`
+	Name   string `name:"name"   short:"n" brief:"{cPackNameBrief}"`
+	Prefix string `name:"prefix" short:"p" brief:"{cPackPrefixBrief}"`
 }
-
 type cPackOutput struct{}
 
 func (c cPack) Index(ctx context.Context, in cPackInput) (out *cPackOutput, err error) {
@@ -80,16 +75,12 @@ func (c cPack) Index(ctx context.Context, in cPackInput) (out *cPackOutput, err
 	if in.Name == "" && gfile.ExtName(in.Dst) == "go" {
 		in.Name = gfile.Basename(gfile.Dir(in.Dst))
 	}
-	var option = gres.Option{
-		Prefix:   in.Prefix,
-		KeepPath: in.KeepPath,
-	}
 	if in.Name != "" {
-		if err = gres.PackToGoFileWithOption(in.Src, in.Dst, in.Name, option); err != nil {
+		if err = gres.PackToGoFile(in.Src, in.Dst, in.Name, in.Prefix); err != nil {
 			mlog.Fatalf("pack failed: %v", err)
 		}
 	} else {
-		if err = gres.PackToFileWithOption(in.Src, in.Dst, option); err != nil {
+		if err = gres.PackToFile(in.Src, in.Dst, in.Prefix); err != nil {
 			mlog.Fatalf("pack failed: %v", err)
 		}
 	}

cmd/gf/internal/cmd/cmd_run.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"runtime"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/gtype"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
@@ -13,8 +14,6 @@ import (
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/os/gtimer"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/cmd/cmd_tpl.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"context"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -10,8 +11,6 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
 	"github.com/gogf/gf/v2/util/gutil"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/cmd/cmd_version.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -11,8 +12,6 @@ import (
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (
@@ -26,7 +25,6 @@ type cVersion struct {
 type cVersionInput struct {
 	g.Meta `name:"version"`
 }
-
 type cVersionOutput struct{}
 
 func (c cVersion) Index(ctx context.Context, in cVersionInput) (*cVersionOutput, error) {

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

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
@@ -13,8 +14,6 @@ import (
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 const (
@@ -63,7 +62,6 @@ CONFIGURATION SUPPORT
 	CGenDaoBriefDescriptionTag  = `add comment to description tag for each field`
 	CGenDaoBriefNoJsonTag       = `no json tag will be added for each field`
 	CGenDaoBriefNoModelComment  = `no model comment will be added for each field`
-	CGenDaoBriefClear           = `delete all generated go files that do not exist in database`
 	CGenDaoBriefGroup           = `
 specifying the configuration group name of database for generated ORM instance,
 it's not necessary and the default value is "default"
@@ -80,10 +78,6 @@ 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}`
@@ -95,7 +89,6 @@ generated json tag case for model struct, cases are as follows:
 	tplVarColumnNames             = `{TplColumnNames}`
 	tplVarGroupName               = `{TplGroupName}`
 	tplVarDatetimeStr             = `{TplDatetimeStr}`
-	tplVarCreatedAtDatetimeStr    = `{TplCreatedAtDatetimeStr}`
 )
 
 var (
@@ -104,77 +97,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,
-		`CGenDaoBriefClear`:              CGenDaoBriefClear,
-		`CGenDaoBriefGroup`:              CGenDaoBriefGroup,
-		`CGenDaoBriefJsonCase`:           CGenDaoBriefJsonCase,
-		`CGenDaoBriefTplDaoIndexPath`:    CGenDaoBriefTplDaoIndexPath,
-		`CGenDaoBriefTplDaoInternalPath`: CGenDaoBriefTplDaoInternalPath,
-		`CGenDaoBriefTplDaoDoPathPath`:   CGenDaoBriefTplDaoDoPathPath,
-		`CGenDaoBriefTplDaoEntityPath`:   CGenDaoBriefTplDaoEntityPath,
+		`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,
 	})
 }
 
 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"`
-		TplDaoIndexPath    string `name:"tplDaoIndexPath"     short:"t1" brief:"{CGenDaoBriefTplDaoIndexPath}"`
-		TplDaoInternalPath string `name:"tplDaoInternalPath"  short:"t2" brief:"{CGenDaoBriefTplDaoInternalPath}"`
-		TplDaoDoPath       string `name:"tplDaoDoPath"        short:"t3" brief:"{CGenDaoBriefTplDaoDoPathPath}"`
-		TplDaoEntityPath   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"`
-		Clear              bool   `name:"clear"               short:"a"  brief:"{CGenDaoBriefClear}" 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"`
+		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{}
 
 	CGenDaoInternalInput struct {
 		CGenDaoInput
-		DB            gdb.DB
-		TableNames    []string
-		NewTableNames []string
-		ModName       string // Module name of current golang project, which is used for import purpose.
+		TableName    string // TableName specifies the table name of the table.
+		NewTableName string // NewTableName specifies the prefix-stripped name of the table.
+		ModName      string // ModName specifies the module name of current golang project, which is used for import purpose.
 	}
 )
 
@@ -273,30 +255,23 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 		}
 		newTableName = in.Prefix + newTableName
 		newTableNames[i] = newTableName
+		// Dao.
+		generateDao(ctx, db, CGenDaoInternalInput{
+			CGenDaoInput: in,
+			TableName:    tableName,
+			NewTableName: newTableName,
+			ModName:      modName,
+		})
 	}
-	// Dao: index and internal.
-	generateDao(ctx, CGenDaoInternalInput{
-		CGenDaoInput:  in,
-		DB:            db,
-		TableNames:    tableNames,
-		NewTableNames: newTableNames,
-		ModName:       modName,
-	})
 	// Do.
-	generateDo(ctx, CGenDaoInternalInput{
-		CGenDaoInput:  in,
-		DB:            db,
-		TableNames:    tableNames,
-		NewTableNames: newTableNames,
-		ModName:       modName,
+	generateDo(ctx, db, tableNames, newTableNames, CGenDaoInternalInput{
+		CGenDaoInput: in,
+		ModName:      modName,
 	})
 	// Entity.
-	generateEntity(ctx, CGenDaoInternalInput{
-		CGenDaoInput:  in,
-		DB:            db,
-		TableNames:    tableNames,
-		NewTableNames: newTableNames,
-		ModName:       modName,
+	generateEntity(ctx, db, tableNames, newTableNames, CGenDaoInternalInput{
+		CGenDaoInput: in,
+		ModName:      modName,
 	})
 }
 
@@ -330,14 +305,12 @@ func getImportPartContent(source string, isDo bool) string {
 }
 
 func replaceDefaultVar(in CGenDaoInternalInput, origin string) string {
-	var tplCreatedAtDatetimeStr string
-	var tplDatetimeStr string = createdAt.String()
+	var tplDatetimeStr string
 	if in.WithTime {
-		tplCreatedAtDatetimeStr = fmt.Sprintf(`Created at %s`, tplDatetimeStr)
+		tplDatetimeStr = fmt.Sprintf(`Created at %s`, createdAt.String())
 	}
 	return gstr.ReplaceByMap(origin, g.MapStrStr{
-		tplVarDatetimeStr:          tplDatetimeStr,
-		tplVarCreatedAtDatetimeStr: tplCreatedAtDatetimeStr,
+		tplVarDatetimeStr: tplDatetimeStr,
 	})
 }
 
@@ -364,12 +337,3 @@ 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_clear.go

@@ -1,24 +0,0 @@
-package gendao
-
-import (
-	"context"
-
-	"github.com/gogf/gf/v2/os/gfile"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
-)
-
-func doClear(ctx context.Context, dirPath string) {
-	files, err := gfile.ScanDirFile(dirPath, "*.go", true)
-	if err != nil {
-		mlog.Fatal(err)
-	}
-	for _, file := range files {
-		if utils.IsFileDoNotEdit(file) {
-			if err = gfile.Remove(file); err != nil {
-				mlog.Print(err)
-			}
-		}
-	}
-}

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

@@ -6,54 +6,27 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/olekukonko/tablewriter"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
-func generateDao(ctx context.Context, in CGenDaoInternalInput) {
-	var (
-		dirPathDao         = gfile.Join(in.Path, in.DaoPath)
-		dirPathDaoInternal = gfile.Join(dirPathDao, "internal")
-	)
-	if in.Clear {
-		doClear(ctx, dirPathDao)
-	}
-	for i := 0; i < len(in.TableNames); i++ {
-		generateDaoSingle(ctx, generateDaoSingleInput{
-			CGenDaoInternalInput: in,
-			TableName:            in.TableNames[i],
-			NewTableName:         in.NewTableNames[i],
-			DirPathDao:           dirPathDao,
-			DirPathDaoInternal:   dirPathDaoInternal,
-		})
-	}
-}
-
-type generateDaoSingleInput struct {
-	CGenDaoInternalInput
-	TableName          string // TableName specifies the table name of the table.
-	NewTableName       string // NewTableName specifies the prefix-stripped name of the table.
-	DirPathDao         string
-	DirPathDaoInternal string
-}
-
-// generateDaoSingle generates the dao and model content of given table.
-func generateDaoSingle(ctx context.Context, in generateDaoSingleInput) {
+// generateDaoContentFile generates the dao and model content of given table.
+func generateDao(ctx context.Context, db gdb.DB, in CGenDaoInternalInput) {
 	// Generating table data preparing.
-	fieldMap, err := in.DB.TableFields(ctx, in.TableName)
+	fieldMap, err := db.TableFields(ctx, in.TableName)
 	if err != nil {
 		mlog.Fatalf(`fetching tables fields failed for table "%s": %+v`, in.TableName, err)
 	}
 	var (
 		dirRealPath             = gfile.RealPath(in.Path)
+		dirPathDao              = gfile.Join(in.Path, in.DaoPath)
 		tableNameCamelCase      = gstr.CaseCamel(in.NewTableName)
 		tableNameCamelLowerCase = gstr.CaseCamelLower(in.NewTableName)
 		tableNameSnakeCase      = gstr.CaseSnake(in.NewTableName)
@@ -82,45 +55,22 @@ func generateDaoSingle(ctx context.Context, in generateDaoSingleInput) {
 	}
 
 	// dao - index
-	generateDaoIndex(generateDaoIndexInput{
-		generateDaoSingleInput:  in,
-		TableNameCamelCase:      tableNameCamelCase,
-		TableNameCamelLowerCase: tableNameCamelLowerCase,
-		ImportPrefix:            importPrefix,
-		FileName:                fileName,
-	})
+	generateDaoIndex(in, tableNameCamelCase, tableNameCamelLowerCase, importPrefix, dirPathDao, fileName)
 
 	// dao - internal
-	generateDaoInternal(generateDaoInternalInput{
-		generateDaoSingleInput:  in,
-		TableNameCamelCase:      tableNameCamelCase,
-		TableNameCamelLowerCase: tableNameCamelLowerCase,
-		ImportPrefix:            importPrefix,
-		FileName:                fileName,
-		FieldMap:                fieldMap,
-	})
+	generateDaoInternal(in, tableNameCamelCase, tableNameCamelLowerCase, importPrefix, dirPathDao, fileName, fieldMap)
 }
 
-type generateDaoIndexInput struct {
-	generateDaoSingleInput
-	TableNameCamelCase      string
-	TableNameCamelLowerCase string
-	ImportPrefix            string
-	FileName                string
-}
-
-func generateDaoIndex(in generateDaoIndexInput) {
-	path := gfile.Join(in.DirPathDao, in.FileName+".go")
+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(
-			getTemplateFromPathOrDefault(in.TplDaoIndexPath, consts.TemplateGenDaoIndexContent),
-			g.MapStrStr{
-				tplVarImportPrefix:            in.ImportPrefix,
-				tplVarTableName:               in.TableName,
-				tplVarTableNameCamelCase:      in.TableNameCamelCase,
-				tplVarTableNameCamelLowerCase: in.TableNameCamelLowerCase,
-			})
-		indexContent = replaceDefaultVar(in.CGenDaoInternalInput, indexContent)
+		indexContent := gstr.ReplaceByMap(getTplDaoIndexContent(""), 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)
 		} else {
@@ -130,29 +80,23 @@ func generateDaoIndex(in generateDaoIndexInput) {
 	}
 }
 
-type generateDaoInternalInput struct {
-	generateDaoSingleInput
-	TableNameCamelCase      string
-	TableNameCamelLowerCase string
-	ImportPrefix            string
-	FileName                string
-	FieldMap                map[string]*gdb.TableField
-}
-
-func generateDaoInternal(in generateDaoInternalInput) {
-	path := gfile.Join(in.DirPathDaoInternal, in.FileName+".go")
-	modelContent := gstr.ReplaceByMap(
-		getTemplateFromPathOrDefault(in.TplDaoInternalPath, consts.TemplateGenDaoInternalContent),
-		g.MapStrStr{
-			tplVarImportPrefix:            in.ImportPrefix,
-			tplVarTableName:               in.TableName,
-			tplVarGroupName:               in.Group,
-			tplVarTableNameCamelCase:      in.TableNameCamelCase,
-			tplVarTableNameCamelLowerCase: in.TableNameCamelLowerCase,
-			tplVarColumnDefine:            gstr.Trim(generateColumnDefinitionForDao(in.FieldMap)),
-			tplVarColumnNames:             gstr.Trim(generateColumnNamesForDao(in.FieldMap)),
-		})
-	modelContent = replaceDefaultVar(in.CGenDaoInternalInput, modelContent)
+func generateDaoInternal(
+	in CGenDaoInternalInput,
+	tableNameCamelCase, tableNameCamelLowerCase, importPrefix string,
+	dirPathDao, fileName string,
+	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 = replaceDefaultVar(in, modelContent)
 	if err := gfile.PutContents(path, strings.TrimSpace(modelContent)); err != nil {
 		mlog.Fatalf("writing content to '%s' failed: %v", path, err)
 	} else {
@@ -161,6 +105,20 @@ func generateDaoInternal(in generateDaoInternalInput) {
 	}
 }
 
+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

@@ -5,36 +5,35 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
+	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
-func generateDo(ctx context.Context, in CGenDaoInternalInput) {
-	var dirPathDo = gfile.Join(in.Path, in.DoPath)
-	if in.Clear {
-		doClear(ctx, dirPathDo)
-	}
+func generateDo(ctx context.Context, db gdb.DB, tableNames, newTableNames []string, in CGenDaoInternalInput) {
+	var (
+		doDirPath = gfile.Join(in.Path, in.DoPath)
+	)
 	in.NoJsonTag = true
 	in.DescriptionTag = false
 	in.NoModelComment = false
 	// Model content.
-	for i, tableName := range in.TableNames {
-		fieldMap, err := in.DB.TableFields(ctx, tableName)
+	for i, tableName := range tableNames {
+		in.TableName = tableName
+		fieldMap, err := db.TableFields(ctx, tableName)
 		if err != nil {
-			mlog.Fatalf("fetching tables fields failed for table '%s':\n%v", tableName, err)
+			mlog.Fatalf("fetching tables fields failed for table '%s':\n%v", in.TableName, err)
 		}
 		var (
-			newTableName     = in.NewTableNames[i]
-			doFilePath       = gfile.Join(dirPathDo, gstr.CaseSnake(newTableName)+".go")
-			structDefinition = generateStructDefinition(ctx, generateStructDefinitionInput{
+			newTableName     = newTableNames[i]
+			doFilePath       = gfile.Join(doDirPath, gstr.CaseSnake(newTableName)+".go")
+			structDefinition = generateStructDefinition(generateStructDefinitionInput{
 				CGenDaoInternalInput: in,
-				TableName:            tableName,
 				StructName:           gstr.CaseCamel(newTableName),
 				FieldMap:             fieldMap,
 				IsDo:                 true,
@@ -69,14 +68,12 @@ func generateDo(ctx context.Context, in CGenDaoInternalInput) {
 }
 
 func generateDoContent(in CGenDaoInternalInput, tableName, tableNameCamelCase, structDefine string) string {
-	doContent := gstr.ReplaceByMap(
-		getTemplateFromPathOrDefault(in.TplDaoDoPath, consts.TemplateGenDaoDoContent),
-		g.MapStrStr{
-			tplVarTableName:          tableName,
-			tplVarPackageImports:     getImportPartContent(structDefine, true),
-			tplVarTableNameCamelCase: tableNameCamelCase,
-			tplVarStructDefine:       structDefine,
-		})
+	doContent := gstr.ReplaceByMap(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

@@ -4,36 +4,32 @@ import (
 	"context"
 	"strings"
 
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/text/gstr"
-
 	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/text/gstr"
 )
 
-func generateEntity(ctx context.Context, in CGenDaoInternalInput) {
-	var dirPathEntity = gfile.Join(in.Path, in.EntityPath)
-	if in.Clear {
-		doClear(ctx, dirPathEntity)
-	}
+func generateEntity(ctx context.Context, db gdb.DB, tableNames, newTableNames []string, in CGenDaoInternalInput) {
+	var entityDirPath = gfile.Join(in.Path, in.EntityPath)
 	// Model content.
-	for i, tableName := range in.TableNames {
-		fieldMap, err := in.DB.TableFields(ctx, tableName)
+	for i, tableName := range tableNames {
+		fieldMap, err := db.TableFields(ctx, tableName)
 		if err != nil {
-			mlog.Fatalf("fetching tables fields failed for table '%s':\n%v", tableName, err)
+			mlog.Fatalf("fetching tables fields failed for table '%s':\n%v", in.TableName, err)
 		}
 		var (
-			newTableName   = in.NewTableNames[i]
-			entityFilePath = gfile.Join(dirPathEntity, gstr.CaseSnake(newTableName)+".go")
+			newTableName   = newTableNames[i]
+			entityFilePath = gfile.Join(entityDirPath, gstr.CaseSnake(newTableName)+".go")
 			entityContent  = generateEntityContent(
 				in,
 				newTableName,
 				gstr.CaseCamel(newTableName),
-				generateStructDefinition(ctx, generateStructDefinitionInput{
+				generateStructDefinition(generateStructDefinitionInput{
 					CGenDaoInternalInput: in,
-					TableName:            tableName,
 					StructName:           gstr.CaseCamel(newTableName),
 					FieldMap:             fieldMap,
 					IsDo:                 false,
@@ -51,14 +47,12 @@ func generateEntity(ctx context.Context, in CGenDaoInternalInput) {
 }
 
 func generateEntityContent(in CGenDaoInternalInput, tableName, tableNameCamelCase, structDefine string) string {
-	entityContent := gstr.ReplaceByMap(
-		getTemplateFromPathOrDefault(in.TplDaoEntityPath, consts.TemplateGenDaoEntityContent),
-		g.MapStrStr{
-			tplVarTableName:          tableName,
-			tplVarPackageImports:     getImportPartContent(structDefine, false),
-			tplVarTableNameCamelCase: tableNameCamelCase,
-			tplVarStructDefine:       structDefine,
-		})
+	entityContent := gstr.ReplaceByMap(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,19 +14,18 @@ import (
 
 type generateStructDefinitionInput struct {
 	CGenDaoInternalInput
-	TableName  string                     // Table name.
 	StructName string                     // Struct name.
 	FieldMap   map[string]*gdb.TableField // Table field map.
 	IsDo       bool                       // Is generating DTO struct.
 }
 
-func generateStructDefinition(ctx context.Context, in generateStructDefinitionInput) string {
+func generateStructDefinition(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(ctx, field, in)
+		array[index] = generateStructFieldDefinition(field, in)
 	}
 	tw := tablewriter.NewWriter(buffer)
 	tw.SetBorder(false)
@@ -51,39 +50,92 @@ func generateStructDefinition(ctx context.Context, in generateStructDefinitionIn
 }
 
 // generateStructFieldForModel generates and returns the attribute definition for specified field.
-func generateStructFieldDefinition(
-	ctx context.Context, field *gdb.TableField, in generateStructDefinitionInput,
-) []string {
+func generateStructFieldDefinition(field *gdb.TableField, in generateStructDefinitionInput) []string {
 	var (
-		err      error
 		typeName string
 		jsonTag  = getJsonTagFromCase(field.Name, in.JsonCase)
 	)
-	typeName, err = in.DB.CheckLocalTypeForField(ctx, field.Type, nil)
-	if err != nil {
-		panic(err)
-	}
-	switch typeName {
-	case gdb.LocalTypeDate, gdb.LocalTypeDatetime:
+	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":
 		if in.StdTime {
 			typeName = "time.Time"
 		} else {
 			typeName = "*gtime.Time"
 		}
-
-	case gdb.LocalTypeInt64Bytes:
-		typeName = "int64"
-
-	case gdb.LocalTypeUint64Bytes:
-		typeName = "uint64"
-
-	// Special type handle.
-	case gdb.LocalTypeJson, gdb.LocalTypeJsonb:
+	case "json", "jsonb":
 		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/cmd/genservice/genservice.go

@@ -1,277 +0,0 @@
-package genservice
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/gogf/gf/v2/container/garray"
-	"github.com/gogf/gf/v2/container/gset"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gproc"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
-)
-
-const (
-	CGenServiceConfig = `gfcli.gen.service`
-	CGenServiceUsage  = `gf gen service [OPTION]`
-	CGenServiceBrief  = `parse struct and associated functions from packages to generate service go file`
-	CGenServiceEg     = `
-gf gen service
-gf gen service -f Snake
-`
-	CGenServiceBriefSrcFolder    = `source folder path to be parsed. default: internal/logic`
-	CGenServiceBriefDstFolder    = `destination folder path storing automatically generated go files. default: internal/service`
-	CGenServiceBriefFileNameCase = `
-destination file name storing automatically generated go files, cases are as follows:
-| Case            | Example            |
-|---------------- |--------------------|
-| Lower           | anykindofstring    |
-| Camel           | AnyKindOfString    |
-| CamelLower      | anyKindOfString    |
-| Snake           | any_kind_of_string | default
-| SnakeScreaming  | ANY_KIND_OF_STRING |
-| SnakeFirstUpper | rgb_code_md5       |
-| Kebab           | any-kind-of-string |
-| KebabScreaming  | ANY-KIND-OF-STRING |
-`
-	CGenServiceBriefWatchFile    = `used in file watcher, it re-generates all service go files only if given file is under srcFolder`
-	CGenServiceBriefStPattern    = `regular expression matching struct name for generating service. default: ^s([A-Z]\\\\w+)$`
-	CGenServiceBriefPackages     = `produce go files only for given source packages`
-	CGenServiceBriefImportPrefix = `custom import prefix to calculate import path for generated importing go file of logic`
-	CGenServiceBriefClear        = `delete all generated go files that are not used any further`
-)
-
-func init() {
-	gtag.Sets(g.MapStrStr{
-		`CGenServiceConfig`:            CGenServiceConfig,
-		`CGenServiceUsage`:             CGenServiceUsage,
-		`CGenServiceBrief`:             CGenServiceBrief,
-		`CGenServiceEg`:                CGenServiceEg,
-		`CGenServiceBriefSrcFolder`:    CGenServiceBriefSrcFolder,
-		`CGenServiceBriefDstFolder`:    CGenServiceBriefDstFolder,
-		`CGenServiceBriefFileNameCase`: CGenServiceBriefFileNameCase,
-		`CGenServiceBriefWatchFile`:    CGenServiceBriefWatchFile,
-		`CGenServiceBriefStPattern`:    CGenServiceBriefStPattern,
-		`CGenServiceBriefPackages`:     CGenServiceBriefPackages,
-		`CGenServiceBriefImportPrefix`: CGenServiceBriefImportPrefix,
-		`CGenServiceBriefClear`:        CGenServiceBriefClear,
-	})
-}
-
-type (
-	CGenService      struct{}
-	CGenServiceInput struct {
-		g.Meta          `name:"service" config:"{CGenServiceConfig}" usage:"{CGenServiceUsage}" brief:"{CGenServiceBrief}" eg:"{CGenServiceEg}"`
-		SrcFolder       string   `short:"s" name:"srcFolder" brief:"{CGenServiceBriefSrcFolder}" d:"internal/logic"`
-		DstFolder       string   `short:"d" name:"dstFolder" brief:"{CGenServiceBriefDstFolder}" d:"internal/service"`
-		DstFileNameCase string   `short:"f" name:"dstFileNameCase" brief:"{CGenServiceBriefFileNameCase}" d:"Snake"`
-		WatchFile       string   `short:"w" name:"watchFile" brief:"{CGenServiceBriefWatchFile}"`
-		StPattern       string   `short:"a" name:"stPattern" brief:"{CGenServiceBriefStPattern}" d:"^s([A-Z]\\w+)$"`
-		Packages        []string `short:"p" name:"packages" brief:"{CGenServiceBriefPackages}"`
-		ImportPrefix    string   `short:"i" name:"importPrefix" brief:"{CGenServiceBriefImportPrefix}"`
-		Clear           bool     `short:"l" name:"clear" brief:"{CGenServiceBriefClear}" orphan:"true"`
-	}
-	CGenServiceOutput struct{}
-)
-
-const (
-	genServiceFileLockSeconds = 10
-)
-
-func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGenServiceOutput, err error) {
-	// File lock to avoid multiple processes.
-	var (
-		flockFilePath = gfile.Temp("gf.cli.gen.service.lock")
-		flockContent  = gfile.GetContents(flockFilePath)
-	)
-	if flockContent != "" {
-		if gtime.Timestamp()-gconv.Int64(flockContent) < genServiceFileLockSeconds {
-			// If another "gen service" process is running, it just exits.
-			mlog.Debug(`another "gen service" process is running, exit`)
-			return
-		}
-	}
-	defer gfile.Remove(flockFilePath)
-	_ = gfile.PutContents(flockFilePath, gtime.TimestampStr())
-
-	in.SrcFolder = gstr.TrimRight(in.SrcFolder, `\/`)
-	in.SrcFolder = gstr.Replace(in.SrcFolder, "\\", "/")
-	in.WatchFile = gstr.TrimRight(in.WatchFile, `\/`)
-	in.WatchFile = gstr.Replace(in.WatchFile, "\\", "/")
-
-	// Watch file handling.
-	if in.WatchFile != "" {
-		// It works only if given WatchFile is in SrcFolder.
-		var (
-			watchFileDir = gfile.Dir(in.WatchFile)
-			srcFolderDir = gfile.Dir(watchFileDir)
-		)
-		mlog.Debug("watchFileDir:", watchFileDir)
-		mlog.Debug("logicFolderDir:", srcFolderDir)
-		if !gstr.HasSuffix(gstr.Replace(srcFolderDir, `\`, `/`), in.SrcFolder) {
-			mlog.Printf(`ignore watch file "%s", not in source path "%s"`, in.WatchFile, in.SrcFolder)
-			return
-		}
-		var newWorkingDir = gfile.Dir(gfile.Dir(srcFolderDir))
-		if err = gfile.Chdir(newWorkingDir); err != nil {
-			mlog.Fatalf(`%+v`, err)
-		}
-		mlog.Debug("Chdir:", newWorkingDir)
-		_ = gfile.Remove(flockFilePath)
-		var command = fmt.Sprintf(
-			`%s gen service -packages=%s`,
-			gfile.SelfName(), gfile.Basename(watchFileDir),
-		)
-		err = gproc.ShellRun(ctx, command)
-		return
-	}
-
-	if !gfile.Exists(in.SrcFolder) {
-		mlog.Fatalf(`source folder path "%s" does not exist`, in.SrcFolder)
-	}
-
-	if in.ImportPrefix == "" {
-		if !gfile.Exists("go.mod") {
-			mlog.Fatal("ImportPrefix is empty and go.mod does not exist in current working directory")
-		}
-		var (
-			goModContent = gfile.GetContents("go.mod")
-			match, _     = gregex.MatchString(`^module\s+(.+)\s*`, goModContent)
-		)
-		if len(match) > 1 {
-			in.ImportPrefix = fmt.Sprintf(`%s/%s`, gstr.Trim(match[1]), gstr.Replace(in.SrcFolder, `\`, `/`))
-		}
-	}
-
-	var (
-		isDirty                 bool                                         // Temp boolean.
-		files                   []string                                     // Temp file array.
-		fileContent             string                                       // Temp file content for handling go file.
-		initImportSrcPackages   []string                                     // Used for generating logic.go.
-		inputPackages           = in.Packages                                // Custom packages.
-		dstPackageName          = gstr.ToLower(gfile.Basename(in.DstFolder)) // Package name for generated go files.
-		generatedDstFilePathSet = gset.NewStrSet()                           // All generated file path set.
-	)
-	// The first level folders.
-	srcFolderPaths, err := gfile.ScanDir(in.SrcFolder, "*", false)
-	if err != nil {
-		return nil, err
-	}
-	for _, srcFolderPath := range srcFolderPaths {
-		if !gfile.IsDir(srcFolderPath) {
-			continue
-		}
-		// Only retrieve sub files, no recursively.
-		if files, err = gfile.ScanDir(srcFolderPath, "*.go", false); err != nil {
-			return nil, err
-		}
-		if len(files) == 0 {
-			continue
-		}
-		var (
-			// StructName => FunctionDefinitions
-			srcPkgInterfaceMap  = make(map[string]*garray.StrArray)
-			srcImportedPackages = garray.NewSortedStrArray().SetUnique(true)
-			srcPackageName      = gfile.Basename(srcFolderPath)
-			ok                  bool
-			dstFilePath         = gfile.Join(in.DstFolder,
-				c.getDstFileNameCase(srcPackageName, in.DstFileNameCase)+".go",
-			)
-		)
-		generatedDstFilePathSet.Add(dstFilePath)
-		for _, file := range files {
-			fileContent = gfile.GetContents(file)
-			// Calculate imported packages of source go files.
-			err = c.calculateImportedPackages(fileContent, srcImportedPackages)
-			if err != nil {
-				return nil, err
-			}
-			// Calculate functions and interfaces for service generating.
-			err = c.calculateInterfaceFunctions(in, fileContent, srcPkgInterfaceMap, dstPackageName)
-			if err != nil {
-				return nil, err
-			}
-		}
-		initImportSrcPackages = append(
-			initImportSrcPackages,
-			fmt.Sprintf(`%s/%s`, in.ImportPrefix, srcPackageName),
-		)
-		// Ignore source packages if input packages given.
-		if len(inputPackages) > 0 && !gstr.InArray(inputPackages, srcPackageName) {
-			mlog.Debugf(
-				`ignore source package "%s" as it is not in desired packages: %+v`,
-				srcPackageName, inputPackages,
-			)
-			continue
-		}
-		// Generating service go file for logic.
-		if ok, err = c.generateServiceFile(generateServiceFilesInput{
-			CGenServiceInput:    in,
-			SrcStructFunctions:  srcPkgInterfaceMap,
-			SrcImportedPackages: srcImportedPackages.Slice(),
-			SrcPackageName:      srcPackageName,
-			DstPackageName:      dstPackageName,
-			DstFilePath:         dstFilePath,
-		}); err != nil {
-			return
-		}
-		if ok {
-			isDirty = true
-		}
-	}
-
-	if in.Clear {
-		files, err = gfile.ScanDirFile(in.DstFolder, "*.go", false)
-		if err != nil {
-			return nil, err
-		}
-		var relativeFilePath string
-		for _, file := range files {
-			relativeFilePath = gstr.SubStrFromR(file, in.DstFolder)
-			if !generatedDstFilePathSet.Contains(relativeFilePath) && utils.IsFileDoNotEdit(relativeFilePath) {
-				mlog.Printf(`remove no longer used service file: %s`, relativeFilePath)
-				if err = gfile.Remove(file); err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	if isDirty {
-		// Generate initialization go file.
-		if len(initImportSrcPackages) > 0 {
-			if err = c.generateInitializationFile(in, initImportSrcPackages); err != nil {
-				return
-			}
-		}
-
-		// Replace v1 to v2 for GoFrame.
-		if err = c.replaceGeneratedServiceContentGFV2(in); err != nil {
-			return nil, err
-		}
-		mlog.Printf(`gofmt go files in "%s"`, in.DstFolder)
-		utils.GoFmt(in.DstFolder)
-	}
-
-	mlog.Print(`done!`)
-	return
-}
-
-func (c CGenService) replaceGeneratedServiceContentGFV2(in CGenServiceInput) (err error) {
-	return gfile.ReplaceDirFunc(func(path, content string) string {
-		if gstr.Contains(content, `"github.com/gogf/gf`) && !gstr.Contains(content, `"github.com/gogf/gf/v2`) {
-			content = gstr.Replace(content, `"github.com/gogf/gf"`, `"github.com/gogf/gf/v2"`)
-			content = gstr.Replace(content, `"github.com/gogf/gf/`, `"github.com/gogf/gf/v2/`)
-			return content
-		}
-		return content
-	}, in.DstFolder, "*.go", false)
-}

cmd/gf/internal/cmd/genservice/genservice_calculate.go

@@ -1,105 +0,0 @@
-package genservice
-
-import (
-	"go/parser"
-	"go/token"
-
-	"github.com/gogf/gf/v2/container/garray"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
-)
-
-func (c CGenService) calculateImportedPackages(fileContent string, srcImportedPackages *garray.SortedStrArray) (err error) {
-	f, err := parser.ParseFile(token.NewFileSet(), "", fileContent, parser.ImportsOnly)
-	if err != nil {
-		return err
-	}
-	for _, s := range f.Imports {
-		if s.Path != nil {
-			if s.Name != nil {
-				// If it has alias, and it is not `_`.
-				if pkgAlias := s.Name.String(); pkgAlias != "_" {
-					srcImportedPackages.Add(pkgAlias + " " + s.Path.Value)
-				}
-			} else {
-				// no alias
-				srcImportedPackages.Add(s.Path.Value)
-			}
-		}
-	}
-	return nil
-}
-
-func (c CGenService) calculateInterfaceFunctions(
-	in CGenServiceInput, fileContent string, srcPkgInterfaceMap map[string]*garray.StrArray, dstPackageName string,
-) (err error) {
-	var (
-		ok                       bool
-		matches                  [][]string
-		srcPkgInterfaceFuncArray *garray.StrArray
-	)
-	// calculate struct name and its functions according function definitions.
-	matches, err = gregex.MatchAllString(`func \((.+?)\) ([\s\S]+?) {`, fileContent)
-	if err != nil {
-		return err
-	}
-	for _, match := range matches {
-		var (
-			structName    string
-			structMatch   []string
-			funcReceiver  = gstr.Trim(match[1])
-			receiverArray = gstr.SplitAndTrim(funcReceiver, " ")
-			functionHead  = gstr.Trim(gstr.Replace(match[2], "\n", ""))
-		)
-		if len(receiverArray) > 1 {
-			structName = receiverArray[1]
-		} else {
-			structName = receiverArray[0]
-		}
-		structName = gstr.Trim(structName, "*")
-
-		// Case of:
-		// Xxx(\n    ctx context.Context, req *v1.XxxReq,\n) -> Xxx(ctx context.Context, req *v1.XxxReq)
-		functionHead = gstr.Replace(functionHead, `,)`, `)`)
-		functionHead, _ = gregex.ReplaceString(`\(\s+`, `(`, functionHead)
-		functionHead, _ = gregex.ReplaceString(`\s{2,}`, ` `, functionHead)
-		if !gstr.IsLetterUpper(functionHead[0]) {
-			continue
-		}
-		// Match and pick the struct name from receiver.
-		if structMatch, err = gregex.MatchString(in.StPattern, structName); err != nil {
-			return err
-		}
-		if len(structMatch) < 1 {
-			continue
-		}
-		structName = gstr.CaseCamel(structMatch[1])
-		if srcPkgInterfaceFuncArray, ok = srcPkgInterfaceMap[structName]; !ok {
-			srcPkgInterfaceMap[structName] = garray.NewStrArray()
-			srcPkgInterfaceFuncArray = srcPkgInterfaceMap[structName]
-		}
-		srcPkgInterfaceFuncArray.Append(functionHead)
-	}
-	// calculate struct name according type definitions.
-	matches, err = gregex.MatchAllString(`type (.+) struct\s*{`, fileContent)
-	if err != nil {
-		return err
-	}
-	for _, match := range matches {
-		var (
-			structName  string
-			structMatch []string
-		)
-		if structMatch, err = gregex.MatchString(in.StPattern, match[1]); err != nil {
-			return err
-		}
-		if len(structMatch) < 1 {
-			continue
-		}
-		structName = gstr.CaseCamel(structMatch[1])
-		if srcPkgInterfaceFuncArray, ok = srcPkgInterfaceMap[structName]; !ok {
-			srcPkgInterfaceMap[structName] = garray.NewStrArray()
-		}
-	}
-	return nil
-}

cmd/gf/internal/cmd/genservice/genservice_generate.go

@@ -1,199 +0,0 @@
-package genservice
-
-import (
-	"fmt"
-
-	"github.com/gogf/gf/v2/container/garray"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
-)
-
-type generateServiceFilesInput struct {
-	CGenServiceInput
-	DstFilePath         string // Absolute file path for generated service go file.
-	SrcStructFunctions  map[string]*garray.StrArray
-	SrcImportedPackages []string
-	SrcPackageName      string
-	DstPackageName      string
-}
-
-func (c CGenService) generateServiceFile(in generateServiceFilesInput) (ok bool, err error) {
-	var (
-		generatedContent        string
-		allFuncArray            = garray.NewStrArray() // Used for check whether interface dirty, going to change file content.
-		importedPackagesContent = fmt.Sprintf(
-			"import (\n%s\n)", gstr.Join(in.SrcImportedPackages, "\n"),
-		)
-	)
-	generatedContent += gstr.ReplaceByMap(consts.TemplateGenServiceContentHead, g.MapStrStr{
-		"{Imports}":     importedPackagesContent,
-		"{PackageName}": in.DstPackageName,
-	})
-
-	// Type definitions.
-	generatedContent += "type("
-	generatedContent += "\n"
-	for structName, funcArray := range in.SrcStructFunctions {
-		allFuncArray.Append(funcArray.Slice()...)
-		generatedContent += gstr.Trim(gstr.ReplaceByMap(consts.TemplateGenServiceContentInterface, g.MapStrStr{
-			"{InterfaceName}":  "I" + structName,
-			"{FuncDefinition}": funcArray.Join("\n\t"),
-		}))
-		generatedContent += "\n"
-	}
-	generatedContent += ")"
-	generatedContent += "\n"
-
-	// Generating variable and register definitions.
-	var (
-		variableContent          string
-		generatingInterfaceCheck string
-	)
-	// Variable definitions.
-	for structName, _ := range in.SrcStructFunctions {
-		generatingInterfaceCheck = fmt.Sprintf(`[^\w\d]+%s.I%s[^\w\d]`, in.DstPackageName, structName)
-		if gregex.IsMatchString(generatingInterfaceCheck, generatedContent) {
-			continue
-		}
-		variableContent += gstr.Trim(gstr.ReplaceByMap(consts.TemplateGenServiceContentVariable, g.MapStrStr{
-			"{StructName}":    structName,
-			"{InterfaceName}": "I" + structName,
-		}))
-		variableContent += "\n"
-	}
-	if variableContent != "" {
-		generatedContent += "var("
-		generatedContent += "\n"
-		generatedContent += variableContent
-		generatedContent += ")"
-		generatedContent += "\n"
-	}
-	// Variable register function definitions.
-	for structName, _ := range in.SrcStructFunctions {
-		generatingInterfaceCheck = fmt.Sprintf(`[^\w\d]+%s.I%s[^\w\d]`, in.DstPackageName, structName)
-		if gregex.IsMatchString(generatingInterfaceCheck, generatedContent) {
-			continue
-		}
-		generatedContent += gstr.Trim(gstr.ReplaceByMap(consts.TemplateGenServiceContentRegister, g.MapStrStr{
-			"{StructName}":    structName,
-			"{InterfaceName}": "I" + structName,
-		}))
-		generatedContent += "\n\n"
-	}
-
-	// Replace empty braces that have new line.
-	generatedContent, _ = gregex.ReplaceString(`{[\s\t]+}`, `{}`, generatedContent)
-
-	// Remove package name calls of `dstPackageName` in produced codes.
-	generatedContent, _ = gregex.ReplaceString(fmt.Sprintf(`\*{0,1}%s\.`, in.DstPackageName), ``, generatedContent)
-
-	// Write file content to disk.
-	if gfile.Exists(in.DstFilePath) {
-		if !utils.IsFileDoNotEdit(in.DstFilePath) {
-			mlog.Printf(`ignore file as it is manually maintained: %s`, in.DstFilePath)
-			return false, nil
-		}
-		if !c.isToGenerateServiceGoFile(in.DstPackageName, in.DstFilePath, allFuncArray) {
-			mlog.Printf(`not dirty, ignore generating service go file: %s`, in.DstFilePath)
-			return false, nil
-		}
-	}
-	mlog.Printf(`generating service go file: %s`, in.DstFilePath)
-	if err = gfile.PutContents(in.DstFilePath, generatedContent); err != nil {
-		return true, err
-	}
-	return true, nil
-}
-
-// isToGenerateServiceGoFile checks and returns whether the service content dirty.
-func (c CGenService) isToGenerateServiceGoFile(dstPackageName, filePath string, funcArray *garray.StrArray) bool {
-	var (
-		fileContent        = gfile.GetContents(filePath)
-		generatedFuncArray = garray.NewSortedStrArrayFrom(funcArray.Slice())
-		contentFuncArray   = garray.NewSortedStrArray()
-	)
-	if fileContent == "" {
-		return true
-	}
-	matches, _ := gregex.MatchAllString(`\s+interface\s+{([\s\S]+?)}`, fileContent)
-	for _, match := range matches {
-		contentFuncArray.Append(gstr.SplitAndTrim(match[1], "\n")...)
-	}
-	if generatedFuncArray.Len() != contentFuncArray.Len() {
-		mlog.Debugf(
-			`dirty, generatedFuncArray.Len()[%d] != contentFuncArray.Len()[%d]`,
-			generatedFuncArray.Len(), contentFuncArray.Len(),
-		)
-		return true
-	}
-	var funcDefinition string
-	for i := 0; i < generatedFuncArray.Len(); i++ {
-		funcDefinition, _ = gregex.ReplaceString(
-			fmt.Sprintf(`\*{0,1}%s\.`, dstPackageName), ``, generatedFuncArray.At(i),
-		)
-		if funcDefinition != contentFuncArray.At(i) {
-			mlog.Debugf(`dirty, %s != %s`, funcDefinition, contentFuncArray.At(i))
-			return true
-		}
-	}
-	return false
-}
-
-func (c CGenService) generateInitializationFile(in CGenServiceInput, importSrcPackages []string) (err error) {
-	var (
-		srcPackageName   = gstr.ToLower(gfile.Basename(in.SrcFolder))
-		srcFilePath      = gfile.Join(in.SrcFolder, srcPackageName+".go")
-		srcImports       string
-		generatedContent string
-	)
-	if !utils.IsFileDoNotEdit(srcFilePath) {
-		mlog.Debugf(`ignore file as it is manually maintained: %s`, srcFilePath)
-		return nil
-	}
-	for _, importSrcPackage := range importSrcPackages {
-		srcImports += fmt.Sprintf(`%s_ "%s"%s`, "\t", importSrcPackage, "\n")
-	}
-	generatedContent = gstr.ReplaceByMap(consts.TemplateGenServiceLogicContent, g.MapStrStr{
-		"{PackageName}": srcPackageName,
-		"{Imports}":     srcImports,
-	})
-	mlog.Printf(`generating init go file: %s`, srcFilePath)
-	if err = gfile.PutContents(srcFilePath, generatedContent); err != nil {
-		return err
-	}
-	utils.GoFmt(srcFilePath)
-	return nil
-}
-
-// getDstFileNameCase call gstr.Case* function to convert the s to specified case.
-func (c CGenService) getDstFileNameCase(str, caseStr string) string {
-	switch gstr.ToLower(caseStr) {
-	case gstr.ToLower("Lower"):
-		return gstr.ToLower(str)
-
-	case gstr.ToLower("Camel"):
-		return gstr.CaseCamel(str)
-
-	case gstr.ToLower("CamelLower"):
-		return gstr.CaseCamelLower(str)
-
-	case gstr.ToLower("Kebab"):
-		return gstr.CaseKebab(str)
-
-	case gstr.ToLower("KebabScreaming"):
-		return gstr.CaseKebabScreaming(str)
-
-	case gstr.ToLower("SnakeFirstUpper"):
-		return gstr.CaseSnakeFirstUpper(str)
-
-	case gstr.ToLower("SnakeScreaming"):
-		return gstr.CaseSnakeScreaming(str)
-	}
-	return gstr.CaseSnake(str)
-}

cmd/gf/internal/consts/consts_gen_dao_template_dao.go

@@ -1,6 +1,6 @@
 package consts
 
-const TemplateGenDaoIndexContent = `
+const TemplateDaoDaoIndexContent = `
 // =================================================================================
 // This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
@@ -31,9 +31,9 @@ var (
 
 `
 
-const TemplateGenDaoInternalContent = `
+const TemplateDaoDaoInternalContent = `
 // ==========================================================================
-// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplCreatedAtDatetimeStr}
+// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplDatetimeStr}
 // ==========================================================================
 
 package internal
@@ -57,7 +57,7 @@ type {TplTableNameCamelCase}Columns struct {
 	{TplColumnDefine}
 }
 
-// {TplTableNameCamelLowerCase}Columns holds the columns for table {TplTableName}.
+//  {TplTableNameCamelLowerCase}Columns holds the columns for table {TplTableName}.
 var {TplTableNameCamelLowerCase}Columns = {TplTableNameCamelCase}Columns{
 	{TplColumnNames}
 }

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. {TplCreatedAtDatetimeStr}
+// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplDatetimeStr}
 // =================================================================================
 
 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. {TplCreatedAtDatetimeStr}
+// Code generated by GoFrame CLI tool. DO NOT EDIT. {TplDatetimeStr}
 // =================================================================================
 
 package entity

cmd/gf/internal/consts/consts_gen_service_template.go

@@ -1,35 +1,28 @@
 package consts
 
-const TemplateGenServiceContentHead = `
-// ================================================================================
+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}
 
 {Imports}
-`
 
-const TemplateGenServiceContentInterface = `
-{InterfaceName} interface {
+type I{StructName} interface {
 	{FuncDefinition}
 }
-`
 
-const TemplateGenServiceContentVariable = `
-local{StructName} {InterfaceName}
-`
+var local{StructName} I{StructName}
 
-const TemplateGenServiceContentRegister = `
-func {StructName}() {InterfaceName} {
+func {StructName}() I{StructName} {
 	if local{StructName} == nil {
-		panic("implement not found for interface {InterfaceName}, forgot register?")
+		panic("implement not found for interface I{StructName}, forgot register?")
 	}
 	return local{StructName}
 }
 
-func Register{StructName}(i {InterfaceName}) {
+func Register{StructName}(i I{StructName}) {
 	local{StructName} = i
 }
 `

cmd/gf/internal/service/install.go

@@ -5,6 +5,8 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
@@ -13,9 +15,6 @@ import (
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/utility/utils/utils.go

@@ -1,12 +1,11 @@
 package utils
 
 import (
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
 	"golang.org/x/tools/imports"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 // GoFmt formats the source file and adds or removes import statements as necessary.

cmd/gf/main.go

@@ -2,17 +2,16 @@ package main
 
 import (
 	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
-	"github.com/gogf/gf/v2/os/gcmd"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/text/gstr"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/v2/os/gcmd"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/text/gstr"
 )
 
 const (

container/garray/garray_z_unit_sorted_str_test.go

@@ -9,6 +9,7 @@
 package garray_test
 
 import (
+	"github.com/gogf/gf/v2/text/gstr"
 	"testing"
 	"time"
 
@@ -16,7 +17,6 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 )
 

container/glist/glist.go

@@ -407,6 +407,7 @@ func (l *List) Removes(es []*Element) {
 	for _, e := range es {
 		l.list.Remove(e)
 	}
+	return
 }
 
 // RemoveAll removes all elements from list `l`.

container/gmap/gmap_hash_any_any_map.go

@@ -157,7 +157,7 @@ func (m *AnyAnyMap) Search(key interface{}) (value interface{}, found bool) {
 func (m *AnyAnyMap) Get(key interface{}) (value interface{}) {
 	m.mu.RLock()
 	if m.data != nil {
-		value = m.data[key]
+		value, _ = m.data[key]
 	}
 	m.mu.RUnlock()
 	return

container/gmap/gmap_hash_int_any_map.go

@@ -157,7 +157,7 @@ func (m *IntAnyMap) Search(key int) (value interface{}, found bool) {
 func (m *IntAnyMap) Get(key int) (value interface{}) {
 	m.mu.RLock()
 	if m.data != nil {
-		value = m.data[key]
+		value, _ = m.data[key]
 	}
 	m.mu.RUnlock()
 	return

container/gmap/gmap_hash_int_int_map.go

@@ -143,7 +143,7 @@ func (m *IntIntMap) Search(key int) (value int, found bool) {
 func (m *IntIntMap) Get(key int) (value int) {
 	m.mu.RLock()
 	if m.data != nil {
-		value = m.data[key]
+		value, _ = m.data[key]
 	}
 	m.mu.RUnlock()
 	return

container/gmap/gmap_hash_int_str_map.go

@@ -143,7 +143,7 @@ func (m *IntStrMap) Search(key int) (value string, found bool) {
 func (m *IntStrMap) Get(key int) (value string) {
 	m.mu.RLock()
 	if m.data != nil {
-		value = m.data[key]
+		value, _ = m.data[key]
 	}
 	m.mu.RUnlock()
 	return

container/gmap/gmap_hash_str_any_map.go

@@ -16,7 +16,6 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
-// StrAnyMap implements map[string]interface{} with RWMutex that has switch.
 type StrAnyMap struct {
 	mu   rwmutex.RWMutex
 	data map[string]interface{}
@@ -152,7 +151,7 @@ func (m *StrAnyMap) Search(key string) (value interface{}, found bool) {
 func (m *StrAnyMap) Get(key string) (value interface{}) {
 	m.mu.RLock()
 	if m.data != nil {
-		value = m.data[key]
+		value, _ = m.data[key]
 	}
 	m.mu.RUnlock()
 	return

container/gmap/gmap_hash_str_int_map.go

@@ -144,7 +144,7 @@ func (m *StrIntMap) Search(key string) (value int, found bool) {
 func (m *StrIntMap) Get(key string) (value int) {
 	m.mu.RLock()
 	if m.data != nil {
-		value = m.data[key]
+		value, _ = m.data[key]
 	}
 	m.mu.RUnlock()
 	return

container/gmap/gmap_hash_str_str_map.go

@@ -144,7 +144,7 @@ func (m *StrStrMap) Search(key string) (value string, found bool) {
 func (m *StrStrMap) Get(key string) (value string) {
 	m.mu.RLock()
 	if m.data != nil {
-		value = m.data[key]
+		value, _ = m.data[key]
 	}
 	m.mu.RUnlock()
 	return

container/gmap/gmap_z_basic_test.go

@@ -101,7 +101,6 @@ func Test_Map_Basic(t *testing.T) {
 		t.Assert(m2.Map(), map[interface{}]interface{}{1: 1, "key1": "val1"})
 	})
 }
-
 func Test_Map_Set_Fun(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m := gmap.New()
@@ -124,7 +123,6 @@ func Test_Map_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[interface{}]interface{}{"key2": "val2", "key3": "val3"})
 	})
 }
-
 func Test_Map_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[interface{}]interface{}{1: 1, "key1": "val1"}
@@ -177,7 +175,6 @@ func Test_Map_Clone(t *testing.T) {
 		t.AssertIN("key1", m.Keys())
 	})
 }
-
 func Test_Map_Basic_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.New()

container/gmap/gmap_z_bench_maps_test.go

@@ -16,9 +16,7 @@ import (
 )
 
 var hashMap = gmap.New(true)
-
 var listMap = gmap.NewListMap(true)
-
 var treeMap = gmap.NewTreeMap(gutil.ComparatorInt, true)
 
 func Benchmark_HashMap_Set(b *testing.B) {

container/gmap/gmap_z_bench_safe_test.go

@@ -16,17 +16,11 @@ import (
 )
 
 var anyAnyMap = gmap.NewAnyAnyMap(true)
-
 var intIntMap = gmap.NewIntIntMap(true)
-
 var intAnyMap = gmap.NewIntAnyMap(true)
-
 var intStrMap = gmap.NewIntStrMap(true)
-
 var strIntMap = gmap.NewStrIntMap(true)
-
 var strAnyMap = gmap.NewStrAnyMap(true)
-
 var strStrMap = gmap.NewStrStrMap(true)
 
 func Benchmark_IntIntMap_Set(b *testing.B) {

container/gmap/gmap_z_bench_syncmap_test.go

@@ -16,7 +16,6 @@ import (
 )
 
 var gm = gmap.NewIntIntMap(true)
-
 var sm = sync.Map{}
 
 func Benchmark_GMapSet(b *testing.B) {

container/gmap/gmap_z_bench_unsafe_test.go

@@ -16,17 +16,11 @@ import (
 )
 
 var anyAnyMapUnsafe = gmap.New()
-
 var intIntMapUnsafe = gmap.NewIntIntMap()
-
 var intAnyMapUnsafe = gmap.NewIntAnyMap()
-
 var intStrMapUnsafe = gmap.NewIntStrMap()
-
 var strIntMapUnsafe = gmap.NewStrIntMap()
-
 var strAnyMapUnsafe = gmap.NewStrAnyMap()
-
 var strStrMapUnsafe = gmap.NewStrStrMap()
 
 // Writing benchmarks.

container/gmap/gmap_z_example_any_any_test.go

@@ -8,11 +8,11 @@ package gmap_test
 
 import (
 	"fmt"
+	"github.com/gogf/gf/v2/internal/json"
+	"github.com/gogf/gf/v2/util/gconv"
 
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/json"
-	"github.com/gogf/gf/v2/util/gconv"
 )
 
 func ExampleAnyAnyMap_Iterator() {

container/gmap/gmap_z_example_int_any_test.go

@@ -8,7 +8,6 @@ package gmap_test
 
 import (
 	"fmt"
-
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"

container/gmap/gmap_z_example_int_int_test.go

@@ -8,7 +8,6 @@ package gmap_test
 
 import (
 	"fmt"
-
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"

container/gmap/gmap_z_example_str_any_test.go

@@ -8,11 +8,11 @@ package gmap_test
 
 import (
 	"fmt"
+	"github.com/gogf/gf/v2/internal/json"
+	"github.com/gogf/gf/v2/util/gconv"
 
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/json"
-	"github.com/gogf/gf/v2/util/gconv"
 )
 
 func ExampleStrAnyMap_Iterator() {

container/gmap/gmap_z_example_str_int_test.go

@@ -8,7 +8,6 @@ package gmap_test
 
 import (
 	"fmt"
-
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"

container/gmap/gmap_z_example_str_str_test.go

@@ -8,11 +8,12 @@ package gmap_test
 
 import (
 	"fmt"
+	"github.com/gogf/gf/v2/internal/json"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
 
 	"github.com/gogf/gf/v2/container/gmap"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/json"
-	"github.com/gogf/gf/v2/util/gconv"
 )
 
 func ExampleStrStrMap_Iterator() {

container/gmap/gmap_z_example_test.go

@@ -9,8 +9,9 @@ package gmap_test
 import (
 	"fmt"
 
-	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/util/gutil"
+
+	"github.com/gogf/gf/v2/container/gmap"
 )
 
 func ExampleNew() {

container/gmap/gmap_z_unit_hash_int_any_test.go

@@ -117,7 +117,6 @@ func Test_IntAnyMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[int]interface{}{3: 3})
 	})
 }
-
 func Test_IntAnyMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[int]interface{}{1: 1, 2: "2"}
@@ -155,7 +154,6 @@ func Test_IntAnyMap_Lock(t *testing.T) {
 		})
 	})
 }
-
 func Test_IntAnyMap_Clone(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		// clone 方法是深克隆
@@ -171,7 +169,6 @@ func Test_IntAnyMap_Clone(t *testing.T) {
 		t.AssertIN(2, m.Keys())
 	})
 }
-
 func Test_IntAnyMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewIntAnyMap()

container/gmap/gmap_z_unit_hash_int_str_test.go

@@ -152,7 +152,6 @@ func Test_IntStrMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[int]interface{}{3: "c"})
 	})
 }
-
 func Test_IntStrMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[int]string{1: "a", 2: "b"}
@@ -205,7 +204,6 @@ func Test_IntStrMap_Clone(t *testing.T) {
 		t.AssertIN(2, m.Keys())
 	})
 }
-
 func Test_IntStrMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewIntStrMap()

container/gmap/gmap_z_unit_hash_str_any_test.go

@@ -146,7 +146,6 @@ func Test_StrAnyMap_Lock(t *testing.T) {
 		})
 	})
 }
-
 func Test_StrAnyMap_Clone(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		// clone 方法是深克隆
@@ -162,7 +161,6 @@ func Test_StrAnyMap_Clone(t *testing.T) {
 		t.AssertIN("b", m.Keys())
 	})
 }
-
 func Test_StrAnyMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewStrAnyMap()

container/gmap/gmap_z_unit_hash_str_int_test.go

@@ -117,7 +117,6 @@ func Test_StrIntMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[string]int{"c": 3})
 	})
 }
-
 func Test_StrIntMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[string]int{"a": 1, "b": 2}
@@ -171,7 +170,6 @@ func Test_StrIntMap_Clone(t *testing.T) {
 		t.AssertIN("b", m.Keys())
 	})
 }
-
 func Test_StrIntMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewStrIntMap()

container/gmap/gmap_z_unit_hash_str_str_test.go

@@ -116,7 +116,6 @@ func Test_StrStrMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[string]string{"c": "c"})
 	})
 }
-
 func Test_StrStrMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[string]string{"a": "a", "b": "b"}
@@ -154,7 +153,6 @@ func Test_StrStrMap_Lock(t *testing.T) {
 		})
 	})
 }
-
 func Test_StrStrMap_Clone(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		// clone 方法是深克隆
@@ -170,7 +168,6 @@ func Test_StrStrMap_Clone(t *testing.T) {
 		t.AssertIN("b", m.Keys())
 	})
 }
-
 func Test_StrStrMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewStrStrMap()

container/gmap/gmap_z_unit_list_map_test.go

@@ -106,7 +106,6 @@ func Test_ListMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[interface{}]interface{}{"key2": "val2", "key3": "val3"})
 	})
 }
-
 func Test_ListMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[interface{}]interface{}{1: 1, "key1": "val1"}

container/gmap/gmap_z_unit_tree_map_test.go

@@ -107,7 +107,6 @@ func Test_TreeMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[interface{}]interface{}{"key2": "val2", "key3": "val3"})
 	})
 }
-
 func Test_TreeMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[interface{}]interface{}{1: 1, "key1": "val1"}

container/gpool/gpool.go

@@ -97,6 +97,7 @@ func (p *Pool) Clear() {
 	} else {
 		p.list.RemoveAll()
 	}
+
 }
 
 // Get picks and returns an item from pool. If the pool is empty and NewFunc is defined,

container/gpool/gpool_bench_test.go

@@ -17,7 +17,6 @@ import (
 )
 
 var pool = gpool.New(time.Hour, nil)
-
 var syncp = sync.Pool{}
 
 func BenchmarkGPoolPut(b *testing.B) {

container/gpool/gpool_z_example_test.go

@@ -9,9 +9,8 @@ package gpool_test
 import (
 	"database/sql"
 	"fmt"
-	"time"
-
 	"github.com/gogf/gf/v2/container/gpool"
+	"time"
 )
 
 func ExampleNew() {

container/gpool/gpool_z_unit_test.go

@@ -21,7 +21,6 @@ var nf gpool.NewFunc = func() (i interface{}, e error) {
 }
 
 var assertIndex int = 0
-
 var ef gpool.ExpireFunc = func(i interface{}) {
 	assertIndex++
 	gtest.Assert(i, assertIndex)

container/gqueue/gqueue.go

@@ -15,6 +15,7 @@
 // 3. Support dynamic queue size(unlimited queue size);
 //
 // 4. Blocking when reading data from queue;
+//
 package gqueue
 
 import (

container/gqueue/gqueue_z_bench_test.go

@@ -15,13 +15,9 @@ import (
 )
 
 var bn = 20000000
-
 var length = 1000000
-
 var qstatic = gqueue.New(length)
-
 var qdynamic = gqueue.New()
-
 var cany = make(chan interface{}, length)
 
 func Benchmark_Gqueue_StaticPushAndPop(b *testing.B) {

container/gring/gring.go

@@ -153,6 +153,7 @@ func (r *Ring) Next() *Ring {
 // them creates a single ring with the elements of s inserted
 // after r. The result points to the element following the
 // last element of s after insertion.
+//
 func (r *Ring) Link(s *Ring) *Ring {
 	r.mu.Lock()
 	s.mu.Lock()
@@ -167,6 +168,7 @@ func (r *Ring) Link(s *Ring) *Ring {
 // Unlink removes n % r.Len() elements from the ring r, starting
 // at r.Next(). If n % r.Len() == 0, r remains unchanged.
 // The result is the removed sub-ring. r must not be empty.
+//
 func (r *Ring) Unlink(n int) *Ring {
 	r.mu.Lock()
 	resultRing := r.ring.Unlink(n)

container/gring/gring_z_bench_test.go

@@ -15,7 +15,6 @@ import (
 )
 
 var length = 10000
-
 var ringObject = gring.New(length, true)
 
 func BenchmarkRing_Put(b *testing.B) {

container/gring/gring_z_unit_test.go

@@ -43,7 +43,6 @@ func TestRing_Val(t *testing.T) {
 		r.Set(&Student{3, "jack", true})
 	})
 }
-
 func TestRing_CapLen(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		r := gring.New(10)

container/gset/gset_any_set.go

@@ -55,7 +55,7 @@ func NewFrom(items interface{}, safe ...bool) *Set {
 func (set *Set) Iterator(f func(v interface{}) bool) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		if !f(k) {
 			break
 		}
@@ -211,7 +211,7 @@ func (set *Set) Join(glue string) string {
 		i      = 0
 		buffer = bytes.NewBuffer(nil)
 	)
-	for k := range set.data {
+	for k, _ := range set.data {
 		buffer.WriteString(gconv.String(k))
 		if i != l-1 {
 			buffer.WriteString(glue)
@@ -229,13 +229,13 @@ func (set *Set) String() string {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
 	var (
-		s      string
+		s      = ""
 		l      = len(set.data)
 		i      = 0
 		buffer = bytes.NewBuffer(nil)
 	)
 	buffer.WriteByte('[')
-	for k := range set.data {
+	for k, _ := range set.data {
 		s = gconv.String(k)
 		if gstr.IsNumeric(s) {
 			buffer.WriteString(s)
@@ -416,7 +416,7 @@ func (set *Set) Merge(others ...*Set) *Set {
 func (set *Set) Sum() (sum int) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		sum += gconv.Int(k)
 	}
 	return
@@ -426,7 +426,7 @@ func (set *Set) Sum() (sum int) {
 func (set *Set) Pop() interface{} {
 	set.mu.Lock()
 	defer set.mu.Unlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		delete(set.data, k)
 		return k
 	}
@@ -446,7 +446,7 @@ func (set *Set) Pops(size int) []interface{} {
 	}
 	index := 0
 	array := make([]interface{}, size)
-	for k := range set.data {
+	for k, _ := range set.data {
 		delete(set.data, k)
 		array[index] = k
 		index++
@@ -519,7 +519,7 @@ func (set *Set) DeepCopy() interface{} {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
 	data := make([]interface{}, 0)
-	for k := range set.data {
+	for k, _ := range set.data {
 		data = append(data, k)
 	}
 	return NewFrom(data, set.mu.IsSafe())

container/gset/gset_int_set.go

@@ -47,7 +47,7 @@ func NewIntSetFrom(items []int, safe ...bool) *IntSet {
 func (set *IntSet) Iterator(f func(v int) bool) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		if !f(k) {
 			break
 		}
@@ -172,7 +172,7 @@ func (set *IntSet) Slice() []int {
 		i   = 0
 		ret = make([]int, len(set.data))
 	)
-	for k := range set.data {
+	for k, _ := range set.data {
 		ret[i] = k
 		i++
 	}
@@ -192,7 +192,7 @@ func (set *IntSet) Join(glue string) string {
 		i      = 0
 		buffer = bytes.NewBuffer(nil)
 	)
-	for k := range set.data {
+	for k, _ := range set.data {
 		buffer.WriteString(gconv.String(k))
 		if i != l-1 {
 			buffer.WriteString(glue)
@@ -375,7 +375,7 @@ func (set *IntSet) Merge(others ...*IntSet) *IntSet {
 func (set *IntSet) Sum() (sum int) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		sum += k
 	}
 	return
@@ -385,7 +385,7 @@ func (set *IntSet) Sum() (sum int) {
 func (set *IntSet) Pop() int {
 	set.mu.Lock()
 	defer set.mu.Unlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		delete(set.data, k)
 		return k
 	}
@@ -405,7 +405,7 @@ func (set *IntSet) Pops(size int) []int {
 	}
 	index := 0
 	array := make([]int, size)
-	for k := range set.data {
+	for k, _ := range set.data {
 		delete(set.data, k)
 		array[index] = k
 		index++

container/gset/gset_str_set.go

@@ -49,7 +49,7 @@ func NewStrSetFrom(items []string, safe ...bool) *StrSet {
 func (set *StrSet) Iterator(f func(v string) bool) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		if !f(k) {
 			break
 		}
@@ -146,7 +146,7 @@ func (set *StrSet) Contains(item string) bool {
 func (set *StrSet) ContainsI(item string) bool {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		if strings.EqualFold(k, item) {
 			return true
 		}
@@ -206,7 +206,7 @@ func (set *StrSet) Join(glue string) string {
 		i      = 0
 		buffer = bytes.NewBuffer(nil)
 	)
-	for k := range set.data {
+	for k, _ := range set.data {
 		buffer.WriteString(k)
 		if i != l-1 {
 			buffer.WriteString(glue)
@@ -229,7 +229,7 @@ func (set *StrSet) String() string {
 		buffer = bytes.NewBuffer(nil)
 	)
 	buffer.WriteByte('[')
-	for k := range set.data {
+	for k, _ := range set.data {
 		buffer.WriteString(`"` + gstr.QuoteMeta(k, `"\`) + `"`)
 		if i != l-1 {
 			buffer.WriteByte(',')
@@ -405,7 +405,7 @@ func (set *StrSet) Merge(others ...*StrSet) *StrSet {
 func (set *StrSet) Sum() (sum int) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		sum += gconv.Int(k)
 	}
 	return
@@ -415,7 +415,7 @@ func (set *StrSet) Sum() (sum int) {
 func (set *StrSet) Pop() string {
 	set.mu.Lock()
 	defer set.mu.Unlock()
-	for k := range set.data {
+	for k, _ := range set.data {
 		delete(set.data, k)
 		return k
 	}
@@ -435,7 +435,7 @@ func (set *StrSet) Pops(size int) []string {
 	}
 	index := 0
 	array := make([]string, size)
-	for k := range set.data {
+	for k, _ := range set.data {
 		delete(set.data, k)
 		array[index] = k
 		index++

container/gset/gset_z_bench_test.go

@@ -16,15 +16,10 @@ import (
 )
 
 var intSet = gset.NewIntSet(true)
-
 var anySet = gset.NewSet(true)
-
 var strSet = gset.NewStrSet(true)
-
 var intSetUnsafe = gset.NewIntSet()
-
 var anySetUnsafe = gset.NewSet()
-
 var strSetUnsafe = gset.NewStrSet()
 
 func Benchmark_IntSet_Add(b *testing.B) {

container/gtree/gtree_z_avl_tree_test.go

@@ -56,7 +56,6 @@ func Test_AVLTree_Basic(t *testing.T) {
 		t.Assert(m2.Map(), map[interface{}]interface{}{1: 1, "key1": "val1"})
 	})
 }
-
 func Test_AVLTree_Set_Fun(t *testing.T) {
 	//GetOrSetFunc lock or unlock
 	gtest.C(t, func(t *gtest.T) {

container/gtree/gtree_z_example_avltree_test.go

@@ -8,7 +8,6 @@ package gtree_test
 
 import (
 	"fmt"
-
 	"github.com/gogf/gf/v2/container/gtree"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"

container/gtree/gtree_z_example_btree_test.go

@@ -8,7 +8,6 @@ package gtree_test
 
 import (
 	"fmt"
-
 	"github.com/gogf/gf/v2/container/gtree"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"

container/gtree/gtree_z_example_redblacktree_test.go

@@ -8,7 +8,6 @@ package gtree_test
 
 import (
 	"fmt"
-
 	"github.com/gogf/gf/v2/container/gtree"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"