feat: internet cmd and fix bugs

Author: fdkevin0

.gitignore

@@ -1,4 +1,5 @@
 ihdu_cli
 hdu_cli
 .hdu_cli.yaml
-.idea
+.idea
+/vendor

cmd/net/cmd.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/hduhelp/hdu-cli/pkg/srun"
 	"github.com/hduhelp/hdu-cli/pkg/table"
+	"github.com/parnurzeal/gorequest"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"log"
@@ -30,7 +31,14 @@ func init() {
 	cobra.CheckErr(viper.BindPFlag("net.endpoint", Cmd.PersistentFlags().Lookup("endpoint")))
 
 	Cmd.PersistentFlags().StringP("acid", "a", "", "ac_id of srun")
-	viper.SetDefault("net.acid", "0")
+	resp, _, errs := gorequest.New().Get(viper.GetString("net.endpoint")).End()
+	if errs != nil {
+		viper.SetDefault("net.acid", "0")
+	} else if acid := resp.Request.URL.Query().Get("ac_id"); acid != "" {
+		viper.SetDefault("net.acid", acid)
+	} else {
+		viper.SetDefault("net.acid", "0")
+	}
 	cobra.CheckErr(viper.BindPFlag("net.acid", Cmd.PersistentFlags().Lookup("acid")))
 
 	loginCmd.Flags().StringP("username", "u", "", "username of srun")
@@ -40,7 +48,7 @@ func init() {
 
 	logoutCmd.Flags().StringP("username", "u", "", "username of srun")
 
-	Cmd.AddCommand(infoCmd, loginCmd, logoutCmd)
+	Cmd.AddCommand(infoCmd, loginCmd, logoutCmd, internetCmd)
 }
 
 // infoCmd represents the info command
@@ -91,7 +99,6 @@ var loginCmd = &cobra.Command{
 					if _, err := portalServer.PortalLogout(); err != nil {
 						log.Println(err)
 					}
-					continue
 				}
 
 				//检测是否登录成功，如果登录过期则重新登录
@@ -136,3 +143,12 @@ var logoutCmd = &cobra.Command{
 		cobra.CheckErr(err)
 	},
 }
+
+// internetCmd represents the logout command
+var internetCmd = &cobra.Command{
+	Use:   "internet",
+	Short: "check if connect to the internet",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println(portalServer.Internet())
+	},
+}

pkg/srun/internet.go

@@ -1,24 +1,21 @@
 package srun
 
 import (
+	"fmt"
 	"github.com/parnurzeal/gorequest"
-	"log"
-	"net/http"
 	"net/url"
 )
 
 // Internet 通过Http请求是否被302到 srun登陆地址 来判断是否能访问互联网
 func (s PortalServer) Internet() bool {
-	connect := true
 	reqUrl, _ := url.ParseRequestURI(s.internetCheck)
-	_, _, errs := gorequest.New().Get(reqUrl.String()).
-		RedirectPolicy(func(req gorequest.Request, via []gorequest.Request) error {
-			connect = req.URL.Hostname() != reqUrl.Hostname()
-			return http.ErrUseLastResponse
-		}).End()
-	if errs != nil || len(errs) != 0 {
-		log.Printf("Internet check failed: %v", errs)
-		connect = false
+	resp, _, errs := gorequest.New().Get(reqUrl.String()).End()
+	if errs != nil {
+		fmt.Println(errs)
+		return false
 	}
-	return connect
+	if resp.Request.URL.Hostname() == reqUrl.Hostname() {
+		return true
+	}
+	return false
 }

pkg/srun/portal.go

@@ -14,7 +14,7 @@ func New(endpoint, acID string) *PortalServer {
 		acID:          acID,
 		jsonpCallback: "jQuery112403771213770126085_" + timestampStr,
 		timestampStr:  timestampStr,
-		internetCheck: "http://www.baidu.com",
+		internetCheck: "https://www.baidu.com",
 	}
 }