Merge branch 'dev' of ssh://119.23.72.7:22611/mushishixian/search_server into dev

.gitignore

@@ -5,4 +5,6 @@ gowatch.yml
 *.exe
 *.exe
 *.exe~
 *.exe~
 cmd.exe~
 cmd.exe~
-/cmd/logs/
+/cmd/logs/
\ No newline at end of file
+/cmd/*.exe~
+/cmd/logs

bat/searchHttp.bat

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

cmd/course_http_server.go

@@ -3,6 +3,7 @@ package main
 import (
 import (
 	"flag"
 	"flag"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin"
+	"github.com/micro/go-micro/v2/client/grpc"
 	"github.com/micro/go-micro/v2/web"
 	"github.com/micro/go-micro/v2/web"
 	"log"
 	"log"
 	"search_server/boot"
 	"search_server/boot"
@@ -23,6 +24,21 @@ func main() {
 	r := gin.New()
 	r := gin.New()
 	gin_.BootStrap(r)
 	gin_.BootStrap(r)
 
 
+	c:=grpc.NewClient()
+	r:=gin.New()
+	r.Handle("GET","/test", func(ctx *gin.Context) {
+		news
+		c:=Course.NewCourseService("api.jtthink.com.course",c)
+		course_rsp,_:=c.ListForTop(context.Background(),&Course.ListRequest{Size:10})
+		ctx.JSON(200,gin.H{"Result":course_rsp.Result})
+	})
+	service:=web.NewService(
+		web.Name("api.jtthink.com.http.course"),
+		web.Handler(r),
+	)
+
+
+
 	port := config.Get("web.port").String()
 	port := config.Get("web.port").String()
 	//web改成micro 就是grpc,并直接注册到etcd里面
 	//web改成micro 就是grpc,并直接注册到etcd里面
 	service := web.NewService(
 	service := web.NewService(