fixed:1.调整结构

cmd/chrome.go → browser/chrome.go

@@ -1,7 +1,8 @@
-package cmd
+package browser
 
 import (
 	"fmt"
+	"gbase/glog"
 	"golang.org/x/sys/windows/registry"
 	"os"
 	"path/filepath"
@@ -13,14 +14,14 @@ func GetChromeExePath() (path string, err error) {
 	key, err := registry.OpenKey(registry.LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.exe\\", registry.READ)
 
 	if err != nil {
-		XWarning(fmt.Sprintf("GetChromeExePath OpenKey  error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("GetChromeExePath OpenKey  error : %v\n", err))
 		return
 	}
 	defer key.Close()
 
 	path, _, err = key.GetStringValue("Path")
 	if err != nil {
-		XWarning(fmt.Sprintf("GetChromeExePath GetStringValue  error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("GetChromeExePath GetStringValue  error : %v\n", err))
 		return
 	}
 	if path[len(path)-len("chrome.exe"):] != "chrome.exe" {
@@ -45,7 +46,7 @@ func CheckChromeInstalled() bool {
 	key, err := registry.OpenKey(registry.CURRENT_USER, "Software\\Google\\Chrome", registry.READ)
 
 	if err != nil {
-		XWarning(fmt.Sprintf("CheckChromeInstalled OpenKey  error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("CheckChromeInstalled OpenKey  error : %v\n", err))
 		return false
 	}
 	if key != 0 {
@@ -61,14 +62,14 @@ func GetChromeVersionFromRegedit() int {
 	key, err := registry.OpenKey(registry.CURRENT_USER, "Software\\Google\\Chrome\\BLBeacon", registry.READ)
 
 	if err != nil {
-		XWarning(fmt.Sprintf("GetChromeVersionFromRegedit OpenKey  error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("GetChromeVersionFromRegedit OpenKey  error : %v\n", err))
 		return ChromeVersion
 	}
 	defer key.Close()
 
 	version, _, err := key.GetStringValue("version")
 	if err != nil {
-		XWarning(fmt.Sprintf("GetChromeVersionFromRegedit OpenKey  error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("GetChromeVersionFromRegedit OpenKey  error : %v\n", err))
 		return ChromeVersion
 	}
 

cmd/cookie.go → browser/cookie.go

@@ -1,6 +1,7 @@
-package cmd
+package browser
 
 import (
+	gcmd "gbase/cmd"
 	"github.com/browserutils/kooky/browser/chrome"
 	"log"
 	"net/http"
@@ -21,7 +22,7 @@ func LoadChromeCookies(domain string) ([]*http.Cookie, error) {
 	userHomeDir, _ := os.UserHomeDir()
 	defaultPath := "AppData/Local/Google/Chrome/User Data/Default/"
 	cookiesFile := filepath.Join(userHomeDir, defaultPath, cookiesName)
-	exist, _ := FileExists(cookiesFile)
+	exist, _ := gcmd.FileExists(cookiesFile)
 	if exist == false {
 		cookiesFile = filepath.Join(userHomeDir, defaultPath, "Network", cookiesName)
 	}

cmd/powerbi_screenshot.go → browser/powerbi_screenshot.go

@@ -1,7 +1,8 @@
-package cmd
+package browser
 
 import (
 	"fmt"
+	"gbase/glog"
 	"github.com/tebeka/selenium"
 	"log"
 	"os"
@@ -28,7 +29,7 @@ func (m *SeleniumDriverConf) GetPBIScreenshots(PBIPageURL, screenshotPath, fileN
 	err = m.WebDriver.WaitWithTimeout(ShareExists, 30*time.Second)
 	if err != nil {
 		log.Printf("GetPBIScreenshots ShareExists error:%v", err)
-		XWarning(fmt.Sprintf("GetPBIScreenshots ShareExists error:%v", err))
+		glog.XWarning(fmt.Sprintf("GetPBIScreenshots ShareExists error:%v", err))
 		return
 	}
 
@@ -38,7 +39,7 @@ func (m *SeleniumDriverConf) GetPBIScreenshots(PBIPageURL, screenshotPath, fileN
 	data, err := m.WebDriver.Screenshot()
 	if err != nil {
 		log.Printf(" %s,Screenshot  error : %v\n", PBIPageURL, err)
-		XWarning(fmt.Sprintf(" %s,Screenshot  error : %v", PBIPageURL, err))
+		glog.XWarning(fmt.Sprintf(" %s,Screenshot  error : %v", PBIPageURL, err))
 		return
 	}
 
@@ -50,12 +51,12 @@ func (m *SeleniumDriverConf) GetPBIScreenshots(PBIPageURL, screenshotPath, fileN
 
 	for i := 1; i < 999; i++ {
 		log.Printf("page %v start===>", i+1)
-		XWarning(fmt.Sprintf("page %v start===>", i+1))
+		glog.XWarning(fmt.Sprintf("page %v start===>", i+1))
 		//判断是否有下一页,没有则跳出循环
 		err = m.WebDriver.WaitWithTimeout(NextPageExists, 30*time.Second)
 		if err != nil {
 			log.Printf("GetPBIScreenshots NextPageExistsV2 error : %v\n", err)
-			XWarning(fmt.Sprintf("GetPBIScreenshots NextPageExistsV2 error : %v", err))
+			glog.XWarning(fmt.Sprintf("GetPBIScreenshots NextPageExistsV2 error : %v", err))
 
 			break
 
@@ -74,7 +75,7 @@ func (m *SeleniumDriverConf) GetPBIScreenshots(PBIPageURL, screenshotPath, fileN
 		data, err = m.WebDriver.Screenshot()
 		if err != nil {
 			log.Printf(" page %v,Screenshot  error : %v\n", i, err)
-			XWarning(fmt.Sprintf(" page %v,Screenshot  error : %v\n", i, err))
+			glog.XWarning(fmt.Sprintf(" page %v,Screenshot  error : %v\n", i, err))
 			break
 		}
 

cmd/powerbi_url.go → browser/powerbi_url.go

@@ -1,4 +1,4 @@
-package cmd
+package browser
 
 import (
 	"fmt"

cmd/selenium_driver.go → browser/selenium_driver.go

@@ -1,7 +1,8 @@
-package cmd
+package browser
 
 import (
 	"fmt"
+	"gbase/glog"
 
 	"github.com/tebeka/selenium"
 	"github.com/tebeka/selenium/chrome"
@@ -28,7 +29,7 @@ func (m *SeleniumDriverConf) ChromeDriverServiceStart() (err error) {
 	m.ChromeDriverService, err = selenium.NewChromeDriverService(m.ChromeDriverPath, m.ChromeDriverPort, opts...)
 	if nil != err {
 		log.Printf("ChromeDriverServiceStart error:%v\n", err)
-		XWarning(fmt.Sprintf("ChromeDriverServiceStart error:%v\n", err))
+		glog.XWarning(fmt.Sprintf("ChromeDriverServiceStart error:%v\n", err))
 		return
 	} else {
 		log.Println("ChromeDriverServiceStart success.")
@@ -47,7 +48,7 @@ func (m *SeleniumDriverConf) ChromeDriverServiceStop() error {
 	err := m.ChromeDriverService.Stop()
 	if err != nil {
 		log.Printf("ChromeDriverServiceStop error:%v\n", err)
-		XWarning(fmt.Sprintf("ChromeDriverServiceStop error:%v\n", err))
+		glog.XWarning(fmt.Sprintf("ChromeDriverServiceStop error:%v\n", err))
 		return err
 	}
 
@@ -91,7 +92,7 @@ func (m *SeleniumDriverConf) WebDriverStart() (WebDriver selenium.WebDriver, err
 		//启用--user-data-dir参数后,同时只能打开一个chrome程序.
 		//如果已打开chrome程序,必须先关闭已打开的chrome,再运行程序
 		fmt.Printf("WebDriverStart connect to the webDriver error : %v\n", err)
-		XWarning(fmt.Sprintf("WebDriverStart connect to the webDriver  error : %v", err))
+		glog.XWarning(fmt.Sprintf("WebDriverStart connect to the webDriver  error : %v", err))
 		return
 	} else {
 		log.Println("connect to the webDriver success.")
@@ -111,7 +112,7 @@ func (m *SeleniumDriverConf) WebDriverStop() error {
 	err := m.WebDriver.Quit()
 	if err != nil {
 		log.Printf("WebDriverStop error:%v\n", err)
-		XWarning(fmt.Sprintf("WebDriverStop error:%v\n", err))
+		glog.XWarning(fmt.Sprintf("WebDriverStop error:%v\n", err))
 		return err
 	}
 

cmd/sharepoint.go → browser/sharepoint.go

@@ -1,4 +1,4 @@
-package cmd
+package browser
 
 import (
 	"github.com/koltyakov/gosip"

cmd/file.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"gbase/glog"
 	"io/ioutil"
 	"log"
 	"os"
@@ -15,7 +16,7 @@ func GetAllFilePathByExts(currentPath string, exts []string) (filteredPaths []st
 
 	Paths, err := GetAllFilePath([]string{}, currentPath)
 	if err != nil {
-		XWarning(fmt.Sprintf("GetAllFilePathByExt error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("GetAllFilePathByExt error : %v\n", err))
 		return
 	}
 
@@ -37,7 +38,7 @@ func GetAllFilePathByExt(currentPath string, ext string) (filteredPaths []string
 
 	Paths, err := GetAllFilePath([]string{}, currentPath)
 	if err != nil {
-		XWarning(fmt.Sprintf("GetAllFilePathByExt error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("GetAllFilePathByExt error : %v\n", err))
 		return
 	}
 

cmd/netflix.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"gbase/glog"
 	"log"
 	"net/http"
 	"net/http/cookiejar"
@@ -60,12 +61,12 @@ func CheckAvailableCountry(cookies []*http.Cookie, netflixUrl, ProxyOnOff, proxy
 	resp, err := client.Do(req)
 	defer func() {
 		if err1 := recover(); err1 != nil {
-			XWarning(fmt.Sprintf("connect to the netflix faild %v\n", err1))
+			glog.XWarning(fmt.Sprintf("connect to the netflix faild %v\n", err1))
 			err = fmt.Errorf("connect to the netflix faild %v\n", err1)
 		}
 	}()
 	if err != nil {
-		XWarning(fmt.Sprintf("client.Do error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("client.Do error : %v\n", err))
 		return false, err
 	}
 

cmd/xdate.go → datetime/xdate.go

@@ -1,4 +1,4 @@
-package cmd
+package datetime
 
 import "time"
 

cmd/log.go → glog/glog.go

@@ -1,4 +1,4 @@
-package cmd
+package glog
 
 import (
 	"log"

cmd/http_request.go → http/http_request.go

@@ -1,4 +1,4 @@
-package cmd
+package http
 
 import (
 	"fmt"

cmd/xhttp.go → http/xhttp.go

@@ -1,4 +1,4 @@
-package cmd
+package http
 
 import (
 	"bytes"

cmd/dingtalk_oa.go → im/dingtalk_oa.go

@@ -1,8 +1,10 @@
-package cmd
+package im
 
 import (
 	"encoding/json"
 	"fmt"
+	gdatetime "gbase/datetime"
+	ghttp "gbase/http"
 	"log"
 	"net/http"
 	"strings"
@@ -38,7 +40,7 @@ type DingTalkConf struct {
 
 func (m *DingTalkConf) GetToken() error {
 	params := map[string]string{"appkey": m.AppKey, "appsecret": m.AppSecret}
-	content, err := GetX(m.GetTokenUrl, "", params, m.Headers, m.Cookie)
+	content, err := ghttp.GetX(m.GetTokenUrl, "", params, m.Headers, m.Cookie)
 	if err != nil {
 		log.Printf("GetToken error : %v", err)
 	}
@@ -63,7 +65,7 @@ func (m *DingTalkConf) GetHolidayType() (err error) {
 	PostData["op_userid"] = m.OpUserId
 	PostData["vacation_source"] = "all"
 	fmt.Printf("postdata=======>%v\n", PostData)
-	content, err := PostJson(m.GetHolidayTypeURL, m.Params, m.Headers, PostData, m.Cookie)
+	content, err := ghttp.PostJson(m.GetHolidayTypeURL, m.Params, m.Headers, PostData, m.Cookie)
 	if err != nil {
 		log.Printf("GetDeptUserList  PostJson error : %v", err)
 		return err
@@ -92,7 +94,7 @@ func (m *DingTalkConf) GetDeptList(deptId int64) ([]interface{}, error) {
 	result := []interface{}{}
 	PostData := make(map[string]interface{})
 	PostData["dept_id"] = deptId
-	content, err := PostJson(m.GetDeptListUrl, m.Params, m.Headers, PostData, m.Cookie)
+	content, err := ghttp.PostJson(m.GetDeptListUrl, m.Params, m.Headers, PostData, m.Cookie)
 	if err != nil {
 		log.Printf("GetDeptUserList  PostJson error : %v", err)
 		return result, err
@@ -151,7 +153,7 @@ func (m *DingTalkConf) GetDeptUserList(deptId int64) (map[string]string, error)
 
 		//fmt.Printf("%v\n", cursor)
 		//请求APi
-		content, err := PostJson(m.GetDeptUserListUrl, m.Params, m.Headers, PostData, m.Cookie)
+		content, err := ghttp.PostJson(m.GetDeptUserListUrl, m.Params, m.Headers, PostData, m.Cookie)
 		if err != nil {
 			log.Printf("GetDeptUserList  PostJson error : %v", err)
 
@@ -215,7 +217,7 @@ func (m *DingTalkConf) GetAttendanceGroup() ([]map[string]interface{}, error) {
 	PostData["op_user_id"] = m.OpUserId
 	PostData["cursor"] = cursor
 
-	content, err := PostJson(m.GetAttendanceGroupUrl, m.Params, m.Headers, PostData, m.Cookie)
+	content, err := ghttp.PostJson(m.GetAttendanceGroupUrl, m.Params, m.Headers, PostData, m.Cookie)
 	if err != nil {
 		log.Printf("GetAttendanceClockData PostJson error : %v", err)
 		return groupData, err
@@ -270,7 +272,7 @@ func (m *DingTalkConf) GetAttendanceClockData(days int, userIdList []string) (ma
 	limit := 50      //表示获取考勤数据的条数，最大不能超过50条。
 	userIdStep := 50 //单次请求传入的userId数量
 	//最近30天日期数组
-	workData, _ := GetWorkDate(days)
+	workData, _ := gdatetime.GetWorkDate(days)
 	fmt.Printf("workData lenght %v\n", len(workData))
 	//post请求的body
 	PostData := make(map[string]interface{})
@@ -323,7 +325,7 @@ func (m *DingTalkConf) GetAttendanceClockData(days int, userIdList []string) (ma
 
 				//fmt.Printf("offset %v\n", offset)
 				//fmt.Printf("data %v\n", data)
-				content, err := PostJson(m.GetAttendanceClockDataUrl, m.Params, m.Headers, PostData, m.Cookie)
+				content, err := ghttp.PostJson(m.GetAttendanceClockDataUrl, m.Params, m.Headers, PostData, m.Cookie)
 				if err != nil {
 					log.Printf("GetAttendanceClockData PostJson error : %v", err)
 
@@ -371,7 +373,7 @@ func (m *DingTalkConf) GetAttendanceGroupDetails() (map[int64]string, error) {
 	PostData["offset"] = 0
 	PostData["size"] = 10
 
-	content, err := PostJson(m.GetAttendanceGroupDetailsUrl, m.Params, m.Headers, PostData, m.Cookie)
+	content, err := ghttp.PostJson(m.GetAttendanceGroupDetailsUrl, m.Params, m.Headers, PostData, m.Cookie)
 	if err != nil {
 		log.Printf("GetAttendanceClockData PostJson error : %v", err)
 
@@ -406,7 +408,7 @@ func (m *DingTalkConf) ListAttendanceGroupMenberListByIds(groupId int64, userIdL
 	PostData["member_ids"] = userids
 	PostData["member_type"] = 0
 
-	content, err := PostJson(m.ListAttendanceGroupMenberListByIdsUrl, m.Params, m.Headers, PostData, m.Cookie)
+	content, err := ghttp.PostJson(m.ListAttendanceGroupMenberListByIdsUrl, m.Params, m.Headers, PostData, m.Cookie)
 	if err != nil {
 		log.Printf("GetAttendanceClockData PostJson error : %v", err)
 

cmd/dingtalk_robot.go → im/dingtalk_robot.go

@@ -1,4 +1,4 @@
-package cmd
+package im
 
 import (
 	"fmt"

cv/face.go → image/face.go

@@ -1,4 +1,4 @@
-package cv
+package image
 
 func RecognizeFace() {
 	println("face")

cmd/image.go → image/image.go

@@ -1,4 +1,4 @@
-package cmd
+package image
 
 import (
 	"fmt"

cmd/excel.go → office/excel.go

@@ -1,4 +1,4 @@
-package cmd
+package office
 
 import (
 	"fmt"

cmd/pdf.go → pdf/pdf.go

@@ -1,8 +1,9 @@
-package cmd
+package pdf
 
 import (
 	"bytes"
 	"fmt"
+	"gbase/glog"
 	"github.com/axgle/mahonia" //编码转换
 	"os"
 	"os/exec"
@@ -53,7 +54,7 @@ func ConvertPdfFileToPng(pdfPath string, subPath, fileName string) error {
 	if err != nil {
 		fmt.Printf("XPdfToPng Error: %s %s\n", err, enc.ConvertString(stderr.String()))
 		//go Xlog(logPath, strings.Join(cmdArgs, " "))
-		XWarning(fmt.Sprintf("%s,XPdfToPng Error: %s %s\n", pdfPath, err, enc.ConvertString(stderr.String())))
+		glog.XWarning(fmt.Sprintf("%s,XPdfToPng Error: %s %s\n", pdfPath, err, enc.ConvertString(stderr.String())))
 		return fmt.Errorf("%s,XPdfToPng Error: %s %s\n", pdfPath, err, enc.ConvertString(stderr.String()))
 	}
 	//fmt.Printf("XPdfToPng Result: %s\n", stdout.String())

cmd/execute.go → win/execute.go

@@ -1,7 +1,9 @@
-package cmd
+package win
 
 import (
 	"fmt"
+	gcmd "gbase/cmd"
+	"gbase/glog"
 	"os/exec"
 	"strings"
 )
@@ -18,7 +20,7 @@ func Command(exe string, args []string) (result string, err error) {
 	cmd.Stderr = cmd.Stdout
 	err = cmd.Start()
 	if err != nil {
-		XWarning(fmt.Sprintf("cmd.Start error : %v\n", err))
+		glog.XWarning(fmt.Sprintf("cmd.Start error : %v\n", err))
 		return
 	}
 
@@ -32,7 +34,7 @@ func Command(exe string, args []string) (result string, err error) {
 			break
 		}
 
-		rets = append(rets, ConvertByte2String(tmp, "GB18030"))
+		rets = append(rets, gcmd.ConvertByte2String(tmp, "GB18030"))
 
 	}
 

cmd/windows_schtasks.go → win/windows_schtasks.go

@@ -1,4 +1,4 @@
-package cmd
+package win
 
 import (
 	"fmt"