From 5979b2aa0f7c01242ec85f35176a25bf98c49fd0 Mon Sep 17 00:00:00 2001
From: anqiansong <anqiansong@gmail.com>
Date: Wed, 15 Dec 2021 23:24:32 +0800
Subject: [PATCH] Update template (#1335)

Co-authored-by: anqiansong <anqiansong@bytedance.com>
---
 tools/goctl/bug/bug.go   |  6 ++--
 tools/goctl/bug/env.go   |  4 ++-
 tools/goctl/bug/issue.go | 59 +++++++++++++++++++++-------------------
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/tools/goctl/bug/bug.go b/tools/goctl/bug/bug.go
index 65d0eaa2..07d4a0eb 100644
--- a/tools/goctl/bug/bug.go
+++ b/tools/goctl/bug/bug.go
@@ -6,6 +6,7 @@ import (
 	"os/exec"
 	"runtime"
 
+	"github.com/tal-tech/go-zero/tools/goctl/internal/version"
 	"github.com/urfave/cli"
 )
 
@@ -20,6 +21,7 @@ const (
 	os           = "OS"
 	arch         = "ARCH"
 	goctlVersion = "GOCTL_VERSION"
+	goVersion    = "GO_VERSION"
 )
 
 var openCmd = map[string]string{
@@ -29,9 +31,9 @@ var openCmd = map[string]string{
 
 func Action(_ *cli.Context) error {
 	env := getEnv()
-	content := fmt.Sprintf(issueTemplate, "<pre>\n"+env.string()+"</pre>")
+	content := fmt.Sprintf(issueTemplate, version.BuildVersion, env.string())
 	content = url.QueryEscape(content)
-	url := fmt.Sprintf("https://github.com/zeromicro/go-zero/issues/new?title=TODO&body=%s", content)
+	url := fmt.Sprintf("https://github.com/zeromicro/go-zero/issues/new?body=%s", content)
 
 	goos := runtime.GOOS
 	var cmd string
diff --git a/tools/goctl/bug/env.go b/tools/goctl/bug/env.go
index 4ca90c7f..6f954520 100644
--- a/tools/goctl/bug/env.go
+++ b/tools/goctl/bug/env.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"runtime"
+	"strings"
 
 	"github.com/tal-tech/go-zero/tools/goctl/internal/version"
 )
@@ -20,7 +21,7 @@ func (e env) string() string {
 		w.WriteString(fmt.Sprintf("%s = %q\n", k, v))
 	}
 
-	return w.String()
+	return strings.TrimSuffix(w.String(),"\n")
 }
 
 func getEnv() env {
@@ -28,5 +29,6 @@ func getEnv() env {
 	e[os] = runtime.GOOS
 	e[arch] = runtime.GOARCH
 	e[goctlVersion] = version.BuildVersion
+	e[goctlVersion] = runtime.Version()
 	return e
 }
diff --git a/tools/goctl/bug/issue.go b/tools/goctl/bug/issue.go
index 1757e0f6..c3cd0981 100644
--- a/tools/goctl/bug/issue.go
+++ b/tools/goctl/bug/issue.go
@@ -1,39 +1,42 @@
 package bug
 
 const issueTemplate=`
-<!-- Please submit an issue order by the following template. Thanks! -->
+<!-- Please answer these questions before submitting your issue. Thanks! -->
 
-**Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
+### What category of issue (<code>goctl</code> or <code>sdk</code>)?
 
-**To Reproduce**
-<!-- Steps to reproduce the behavior, if applicable: -->
+### What type of issue (<code>feature</code>|<code>bug</code>|<code>suggestion</code>)?
 
-1. The code is
+### What version of Goctl are you using (<code>goctl --version</code>)?
 
-	<pre>
-	
-	</pre>
-
-2. The error is
-
-	<pre>
-	
-	</pre>
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-**Environments (please complete the following information):**
-<!--  - OS: [e.g. Linux]
- - go-zero version [e.g. 1.2.1]
- - goctl version [e.g. 1.2.1, optional] -->
+<pre>
+$ goctl --version
 %s
+</pre>
+
+### Does this issue reproduce with the latest release?
+
+
+### What operating system and processor architecture are you using ?
+<pre>
+%s
+</pre>
+
+### What did you do?
+
+<!--
+If possible, provide a recipe for reproducing the error.
+A complete runnable program is good.
+A link on play.golang.org is best.
+-->
+
+
+
+### What did you expect to see?
+
+
+
+### What did you see instead?
 
-**More description**
-<!-- Add any other context about the problem here. -->
 
 `