From 6215e893da334c6e167ff4443f2ea1d6cca66747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Mon, 3 Jan 2022 10:12:40 +0800
Subject: [PATCH] update wechatminiprogram

---
 .../{getcallbackip.go => cgi-bin.getcallbackip.go}     |  0
 ...ssage.send.go => cgi-bin.message.subscribe.send.go} |  0
 .../{auth.code2_session.go => sns.jscode2session.go}   |  0
 ...ness.getliveinfo.go => wxa.business.getliveinfo.go} |  0
 utils/gostring/gostring.go                             |  7 +++++--
 utils/gostring/gostring_test.go                        | 10 ++++------
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename service/wechatminiprogram/{getcallbackip.go => cgi-bin.getcallbackip.go} (100%)
 rename service/wechatminiprogram/{subscribe_message.send.go => cgi-bin.message.subscribe.send.go} (100%)
 rename service/wechatminiprogram/{auth.code2_session.go => sns.jscode2session.go} (100%)
 rename service/wechatminiprogram/{business.getliveinfo.go => wxa.business.getliveinfo.go} (100%)

diff --git a/service/wechatminiprogram/getcallbackip.go b/service/wechatminiprogram/cgi-bin.getcallbackip.go
similarity index 100%
rename from service/wechatminiprogram/getcallbackip.go
rename to service/wechatminiprogram/cgi-bin.getcallbackip.go
diff --git a/service/wechatminiprogram/subscribe_message.send.go b/service/wechatminiprogram/cgi-bin.message.subscribe.send.go
similarity index 100%
rename from service/wechatminiprogram/subscribe_message.send.go
rename to service/wechatminiprogram/cgi-bin.message.subscribe.send.go
diff --git a/service/wechatminiprogram/auth.code2_session.go b/service/wechatminiprogram/sns.jscode2session.go
similarity index 100%
rename from service/wechatminiprogram/auth.code2_session.go
rename to service/wechatminiprogram/sns.jscode2session.go
diff --git a/service/wechatminiprogram/business.getliveinfo.go b/service/wechatminiprogram/wxa.business.getliveinfo.go
similarity index 100%
rename from service/wechatminiprogram/business.getliveinfo.go
rename to service/wechatminiprogram/wxa.business.getliveinfo.go
diff --git a/utils/gostring/gostring.go b/utils/gostring/gostring.go
index d1d45bc2..4cc05c36 100644
--- a/utils/gostring/gostring.go
+++ b/utils/gostring/gostring.go
@@ -23,8 +23,11 @@ func ToInt(s string) int {
 
 // ToInt64 string到int64
 func ToInt64(s string) int64 {
-	i, _ := strconv.ParseInt(s, 10, 64)
-	return i
+	i, err := strconv.ParseInt(s, 10, 64)
+	if err == nil {
+		return i
+	}
+	return int64(ToFloat64(s))
 }
 
 // Replace 字符串替换
diff --git a/utils/gostring/gostring_test.go b/utils/gostring/gostring_test.go
index 2c9f9c4b..96b8b7ff 100644
--- a/utils/gostring/gostring_test.go
+++ b/utils/gostring/gostring_test.go
@@ -2,7 +2,6 @@ package gostring
 
 import (
 	"fmt"
-	"log"
 	"strings"
 	"testing"
 )
@@ -22,11 +21,10 @@ func TestName(t *testing.T) {
 }
 
 func TestToInt64(t *testing.T) {
-	log.Println(ToInt64("120"))
-	log.Println(ToInt64("120.9"))
-
-	log.Println(strings.Contains("120", ","))
-	log.Println(strings.Contains("120,1", ","))
+	t.Log(ToInt64("120"))
+	t.Log(ToInt64("120.9"))
+	t.Log(strings.Contains("120", ","))
+	t.Log(strings.Contains("120,1", ","))
 }
 
 func TestString(t *testing.T) {