From 0095f517dedbd28d5fb7822474e447e3b15b0ec6 Mon Sep 17 00:00:00 2001
From: boyce <boyce.duan@gmail.com>
Date: Thu, 21 Feb 2019 10:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89servicetype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/Service.go             | 11 ++---------
 sysservice/httpserverervice.go |  2 +-
 sysservice/wsserverservice.go  |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/service/Service.go b/service/Service.go
index 5ffcca6..0d693fc 100644
--- a/service/Service.go
+++ b/service/Service.go
@@ -39,14 +39,13 @@ type IModule interface {
 }
 
 type IService interface {
-	Init(Iservice IService, servicetype int) error
+	Init(Iservice IService) error
 	OnInit() error
 	OnRun() bool
 	OnFetchService(iservice IService) error
 	OnSetupService(iservice IService)  //其他服务被安装
 	OnRemoveService(iservice IService) //其他服务被安装
 
-	GetServiceType() int
 	GetServiceName() string
 	SetServiceName(serviceName string) bool
 	GetServiceId() int
@@ -74,7 +73,6 @@ type BaseService struct {
 
 	serviceid   int
 	servicename string
-	servicetype int
 	Status      int
 }
 
@@ -99,10 +97,6 @@ func (slf *BaseService) GetServiceId() int {
 	return slf.serviceid
 }
 
-func (slf *BaseService) GetServiceType() int {
-	return slf.servicetype
-}
-
 func (slf *BaseService) GetServiceName() string {
 	return slf.servicename
 }
@@ -129,7 +123,7 @@ func (slf *BaseService) OnRemoveService(iservice IService) {
 	return
 }
 
-func (slf *BaseService) Init(iservice IService, servicetype int) error {
+func (slf *BaseService) Init(iservice IService) error {
 	slf.ownerService = iservice
 	slf.servicename = fmt.Sprintf("%T", iservice)
 	parts := strings.Split(slf.servicename, ".")
@@ -140,7 +134,6 @@ func (slf *BaseService) Init(iservice IService, servicetype int) error {
 	}
 
 	slf.servicename = parts[1]
-	slf.servicetype = servicetype
 	slf.serviceid = InstanceServiceMgr().GenServiceID()
 
 	return nil
diff --git a/sysservice/httpserverervice.go b/sysservice/httpserverervice.go
index 19389a0..f6cf579 100644
--- a/sysservice/httpserverervice.go
+++ b/sysservice/httpserverervice.go
@@ -61,7 +61,7 @@ func NewHttpServerService(port uint16) *HttpServerService {
 	http := new(HttpServerService)
 
 	http.port = port
-	http.Init(http, 0)
+	http.Init(http)
 	return http
 }
 
diff --git a/sysservice/wsserverservice.go b/sysservice/wsserverservice.go
index d928233..43279c5 100644
--- a/sysservice/wsserverservice.go
+++ b/sysservice/wsserverservice.go
@@ -32,7 +32,7 @@ func NewWSServerService(port uint16) *WSServerService {
 
 	wss.port = port
 
-	wss.Init(wss, 0)
+	wss.Init(wss)
 	return wss
 }