liwei 2 yıl önce
ebeveyn
işleme
7f570628b4
6 değiştirilmiş dosya ile 5 ekleme ve 9 silme
  1. 1 1
      comm
  2. 1 1
      mesh/Dockerfile
  3. 2 2
      mesh/api/service-database-category.go
  4. 1 1
      mesh/app.yaml
  5. 0 1
      mesh/go.mod
  6. 0 3
      mesh/go.sum

+ 1 - 1
comm

@@ -1 +1 @@
-Subproject commit 472ef770e54c326cd7dffbde54f8c2cf84a9029c
+Subproject commit 54a618f8d978fd39b3f876ff7ccf3587c0863bdc

+ 1 - 1
mesh/Dockerfile

@@ -17,6 +17,6 @@ WORKDIR /root/queenmesh
 ADD ./mesh-service ./mesh-service
 ADD ./app.yaml ./app.yaml
 
-EXPOSE 8908
+EXPOSE 8910
 
 ENTRYPOINT ["./mesh-service"]

+ 2 - 2
mesh/api/service-database-category.go

@@ -101,7 +101,7 @@ func CreateDatabaseCategoryRouter(router *GinRouter) {
 			Query:       repo.Map{"userId": uidObj, "scope": scope},
 		})
 		if !ok {
-			return nil, NewError("no find!")
+			return comm.DbCategory{}, nil
 		}
 		return ret, nil
 	})
@@ -160,7 +160,7 @@ func CreateDatabaseCategoryRouter(router *GinRouter) {
 			Query:       repo.Map{"userId": uidObj, "scope": scope},
 		})
 		if !ok {
-			return nil, NewError("no find!")
+			return comm.DbAssetUserCategory{}, nil
 		}
 		return ret, nil
 	})

+ 1 - 1
mesh/app.yaml

@@ -1,4 +1,4 @@
-port: 8908
+port: 8910
 name: queenmesh
 version: 1.0.0
 saveType: obs

+ 0 - 1
mesh/go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/gin-gonic/gin v1.7.4
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible
-	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.0.102
 	github.com/minio/minio-go/v7 v7.0.16
 	github.com/natefinch/lumberjack v2.0.0+incompatible
 	github.com/spf13/viper v1.9.0

+ 0 - 3
mesh/go.sum

@@ -236,8 +236,6 @@ github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible h1:3kDd8PIWAdU+qGs/+0QUgsMI2ZSiJPt45Xn0su+x/Q0=
 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible/go.mod h1:l7VUhRbTKCzdOacdT4oWCwATKyvZqUOlOqr0Ous3k4s=
-github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.0.102 h1:dq22kaGkkTN60p8yPk0hFlmQKsrDH4CLkY5lmF2h+Cg=
-github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.0.102/go.mod h1:i26wWZgTXy1S6CByqx7SX4lpNPECzAFF940ver/Zi9k=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -499,7 +497,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=