Merge branch 'sxy' into dev

api/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v4.24.0--rc1
+// - protoc             v5.29.2
 // source: pb/bundle.proto
 
 package bundle

pkg/router/bundle.go

@@ -23,18 +23,20 @@ func BundleRouter(r *gin.RouterGroup) {
 			bundleClientRoute.POST("bundle-list", bundle.BundleList)
 		}
 		bundleClientRouteV2 := bundleRoute.Group("system/v2")
-		bundleClientRouteV2.POST("save", bundle.SaveBundleV2)
-		bundleClientRouteV2.POST("update/shelfStatus", bundle.HandShelf)
-
+		{
+			bundleClientRouteV2.POST("save", bundle.SaveBundleV2)
+			bundleClientRouteV2.POST("update/shelfStatus", bundle.HandShelf)
+			bundleClientRouteV2.POST("bundle-list", bundle.BundleListV2)
+			bundleClientRouteV2.POST("bundle-detail", bundle.BundleDetailV2)
+		}
 		bundleAppRoute = bundleAppRoute.Group("common")
 		{
 			bundleAppRoute.POST("bundle-list", bundle.BundleList)
 		}
-		bundleAppRouteV2 := bundleRoute.Group("common/v2")
+		bundleAppRouteV2 := bundleAppRoute.Group("app/system/v2")
 		{
 			bundleAppRouteV2.POST("bundle-list", bundle.BundleListV2)
 			bundleAppRouteV2.POST("bundle-detail", bundle.BundleDetailV2)
-
 		}
 
 	}

pkg/router/valueAddBundle.go

@@ -34,6 +34,11 @@ func ValueAddBundleRouter(r *gin.RouterGroup) {
 		{
 			valueAddBundleAppRoute.POST("list", bundle.ValueAddBundleList)
 		}
+		valueAddBundleAppRouteV2 := valueAddBundleAppRoute.Group("system/v2")
+		{
+			valueAddBundleAppRouteV2.POST("list", bundle.ValueAddServiceList)
+			valueAddBundleAppRouteV2.POST("detail", bundle.ValueAddServiceDetail)
+		}
 
 	}