Merge pull request #677 from linthan/huaweilog

feat: Huaweilog

app/adminengine/engine_admin.go

@@ -29,6 +29,7 @@ import (
  "github.com/douyu/juno/internal/pkg/service/clientproxy"
  "github.com/douyu/juno/internal/pkg/service/confgo"
  "github.com/douyu/juno/internal/pkg/service/confgov2"
+ "github.com/douyu/juno/internal/pkg/service/huaweilog"
  "github.com/douyu/juno/internal/pkg/service/k8s"
  "github.com/douyu/juno/internal/pkg/service/notify"
  "github.com/douyu/juno/internal/pkg/service/openauth"
@@ -262,6 +263,7 @@ func (eng *Admin) refreshAliyunLogMenu() (err error) {
  refreshMenuDataConfig.ImmediatelyRun = true
  refreshMenuData := refreshMenuDataConfig.Build()
  refreshMenuData.Schedule(xcron.Every(time.Minute), xcron.FuncJob(aliyunlog.Instance.RefreshMenuData))
+ refreshMenuData.Schedule(xcron.Every(time.Minute), xcron.FuncJob(huaweilog.Instance.RefreshMenuData))
  err = eng.Schedule(refreshMenuData)
  if err != nil {
  return err

assets/src/pages/applog/applog.jsx

@@ -35,7 +35,7 @@ export default class Applog extends React.PureComponent {
  env: props.env,
  records: [],
  typ: 'biz',
- query: '*',
+ query: '',
  url: '',
  loading: false,
  };

assets/yarn.lock

@@ -4131,7 +4131,7 @@ [email protected]:
 
 bindings@^1.5.0:
  version "1.5.0"
- resolved "https://mirrors.cloud.tencent.com/npm/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+ resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
  dependencies:
  file-uri-to-path "1.0.0"
@@ -4498,9 +4498,9 @@ camelize@^1.0.0:
  integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
 
 caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001179, caniuse-lite@^1.0.30001219:
- version "1.0.30001252"
- resolved "https://registry.nlark.com/caniuse-lite/download/caniuse-lite-1.0.30001252.tgz?cache=0&sync_timestamp=1629957057353&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001252.tgz"
- integrity sha1-yxbk49r+lI/EqbszB66gVLkSAZo=
+ version "1.0.30001608"
+ resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz#7ae6e92ffb300e4b4ec2f795e0abab456ec06cc0"
+ integrity sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==
 
 capture-exit@^2.0.0:
  version "2.0.0"
@@ -7334,16 +7334,16 @@ fs.realpath@^1.0.0:
 
 fsevents@^1.2.7:
  version "1.2.13"
- resolved "https://mirrors.cloud.tencent.com/npm/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+ resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
  dependencies:
  bindings "^1.5.0"
  nan "^2.12.1"
 
 fsevents@^2.1.2, fsevents@~2.3.1:
- version "2.3.2"
- resolved "https://mirrors.cloud.tencent.com/npm/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
- integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+ version "2.3.3"
+ resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+ integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
 function-bind@^1.1.1, function-bind@~1.1.1:
  version "1.1.1"
@@ -10425,9 +10425,9 @@ [email protected]:
  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 nan@^2.12.1:
- version "2.17.0"
- resolved "https://mirrors.cloud.tencent.com/npm/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
- integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
+ version "2.19.0"
+ resolved "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0"
+ integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==
 
 nanoid@^3.3.6:
  version "3.3.6"
@@ -12139,8 +12139,8 @@ raf@^3.1.0, raf@^3.3.2, raf@^3.4.0:
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
  version "2.1.0"
- resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz"
- integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=
+ resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+ integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
  dependencies:
  safe-buffer "^5.1.0"
 

go.mod

@@ -1,70 +1,72 @@
 module github.com/douyu/juno
 
-go 1.18
+go 1.20
 
 require (
- github.com/BurntSushi/toml v1.2.1
+ github.com/BurntSushi/toml v1.3.2
  github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
  github.com/alibaba/sentinel-golang v1.0.4
  github.com/aliyun/alibaba-cloud-sdk-go v1.62.186
  github.com/aliyun/aliyun-log-go-sdk v0.1.43
- github.com/apache/rocketmq-client-go/v2 v2.1.2-0.20221202035048-f56a2dba2af8
+ github.com/apache/rocketmq-client-go/v2 v2.1.2-0.20230628073434-533de03048e1
  github.com/beeker1121/goque v2.1.0+incompatible
  github.com/bojand/ghz v0.117.0
  github.com/casbin/casbin/v2 v2.64.0
  github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
- github.com/douyu/jupiter v0.11.3
+ github.com/douyu/jupiter v0.11.14
  github.com/go-git/go-git/v5 v5.6.1
  github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
  github.com/go-playground/validator v9.31.0+incompatible
- github.com/go-playground/validator/v10 v10.12.0
+ github.com/go-playground/validator/v10 v10.14.0
  github.com/go-resty/resty/v2 v2.7.0
  github.com/golang/protobuf v1.5.3
  github.com/gomodule/redigo v2.0.0+incompatible
  github.com/google/go-cmp v0.5.9
  github.com/gorilla/sessions v1.2.1
  github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
+ github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.75
  github.com/jhump/protoreflect v1.15.1
  github.com/jmespath/go-jmespath v0.4.0
  github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43
  github.com/labstack/echo-contrib v0.14.1
- github.com/labstack/echo/v4 v4.10.2
+ github.com/labstack/echo/v4 v4.11.1
  github.com/labstack/gommon v0.4.0
  github.com/link-duan/toml v0.3.2
  github.com/onsi/ginkgo v1.16.5
- github.com/onsi/ginkgo/v2 v2.9.2
- github.com/onsi/gomega v1.27.6
+ github.com/onsi/ginkgo/v2 v2.12.0
+ github.com/onsi/gomega v1.27.10
  github.com/pkg/errors v0.9.1
- github.com/prometheus/client_golang v1.14.0
+ github.com/prometheus/client_golang v1.16.0
  github.com/robertkrimen/otto v0.2.1
  github.com/robfig/cron/v3 v3.0.1
- github.com/samber/lo v1.37.0
+ github.com/samber/lo v1.38.1
  github.com/sirupsen/logrus v1.9.0
- github.com/spf13/cast v1.5.0
+ github.com/spf13/cast v1.5.1
  github.com/spf13/viper v1.15.0
  github.com/swaggo/swag v1.16.1
  github.com/syndtr/goleveldb v1.0.0
  github.com/tidwall/gjson v1.14.4
  github.com/uber-archive/go-torch v0.0.0-20181107071353-86f327cc820e
  github.com/unknwon/com v1.0.1
  github.com/urfave/negroni v1.0.0
- go.etcd.io/etcd/api/v3 v3.5.7
- go.etcd.io/etcd/client/pkg/v3 v3.5.7
- go.etcd.io/etcd/client/v3 v3.5.7
+ go.etcd.io/etcd/api/v3 v3.5.9
+ go.etcd.io/etcd/client/pkg/v3 v3.5.9
+ go.etcd.io/etcd/client/v3 v3.5.9
  go.etcd.io/etcd/server/v3 v3.5.7
- go.uber.org/zap v1.24.0
- golang.org/x/crypto v0.7.0
- golang.org/x/net v0.9.0
- golang.org/x/oauth2 v0.7.0
- golang.org/x/sync v0.1.0
+ go.uber.org/zap v1.25.0
+ golang.org/x/crypto v0.14.0
+ golang.org/x/net v0.17.0
+ golang.org/x/oauth2 v0.11.0
+ golang.org/x/sync v0.3.0
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
- google.golang.org/grpc v1.54.0
+ google.golang.org/grpc v1.58.2
  gopkg.in/fsnotify.v1 v1.4.7
  gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
  gopkg.in/yaml.v2 v2.4.0
  gopkg.in/yaml.v3 v3.0.1
- gorm.io/driver/mysql v1.4.7
- gorm.io/gorm v1.24.6
+ gorm.io/driver/mysql v1.5.1-0.20230509030346-3715c134c25b
+ gorm.io/gen v0.3.24
+ gorm.io/gorm v1.25.1-0.20230505075827-e61b98d69677
  k8s.io/api v0.26.3
  k8s.io/apimachinery v0.27.1
  k8s.io/client-go v0.26.3
@@ -81,7 +83,7 @@ require (
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bufbuild/protocompile v0.4.0 // indirect
  github.com/cenkalti/backoff v2.2.1+incompatible // indirect
- github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+ github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/cloudflare/circl v1.1.0 // indirect
  github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
@@ -91,13 +93,14 @@ require (
  github.com/dustin/go-humanize v1.0.1 // indirect
  github.com/emicklei/go-restful/v3 v3.9.0 // indirect
  github.com/emirpasic/gods v1.18.1 // indirect
- github.com/fatih/color v1.14.1 // indirect
+ github.com/fatih/color v1.15.0 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.2 // indirect
  github.com/go-git/gcfg v1.5.0 // indirect
  github.com/go-git/go-billy/v5 v5.4.1 // indirect
  github.com/go-kit/kit v0.10.0 // indirect
  github.com/go-logfmt/logfmt v0.5.1 // indirect
- github.com/go-logr/logr v1.2.3 // indirect
+ github.com/go-logr/logr v1.2.4 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/go-ole/go-ole v1.2.5 // indirect
  github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -122,7 +125,7 @@ require (
  github.com/gorilla/context v1.1.1 // indirect
  github.com/gorilla/securecookie v1.1.1 // indirect
  github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/imdario/mergo v0.3.13 // indirect
  github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -133,11 +136,11 @@ require (
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/juju/ratelimit v1.0.2 // indirect
  github.com/kevinburke/ssh_config v1.2.0 // indirect
- github.com/leodido/go-urn v1.2.2 // indirect
+ github.com/leodido/go-urn v1.2.4 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
- github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/mattn/go-isatty v0.0.19 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -146,25 +149,25 @@ require (
  github.com/nxadm/tail v1.4.8 // indirect
  github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
  github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
- github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+ github.com/pelletier/go-toml/v2 v2.0.8 // indirect
  github.com/pierrec/lz4 v2.6.0+incompatible // indirect
  github.com/pjbgf/sha1cd v0.3.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/prometheus/client_model v0.3.0 // indirect
- github.com/prometheus/common v0.40.0 // indirect
- github.com/prometheus/procfs v0.9.0 // indirect
- github.com/satori/go.uuid v1.2.0 // indirect
+ github.com/prometheus/common v0.42.0 // indirect
+ github.com/prometheus/procfs v0.10.1 // indirect
  github.com/sergi/go-diff v1.1.0 // indirect
  github.com/shirou/gopsutil/v3 v3.21.7 // indirect
  github.com/skeema/knownhosts v1.1.0 // indirect
  github.com/spf13/afero v1.9.3 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/stretchr/objx v0.5.0 // indirect
- github.com/stretchr/testify v1.8.2 // indirect
+ github.com/stretchr/testify v1.8.4 // indirect
  github.com/subosito/gotenv v1.4.2 // indirect
  github.com/tidwall/match v1.1.1 // indirect
  github.com/tidwall/pretty v1.2.1 // indirect
+ github.com/tjfoc/gmsm v1.4.1 // indirect
  github.com/tklauser/go-sysconf v0.3.7 // indirect
  github.com/tklauser/numcpus v0.2.3 // indirect
  github.com/uber/go-torch v0.0.0-20181107071353-86f327cc820e // indirect
@@ -176,28 +179,33 @@ require (
  go.etcd.io/etcd/client/v2 v2.305.7 // indirect
  go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
  go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
+ go.mongodb.org/mongo-driver v1.12.1 // indirect
  go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
- go.opentelemetry.io/otel v1.14.0 // indirect
- go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
- go.opentelemetry.io/otel/sdk v1.14.0 // indirect
- go.opentelemetry.io/otel/trace v1.14.0 // indirect
- go.opentelemetry.io/proto/otlp v0.19.0 // indirect
+ go.opentelemetry.io/otel v1.19.0 // indirect
+ go.opentelemetry.io/otel/bridge/opentracing v1.16.0 // indirect
+ go.opentelemetry.io/otel/exporters/jaeger v1.16.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
+ go.opentelemetry.io/otel/metric v1.19.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.19.0 // indirect
+ go.opentelemetry.io/otel/trace v1.19.0 // indirect
+ go.opentelemetry.io/proto/otlp v1.0.0 // indirect
  go.uber.org/atomic v1.10.0 // indirect
- go.uber.org/automaxprocs v1.5.1 // indirect
- go.uber.org/multierr v1.9.0 // indirect
- golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
- golang.org/x/sys v0.7.0 // indirect
- golang.org/x/term v0.7.0 // indirect
- golang.org/x/text v0.9.0 // indirect
+ go.uber.org/automaxprocs v1.5.3 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
+ golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
+ golang.org/x/mod v0.12.0 // indirect
+ golang.org/x/sys v0.13.0 // indirect
+ golang.org/x/term v0.13.0 // indirect
+ golang.org/x/text v0.13.0 // indirect
  golang.org/x/time v0.3.0 // indirect
- golang.org/x/tools v0.7.0 // indirect
+ golang.org/x/tools v0.12.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 // indirect
+ google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
  google.golang.org/grpc/examples v0.0.0-20220831213702-ddcda5f76a3b // indirect
- google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743 // indirect
+ google.golang.org/protobuf v1.31.0 // indirect
  gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
  gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
@@ -206,6 +214,9 @@ require (
  gopkg.in/sourcemap.v1 v1.0.5 // indirect
  gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
  gopkg.in/warnings.v0 v0.1.2 // indirect
+ gorm.io/datatypes v1.1.1-0.20230130040222-c43177d3cf8c // indirect
+ gorm.io/hints v1.1.0 // indirect
+ gorm.io/plugin/dbresolver v1.3.0 // indirect
  k8s.io/klog/v2 v2.90.1 // indirect
  k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
  k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect