From 396b7e5929336f3d134d246b51863b899d2c376a Mon Sep 17 00:00:00 2001
From: boyce <boyce@atbc.com>
Date: Sat, 1 Aug 2020 17:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../httpclientpoolmodule.go}                           | 10 +++++-----
 .../{MySQLModule.go => mysqlmondule/mysqlmodule.go}    |  2 +-
 .../{RedisModule.go => redismodule/redismodule.go}     |  2 +-
 sysservice/{ => httpservice}/httpservice.go            |  2 +-
 sysservice/{ => tcpservice}/tcpservice.go              |  2 +-
 sysservice/{ => wsservice}/wsservice.go                |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename sysmodule/{HttpClientPoolModule.go => httpclientmodule/httpclientpoolmodule.go} (84%)
 rename sysmodule/{MySQLModule.go => mysqlmondule/mysqlmodule.go} (99%)
 rename sysmodule/{RedisModule.go => redismodule/redismodule.go} (99%)
 rename sysservice/{ => httpservice}/httpservice.go (99%)
 rename sysservice/{ => tcpservice}/tcpservice.go (99%)
 rename sysservice/{ => wsservice}/wsservice.go (99%)

diff --git a/sysmodule/HttpClientPoolModule.go b/sysmodule/httpclientmodule/httpclientpoolmodule.go
similarity index 84%
rename from sysmodule/HttpClientPoolModule.go
rename to sysmodule/httpclientmodule/httpclientpoolmodule.go
index e3e8220..09fe7a2 100644
--- a/sysmodule/HttpClientPoolModule.go
+++ b/sysmodule/httpclientmodule/httpclientpoolmodule.go
@@ -1,4 +1,4 @@
-package sysmodule
+package httpclientmodule
 
 import (
 	"bytes"
@@ -13,7 +13,7 @@ import (
 	"github.com/duanhf2012/origin/service"
 )
 
-type HttpClientPoolModule struct {
+type HttpClientModule struct {
 	service.Module
 	client *http.Client
 }
@@ -43,7 +43,7 @@ func (slf *SyncHttpRespone) Get(timeoutMs int) HttpRespone {
 	}
 }
 
-func (slf *HttpClientPoolModule) Init(maxpool int, proxyUrl string) {
+func (slf *HttpClientModule) Init(maxpool int, proxyUrl string) {
 	type ProxyFun func(_ *http.Request) (*url.URL, error)
 	var proxyfun ProxyFun
 	if proxyUrl != "" {
@@ -67,7 +67,7 @@ func (slf *HttpClientPoolModule) Init(maxpool int, proxyUrl string) {
 	}
 }
 
-func (slf *HttpClientPoolModule) SyncRequest(method string, url string, body []byte, header http.Header) SyncHttpRespone {
+func (slf *HttpClientModule) SyncRequest(method string, url string, body []byte, header http.Header) SyncHttpRespone {
 	ret := SyncHttpRespone{
 		resp: make(chan HttpRespone, 1),
 	}
@@ -78,7 +78,7 @@ func (slf *HttpClientPoolModule) SyncRequest(method string, url string, body []b
 	return ret
 }
 
-func (slf *HttpClientPoolModule) Request(method string, url string, body []byte, header http.Header) HttpRespone {
+func (slf *HttpClientModule) Request(method string, url string, body []byte, header http.Header) HttpRespone {
 	if slf.client == nil {
 		panic("Call the init function first")
 	}
diff --git a/sysmodule/MySQLModule.go b/sysmodule/mysqlmondule/mysqlmodule.go
similarity index 99%
rename from sysmodule/MySQLModule.go
rename to sysmodule/mysqlmondule/mysqlmodule.go
index 88f1327..f4cd5e1 100644
--- a/sysmodule/MySQLModule.go
+++ b/sysmodule/mysqlmondule/mysqlmodule.go
@@ -1,4 +1,4 @@
-package sysmodule
+package mysqlmondule
 
 import (
 	"database/sql"
diff --git a/sysmodule/RedisModule.go b/sysmodule/redismodule/redismodule.go
similarity index 99%
rename from sysmodule/RedisModule.go
rename to sysmodule/redismodule/redismodule.go
index 6ee60ad..74a249f 100644
--- a/sysmodule/RedisModule.go
+++ b/sysmodule/redismodule/redismodule.go
@@ -1,4 +1,4 @@
-package sysmodule
+package redismodule
 
 import (
 	"bytes"
diff --git a/sysservice/httpservice.go b/sysservice/httpservice/httpservice.go
similarity index 99%
rename from sysservice/httpservice.go
rename to sysservice/httpservice/httpservice.go
index bf53247..9747c54 100644
--- a/sysservice/httpservice.go
+++ b/sysservice/httpservice/httpservice.go
@@ -1,4 +1,4 @@
-package sysservice
+package httpservice
 
 import (
 	"fmt"
diff --git a/sysservice/tcpservice.go b/sysservice/tcpservice/tcpservice.go
similarity index 99%
rename from sysservice/tcpservice.go
rename to sysservice/tcpservice/tcpservice.go
index ba6bd70..e5ba281 100644
--- a/sysservice/tcpservice.go
+++ b/sysservice/tcpservice/tcpservice.go
@@ -1,4 +1,4 @@
-package sysservice
+package tcpservice
 
 import (
 	"fmt"
diff --git a/sysservice/wsservice.go b/sysservice/wsservice/wsservice.go
similarity index 99%
rename from sysservice/wsservice.go
rename to sysservice/wsservice/wsservice.go
index 8b02918..07c3f20 100644
--- a/sysservice/wsservice.go
+++ b/sysservice/wsservice/wsservice.go
@@ -1,4 +1,4 @@
-package sysservice
+package wsservice
 
 import (
 	"fmt"