feat: change directory structure, packages and add module

karakasli · Jun 15, 2020 · 4b4a351 · 4b4a351
1 parent 9f0a261
commit 4b4a351
Show file tree

Hide file tree

Showing 28 changed files with 53 additions and 68 deletions.
diff --git a/3rd-party/.gitignore b/3rd-party/.gitignore
diff --git a/build/.gitignore b/build/.gitignore
diff --git a/dist/.gitignore b/dist/.gitignore
diff --git a/doc/.gitignore b/doc/.gitignore
diff --git a/src/examples/common/pushcommon.go → examples/common/pushcommon.go b/src/examples/common/pushcommon.go → examples/common/pushcommon.go
@@ -12,15 +12,16 @@ Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
- */
+*/
 
 package common
 
 import (
 	"fmt"
-	"pushkit-go-sample/push/config"
-	"pushkit-go-sample/push/core"
 	"sync"
+
+	"github.com/msalihkarakasli/go-hms-push/push/config"
+	"github.com/msalihkarakasli/go-hms-push/push/core"
 )
 
 const (
@@ -31,9 +32,9 @@ const (
 
 	// below is public address
 	// get token address
-	authUrl   = "https://login.cloud.huawei.com/oauth2/v2/token"
+	authUrl = "https://login.cloud.huawei.com/oauth2/v2/token"
 	// send push msg address
-	pushUrl   = "https://api.push.hicloud.com"
+	pushUrl = "https://api.push.hicloud.com"
 )
 
 var conf = &config.Config{
@@ -75,6 +76,6 @@ func GetPushClient() *core.HttpPushClient {
 	return pushClient
 }
 
-func GetPushConf() *config.Config{
+func GetPushConf() *config.Config {
 	return conf
 }
diff --git a/src/examples/send_apns_message/main.go → examples/send_apns_message/main.go b/src/examples/send_apns_message/main.go → examples/send_apns_message/main.go
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"pushkit-go-sample/examples/common"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/examples/common"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func main() {

diff --git a/src/examples/send_condition_message/main.go → examples/send_condition_message/main.go b/src/examples/send_condition_message/main.go → examples/send_condition_message/main.go
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"pushkit-go-sample/examples/common"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/examples/common"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func main() {

diff --git a/src/examples/send_data_message/main.go → examples/send_data_message/main.go b/src/examples/send_data_message/main.go → examples/send_data_message/main.go
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"pushkit-go-sample/examples/common"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/examples/common"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func main() {

diff --git a/...xamples/send_instance_app_message/main.go → examples/send_instance_app_message/main.go b/...xamples/send_instance_app_message/main.go → examples/send_instance_app_message/main.go
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"pushkit-go-sample/examples/common"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/examples/common"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func main() {

diff --git a/src/examples/send_notify_message/main.go → examples/send_notify_message/main.go b/src/examples/send_notify_message/main.go → examples/send_notify_message/main.go
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"pushkit-go-sample/examples/common"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/examples/common"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func main() {

diff --git a/src/examples/send_test_message/main.go → examples/send_test_message/main.go b/src/examples/send_test_message/main.go → examples/send_test_message/main.go
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"pushkit-go-sample/examples/common"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/examples/common"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func main() {

diff --git a/src/examples/send_topic_message/main.go → examples/send_topic_message/main.go b/src/examples/send_topic_message/main.go → examples/send_topic_message/main.go
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"pushkit-go-sample/examples/common"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/examples/common"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func main() {

diff --git a/src/examples/send_webpush_message/main.go → examples/send_webpush_message/main.go b/src/examples/send_webpush_message/main.go → examples/send_webpush_message/main.go
@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"pushkit-go-sample/examples/common"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/examples/common"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -0,0 +1,3 @@
+module github.com/msalihkarakasli/go-hms-push
+
+go 1.14
diff --git a/src/httpclient/httpclient.go → httpclient/httpclient.go b/src/httpclient/httpclient.go → httpclient/httpclient.go
diff --git a/src/push/authention/auth.go → push/authention/auth.go b/src/push/authention/auth.go → push/authention/auth.go
@@ -23,9 +23,10 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"pushkit-go-sample/push/config"
 
-	"pushkit-go-sample/httpclient"
+	"github.com/msalihkarakasli/go-hms-push/push/config"
+
+	"github.com/msalihkarakasli/go-hms-push/httpclient"
 )
 
 type AuthClient struct {

diff --git a/src/push/config/config.go → push/config/config.go b/src/push/config/config.go → push/config/config.go
diff --git a/src/push/constant/constants.go → push/constant/constants.go b/src/push/constant/constants.go → push/constant/constants.go
diff --git a/src/push/constant/urlfmt.go → push/constant/urlfmt.go b/src/push/constant/urlfmt.go → push/constant/urlfmt.go
diff --git a/src/push/core/message.go → push/core/message.go b/src/push/core/message.go → push/core/message.go
@@ -22,10 +22,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"pushkit-go-sample/httpclient"
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
-	"pushkit-go-sample/push/verify"
+	"github.com/msalihkarakasli/go-hms-push/httpclient"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
+	"github.com/msalihkarakasli/go-hms-push/push/verify"
 )
 
 // SendMessage sends a message to huawei cloud common

diff --git a/src/push/core/pushclient.go → push/core/pushclient.go b/src/push/core/pushclient.go → push/core/pushclient.go
@@ -21,12 +21,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"pushkit-go-sample/push/authention"
-	"pushkit-go-sample/push/config"
+	"github.com/msalihkarakasli/go-hms-push/push/authention"
+	"github.com/msalihkarakasli/go-hms-push/push/config"
 	"reflect"
 
-	"pushkit-go-sample/httpclient"
-	"pushkit-go-sample/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/httpclient"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
 )
 
 type HttpPushClient struct {

diff --git a/src/push/model/message.go → push/model/message.go b/src/push/model/message.go → push/model/message.go
@@ -17,7 +17,7 @@ Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
 package model
 
 import (
-	"pushkit-go-sample/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
 )
 
 type MessageRequest struct {

diff --git a/src/push/model/message_hm.go → push/model/message_hm.go b/src/push/model/message_hm.go → push/model/message_hm.go
@@ -17,7 +17,7 @@ Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
 package model
 
 import (
-	"pushkit-go-sample/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
 )
 
 type AndroidConfig struct {

diff --git a/src/push/model/message_webpush.go → push/model/message_webpush.go b/src/push/model/message_webpush.go → push/model/message_webpush.go
@@ -17,7 +17,7 @@ Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
 package model
 
 import (
-	"pushkit-go-sample/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
 	"time"
 )
 

diff --git a/src/push/verify/messaging_hm_verify.go → push/verify/messaging_hm_verify.go b/src/push/verify/messaging_hm_verify.go → push/verify/messaging_hm_verify.go
@@ -19,8 +19,8 @@ package verify
 import (
 	"errors"
 
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func validateAndroidConfig(androidConfig *model.AndroidConfig) error {

diff --git a/src/push/verify/messaging_verify.go → push/verify/messaging_verify.go b/src/push/verify/messaging_verify.go → push/verify/messaging_verify.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"regexp"
 
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 var (

diff --git a/src/push/verify/messaging_webpush_verify.go → push/verify/messaging_webpush_verify.go b/src/push/verify/messaging_webpush_verify.go → push/verify/messaging_webpush_verify.go
@@ -19,8 +19,8 @@ package verify
 import (
 	"errors"
 
-	"pushkit-go-sample/push/constant"
-	"pushkit-go-sample/push/model"
+	"github.com/msalihkarakasli/go-hms-push/push/constant"
+	"github.com/msalihkarakasli/go-hms-push/push/model"
 )
 
 func validateWebPushConfig(webPushConfig *model.WebPushConfig) error {

diff --git a/test/.gitignore b/test/.gitignore
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		module github.com/msalihkarakasli/go-hms-push

		go 1.14