Merge branch 'master' of http://119.23.72.7/mushishixian/search_server

bat/coursehttp.bat

 set MICRO_REGISTRY=etcd
 set MICRO_REGISTRY_ADDRESS=192.168.2.232:2379
-go run ../cmd/course_http_server.go
\ No newline at end of file
+go run ../cmd/course_http_server.go -config=../conf/config.ini
\ No newline at end of file

bat/gw.bat

 set MICRO_REGISTRY=etcd
-set MICRO_REGISTRY_ADDRESS=localhost:2379
+set MICRO_REGISTRY_ADDRESS=192.168.2.232:2379
 micro api
 

bat/gw_.bat

 set MICRO_REGISTRY=etcd
-set MICRO_REGISTRY_ADDRESS=localhost:2379
+set MICRO_REGISTRY_ADDRESS=192.168.2.232:2379
 micro api

bat/user.bat

 set MICRO_REGISTRY=etcd
-set MICRO_REGISTRY_ADDRESS=localhost:2379
+set MICRO_REGISTRY_ADDRESS=192.168.2.232:2379
 go run cmd/user_server.go --server_address :9090
\ No newline at end of file

cmd/logs/.gitignore

-*
-!.gitignore
\ No newline at end of file

controller/course_topic_controller.go

@@ -7,7 +7,7 @@ import (
 	"search_server/service"
 )
 
-func Init2()  {
+func init()  {
 	courseService:=service.NewCourseTopicServiceImpl()
 	gin_.NewBuilder().WithService(courseService).
 		WithMiddleware(Check_Middleware()).

framework/gin_/ServiceUtil.go → framework/gin_/service_util.go

 package gin_
 
-import "github.com/gin-gonic/gin"
+import (
+	"github.com/gin-gonic/gin"
+)
 
 var HandlerMap map[string]map[string]gin.HandlerFunc
 

go.mod

@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/gin-contrib/cors v1.3.1
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-ini/ini v1.44.0
+	github.com/go-ini/ini v1.57.0
 	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang/protobuf v1.4.2
 	github.com/gomodule/redigo v2.0.1-0.20180401191855-9352ab68be13+incompatible
@@ -23,7 +23,7 @@ require (
 	github.com/micro/micro/v2 v2.9.1 // indirect
 	github.com/micro/protoc-gen-micro v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.5.1 // indirect
-	github.com/prometheus/common v0.9.1
+	github.com/prometheus/common v0.10.0
 	github.com/prometheus/procfs v0.0.11 // indirect
 	github.com/sirupsen/logrus v1.5.0 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect