Skip to content

Commit 7445813

Browse files
authored
feat: new deppkg api (#86)
* deppkg list support POST * update jupiter, support governor
1 parent 43d3094 commit 7445813

File tree

8 files changed

+355
-66
lines changed

8 files changed

+355
-66
lines changed

api/apiv1/analysis/analysis.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ func TopologyRelationship(c echo.Context) error {
120120
}
121121

122122
type ReqList struct {
123-
PkgQs string `query:"pkgQs"`
124-
AppName string `query:"app_name" json:"app_name"`
125-
Operate string `query:"operate"`
126-
Ver string `query:"ver"`
123+
PkgQs string `query:"pkgQs" form:"pkgQs"`
124+
AppName string `query:"app_name" form:"app_name"`
125+
Operate string `query:"operate" form:"operate"`
126+
Ver string `query:"ver" form:"ver"`
127127
}
128128

129129
// 版本列表

go.mod

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ go 1.14
55
require (
66
github.com/BurntSushi/toml v0.3.1
77
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
8-
github.com/alibaba/sentinel-golang v0.4.0
9-
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190802083043-4cd0c391755e
10-
github.com/apache/rocketmq-client-go v0.0.0-20191211114916-85ee94b43cef
8+
github.com/alibaba/sentinel-golang v0.6.0
9+
github.com/aliyun/alibaba-cloud-sdk-go v1.61.18
10+
github.com/apache/rocketmq-client-go/v2 v2.0.0
1111
github.com/arsmn/fiber-swagger/v2 v2.3.0
1212
github.com/beeker1121/goque v2.1.0+incompatible
1313
github.com/bojand/ghz v0.56.0
1414
github.com/casbin/casbin/v2 v2.7.2
1515
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
1616
github.com/coreos/etcd v3.3.22+incompatible
1717
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc // indirect
18-
github.com/douyu/jupiter v0.2.4
18+
github.com/douyu/jupiter v0.2.9
1919
github.com/dustin/go-humanize v1.0.0 // indirect
2020
github.com/go-git/go-git/v5 v5.1.0
2121
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
@@ -26,7 +26,7 @@ require (
2626
github.com/gofiber/fiber/v2 v2.5.0
2727
github.com/golang/protobuf v1.4.2
2828
github.com/gomodule/redigo v2.0.0+incompatible
29-
github.com/google/go-cmp v0.4.0
29+
github.com/google/go-cmp v0.5.1
3030
github.com/gorilla/sessions v1.2.0
3131
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
3232
github.com/jhump/protoreflect v1.7.0
@@ -43,11 +43,10 @@ require (
4343
github.com/mattn/go-colorable v0.1.7 // indirect
4444
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
4545
github.com/onsi/ginkgo v1.12.3
46-
github.com/pelletier/go-toml v1.4.0 // indirect
4746
github.com/pkg/errors v0.9.1
4847
github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff
4948
github.com/robfig/cron/v3 v3.0.1
50-
github.com/sirupsen/logrus v1.6.0
49+
github.com/sirupsen/logrus v1.7.0
5150
github.com/smartystreets/assertions v1.0.1 // indirect
5251
github.com/spf13/cast v1.3.1
5352
github.com/spf13/viper v1.6.3
@@ -60,8 +59,8 @@ require (
6059
github.com/urfave/negroni v1.0.0
6160
github.com/valyala/fasthttp v1.21.0 // indirect
6261
go.uber.org/zap v1.15.0
63-
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
64-
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
62+
golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392
63+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b
6564
golang.org/x/net v0.0.0-20210119194325-5f4716e94777
6665
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
6766
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9

go.sum

Lines changed: 324 additions & 33 deletions
Large diffs are not rendered by default.

internal/app/adminengine/engine_admin.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import (
1919
"strconv"
2020
"time"
2121

22-
"github.com/douyu/juno/internal/pkg/service/user"
23-
2422
"github.com/douyu/juno/api/apiv1/resource"
2523
"github.com/douyu/juno/api/apiv1/test/platform"
2624
"github.com/douyu/juno/api/apiv1/worker"
@@ -33,6 +31,7 @@ import (
3331
"github.com/douyu/juno/internal/pkg/service/confgo"
3432
"github.com/douyu/juno/internal/pkg/service/notify"
3533
"github.com/douyu/juno/internal/pkg/service/openauth"
34+
"github.com/douyu/juno/internal/pkg/service/user"
3635
"github.com/douyu/juno/pkg/cfg"
3736
"github.com/douyu/juno/pkg/constx"
3837
"github.com/douyu/juno/pkg/pb"
@@ -41,6 +40,7 @@ import (
4140
"github.com/douyu/jupiter/pkg/client/etcdv3"
4241
jgrpc "github.com/douyu/jupiter/pkg/client/grpc"
4342
"github.com/douyu/jupiter/pkg/flag"
43+
"github.com/douyu/jupiter/pkg/server/governor"
4444
"github.com/douyu/jupiter/pkg/server/xecho"
4545
"github.com/douyu/jupiter/pkg/worker/xcron"
4646
"github.com/douyu/jupiter/pkg/xlog"
@@ -82,14 +82,6 @@ func New() *Admin {
8282
Action: func(name string, fs *flag.FlagSet) {},
8383
})
8484

85-
flag.Register(&flag.StringFlag{
86-
Name: "host",
87-
Usage: "--host",
88-
EnvVar: "Juno_Host",
89-
Default: "",
90-
Action: func(name string, fs *flag.FlagSet) {},
91-
})
92-
9385
eng := &Admin{}
9486
err := eng.Startup(
9587
eng.parseFlag,
@@ -215,10 +207,18 @@ func (eng *Admin) serveGovern() (err error) {
215207
if err != nil {
216208
xlog.Panic(err.Error())
217209
}
210+
211+
server := governor.RawConfig("server.govern").Build()
212+
err = eng.Serve(server)
213+
214+
if err != nil {
215+
return err
216+
}
217+
218218
//eng.SetGovernor(cfg.Cfg.Server.Govern.Host + ":" + strconv.Itoa(cfg.Cfg.Server.Govern.Port))
219219
err = client.Close()
220220
if err != nil {
221-
xlog.Panic(err.Error())
221+
return err
222222
}
223223
return
224224
}

internal/app/adminengine/router_api.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func apiV1(server *xecho.Server) {
9191
analysisGroup.GET("/topology/list", analysis.TopologyList)
9292
analysisGroup.GET("/topology/relationship", analysis.TopologyRelationship)
9393
analysisGroup.GET("/deppkg/list", analysis.DependenceList)
94+
analysisGroup.POST("/deppkg/list", analysis.DependenceList)
9495
}
9596

9697
systemGroup := v1.Group("/system")

internal/pkg/invoker/invoker.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package invoker
1717
import (
1818
"time"
1919

20-
rocketmq2 "github.com/apache/rocketmq-client-go"
2120
"github.com/coreos/etcd/clientv3"
2221
"github.com/douyu/juno/pkg/cfg"
2322
"github.com/douyu/jupiter/pkg/client/rocketmq"
@@ -35,7 +34,7 @@ var (
3534
Resty *resty.Client
3635

3736
// event producer
38-
EventProducer rocketmq2.Producer
37+
EventProducer *rocketmq.Producer
3938
)
4039

4140
// Init invoker
@@ -71,7 +70,7 @@ func Init() {
7170
mqConfig.Addr = config.Addr
7271
mqConfig.DialTimeout = config.DialTimeout
7372

74-
EventProducer, err = mqConfig.Build()
73+
EventProducer = mqConfig.Build()
7574
if err != nil {
7675
panic("init junoevnet producer failed. err=" + err.Error())
7776
}

internal/pkg/service/appevent/appevent.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import (
88

99
"github.com/douyu/juno/pkg/cfg"
1010

11-
"github.com/apache/rocketmq-client-go/primitive"
12-
13-
rocketmq2 "github.com/apache/rocketmq-client-go"
11+
"github.com/apache/rocketmq-client-go/v2/primitive"
12+
"github.com/douyu/jupiter/pkg/client/rocketmq"
1413

1514
"github.com/douyu/juno/pkg/model/view"
1615

@@ -24,11 +23,11 @@ var (
2423

2524
type appEvent struct {
2625
eventChan chan db.AppEvent
27-
eventProducer rocketmq2.Producer
26+
eventProducer *rocketmq.Producer
2827
topic string
2928
}
3029

31-
func InitAppEvent(eventProducer rocketmq2.Producer, topic string) *appEvent {
30+
func InitAppEvent(eventProducer *rocketmq.Producer, topic string) *appEvent {
3231
obj := &appEvent{
3332
eventChan: make(chan db.AppEvent, 10000),
3433
eventProducer: eventProducer,

internal/pkg/service/testplatform/localworker/localworker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (w *localWorker) Init(o Option) {
3838

3939
queue, err := goque.OpenQueue(o.WorkerQueueDir)
4040
if err != nil {
41-
xlog.Panicf("init local worker queue failed")
41+
xlog.Panicf("init local worker queue failed, %s, err=%s", o.WorkerQueueDir, err)
4242
}
4343
w.queue = queue
4444

0 commit comments

Comments
 (0)