Skip to content

Commit 1cb79f9

Browse files
committed
gin替换http系统库
1 parent 2297803 commit 1cb79f9

File tree

4 files changed

+202
-38
lines changed

4 files changed

+202
-38
lines changed

client/lib.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88
"github.com/OpenIoTHub/gateway-go/v2/services"
99
"github.com/OpenIoTHub/openiothub_grpc_api/pb-go/proto/gateway"
1010
"github.com/OpenIoTHub/utils/models"
11+
"github.com/gin-gonic/gin"
1112
"github.com/grandcat/zeroconf"
1213
"google.golang.org/grpc"
1314
"google.golang.org/grpc/reflection"
1415
"google.golang.org/protobuf/types/known/emptypb"
1516
"log"
1617
"net"
17-
"net/http"
1818
)
1919

2020
var IsLibrary = true
@@ -32,13 +32,11 @@ func Run() {
3232
func start() {
3333
//启动http服务
3434
go func() {
35-
http.HandleFunc("/", services.GatewayManager.IndexHandler)
36-
http.HandleFunc("/DisplayQrHandler", services.GatewayManager.DisplayQrHandler)
37-
//不同的系统打印不一样
35+
r := gin.Default()
36+
r.GET("/", services.GatewayManager.IndexHandler)
37+
r.GET("/DisplayQrHandler", services.GatewayManager.DisplayQrHandler)
3838
log.Printf("Http 监听端口: %d\n", config.ConfigMode.HttpServicePort)
39-
if err := http.ListenAndServe(fmt.Sprintf(":%d", config.ConfigMode.HttpServicePort), nil); err != nil {
40-
log.Printf("Failed to start server: %s\n", err)
41-
}
39+
r.Run(fmt.Sprintf(":%d", config.ConfigMode.HttpServicePort))
4240
}()
4341
//启动grpc服务
4442
s := grpc.NewServer()

go.mod

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ require (
66
github.com/OpenIoTHub/openiothub_grpc_api v1.2.2
77
github.com/OpenIoTHub/utils v0.0.76
88
github.com/OpenIoTHub/water v0.0.3
9+
github.com/gin-gonic/gin v1.10.1
910
github.com/grandcat/zeroconf v1.0.0
1011
github.com/hashicorp/mdns v1.0.6
1112
github.com/jacobsa/go-serial v0.0.0-20180131005756-15cf729a72d4
@@ -23,31 +24,50 @@ require (
2324

2425
require (
2526
github.com/OpenIoTHub/getip v0.1.4 // indirect
27+
github.com/bytedance/sonic v1.13.3 // indirect
28+
github.com/bytedance/sonic/loader v0.3.0 // indirect
2629
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
30+
github.com/cloudwego/base64x v0.1.5 // indirect
31+
github.com/cloudwego/iasm v0.2.0 // indirect
2732
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
28-
github.com/go-ole/go-ole v1.2.6 // indirect
33+
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
34+
github.com/gin-contrib/sse v1.1.0 // indirect
35+
github.com/go-ole/go-ole v1.3.0 // indirect
36+
github.com/go-playground/locales v0.14.1 // indirect
37+
github.com/go-playground/universal-translator v0.18.1 // indirect
38+
github.com/go-playground/validator/v10 v10.27.0 // indirect
39+
github.com/goccy/go-json v0.10.5 // indirect
2940
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
30-
github.com/golang/snappy v0.0.1 // indirect
31-
github.com/klauspost/cpuid/v2 v2.0.6 // indirect
32-
github.com/klauspost/reedsolomon v1.9.13 // indirect
41+
github.com/golang/snappy v1.0.0 // indirect
42+
github.com/json-iterator/go v1.1.12 // indirect
43+
github.com/klauspost/cpuid/v2 v2.2.11 // indirect
44+
github.com/klauspost/reedsolomon v1.12.4 // indirect
3345
github.com/kr/text v0.2.0 // indirect
34-
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
35-
github.com/libp2p/go-msgio v0.0.6 // indirect
36-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
37-
github.com/miekg/dns v1.1.55 // indirect
38-
github.com/multiformats/go-varint v0.0.6 // indirect
46+
github.com/leodido/go-urn v1.4.0 // indirect
47+
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
48+
github.com/libp2p/go-msgio v0.3.0 // indirect
49+
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
50+
github.com/mattn/go-isatty v0.0.20 // indirect
51+
github.com/miekg/dns v1.1.66 // indirect
52+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
53+
github.com/modern-go/reflect2 v1.0.2 // indirect
54+
github.com/multiformats/go-varint v0.0.7 // indirect
55+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
3956
github.com/pkg/errors v0.9.1 // indirect
40-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
57+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
4158
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4259
github.com/shoenig/go-m1cpu v0.1.6 // indirect
43-
github.com/templexxx/cpu v0.0.7 // indirect
44-
github.com/templexxx/xorsimd v0.4.1 // indirect
45-
github.com/tjfoc/gmsm v1.3.2 // indirect
46-
github.com/tklauser/go-sysconf v0.3.12 // indirect
47-
github.com/tklauser/numcpus v0.6.1 // indirect
48-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
49-
github.com/xtaci/kcp-go/v5 v5.6.1 // indirect
60+
github.com/templexxx/cpu v0.1.1 // indirect
61+
github.com/templexxx/xorsimd v0.4.3 // indirect
62+
github.com/tjfoc/gmsm v1.4.1 // indirect
63+
github.com/tklauser/go-sysconf v0.3.15 // indirect
64+
github.com/tklauser/numcpus v0.10.0 // indirect
65+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
66+
github.com/ugorji/go/codec v1.3.0 // indirect
67+
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
68+
github.com/xtaci/kcp-go/v5 v5.6.22 // indirect
5069
github.com/yusufpapurcu/wmi v1.2.4 // indirect
70+
golang.org/x/arch v0.18.0 // indirect
5171
golang.org/x/exp/shiny v0.0.0-20250620022241-b7579e27df2b // indirect
5272
golang.org/x/image v0.28.0 // indirect
5373
golang.org/x/mobile v0.0.0-20250606033058-a2a15c67f36f // indirect
@@ -57,5 +77,5 @@ require (
5777
golang.org/x/text v0.26.0 // indirect
5878
golang.org/x/tools v0.34.0 // indirect
5979
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
60-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
80+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
6181
)

0 commit comments

Comments
 (0)