- update geoip

const.go

@@ -1,3 +1,3 @@
 package goip
 
-const Version = "1.0.31"
+const Version = "1.0.32"

geoip/client.go

@@ -5,20 +5,16 @@ import (
 )
 
 type Client struct {
-	accountId  int64  // 账号id
+	asnDb     *geoip2.Reader
-	licenseKey string // 许可证密钥
+	cityDb    *geoip2.Reader
-	asnDb      *geoip2.Reader
+	countryDb *geoip2.Reader
-	cityDb     *geoip2.Reader
-	countryDb  *geoip2.Reader
 }
 
-func New(licenseKey string) (*Client, error) {
+func New() (*Client, error) {
 
 	var err error
 	c := &Client{}
 
-	c.licenseKey = licenseKey
-
 	c.asnDb, err = geoip2.FromBytes(asnBuff)
 	if err != nil {
 		return nil, err

geoip/download_url.go

@@ -4,44 +4,28 @@ import (
 	"go.dtapp.net/gostring"
 )
 
-func (c *Client) GetGeoLite2AsnDownloadUrl() string {
+var licenseKey = "" // 许可证密钥
-	if c.licenseKey == "" {
+
-		return ""
+func GetGeoLite2AsnDownloadUrl() string {
-	}
+	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=YOUR_LICENSE_KEY&suffix=tar.gz", "YOUR_LICENSE_KEY", licenseKey)
-	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=YOUR_LICENSE_KEY&suffix=tar.gz", "YOUR_LICENSE_KEY", c.licenseKey)
 }
 
-//func (c *Client) GetGeoLite2AsnCsvDownloadUrl() string {
+//func GetGeoLite2AsnCsvDownloadUrl() string {
-//	if c.licenseKey == "" {
+//	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN-CSV&license_key=YOUR_LICENSE_KEY&suffix=zip", "YOUR_LICENSE_KEY", licenseKey)
-//		return ""
-//	}
-//	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN-CSV&license_key=YOUR_LICENSE_KEY&suffix=zip", "YOUR_LICENSE_KEY", c.licenseKey)
 //}
 
-func (c *Client) GetGeoLite2CityDownloadUrl() string {
+func GetGeoLite2CityDownloadUrl() string {
-	if c.licenseKey == "" {
+	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=YOUR_LICENSE_KEY&suffix=tar.gz", "YOUR_LICENSE_KEY", licenseKey)
-		return ""
-	}
-	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=YOUR_LICENSE_KEY&suffix=tar.gz", "YOUR_LICENSE_KEY", c.licenseKey)
 }
 
-//func (c *Client) GetGeoLite2CityCsvDownloadUrl() string {
+//func GetGeoLite2CityCsvDownloadUrl() string {
-//	if c.licenseKey == "" {
+//	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City-CSV&license_key=YOUR_LICENSE_KEY&suffix=zip", "YOUR_LICENSE_KEY", licenseKey)
-//		return ""
-//	}
-//	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City-CSV&license_key=YOUR_LICENSE_KEY&suffix=zip", "YOUR_LICENSE_KEY", c.licenseKey)
 //}
 
-func (c *Client) GetGeoLite2CountryDownloadUrl() string {
+func GetGeoLite2CountryDownloadUrl() string {
-	if c.licenseKey == "" {
+	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=YOUR_LICENSE_KEY&suffix=tar.gz", "YOUR_LICENSE_KEY", licenseKey)
-		return ""
-	}
-	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=YOUR_LICENSE_KEY&suffix=tar.gz", "YOUR_LICENSE_KEY", c.licenseKey)
 }
 
-//func (c *Client) GetGeoLite2CountryCsvDownloadUrl() string {
+//func GetGeoLite2CountryCsvDownloadUrl() string {
-//	if c.licenseKey == "" {
+//	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=YOUR_LICENSE_KEY&suffix=zip", "YOUR_LICENSE_KEY", licenseKey)
-//		return ""
-//	}
-//	return gostring.Replace("https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=YOUR_LICENSE_KEY&suffix=zip", "YOUR_LICENSE_KEY", c.licenseKey)
 //}

goip.go

@@ -20,7 +20,7 @@ type Client struct {
 }
 
 // NewIp 实例化
-func NewIp(geoIpLicenseKey string) *Client {
+func NewIp() *Client {
 
 	c := &Client{}
 
@@ -32,7 +32,7 @@ func NewIp(geoIpLicenseKey string) *Client {
 
 	c.ip2regionV2Client, _ = ip2region_v2.New()
 
-	c.geoIpClient, _ = geoip.New(geoIpLicenseKey)
+	c.geoIpClient, _ = geoip.New()
 
 	return c
 }