Merge remote-tracking branch 'origin/main'

tools/imctl/internal/imctl/cmd/color/color.go

@@ -24,9 +24,9 @@ import (
 	"github.com/openim-sigs/component-base/util/stringutil"
 	"github.com/spf13/cobra"
 
-	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates"
-	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions"
 	cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util"
+	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions"
+	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates"
 )
 
 // ColorOptions is an options struct to support color subcommands.

tools/imctl/internal/imctl/cmd/completion/completion.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates"
 	cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util"
+	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates"
 )
 
 const defaultBoilerPlate = `

tools/imctl/internal/imctl/cmd/info/info.go

@@ -24,9 +24,9 @@ import (
 	"github.com/openim-sigs/component-base/util/iputil"
 	"github.com/spf13/cobra"
 
-	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates"
-	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions"
 	cmdutil "github.com/OpenIMSDK/Open-IM-Server/tools/imctl/internal/imctl/cmd/util"
+	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/cli/genericclioptions"
+	"github.com/OpenIMSDK/Open-IM-Server/tools/imctl/pkg/util/templates"
 )
 
 // Info defines the host information struct.