Merge pull request #856 from 4t145/fix-deps-version

global: cargo fmt bios-sdk-invoke, bios-basic and bios-iam
ideal-world · Oct 23, 2024 · b88e0f0 · b88e0f0
2 parents 90d0f2b + ccb743f
commit b88e0f0
Show file tree

Hide file tree

Showing 25 changed files with 106 additions and 215 deletions.
diff --git a/.github/workflows/iam-release.yml b/.github/workflows/iam-release.yml
@@ -2,6 +2,8 @@ name: Publish bios-iam crate
 
 on:
   push:
+    branches:
+      - release-iam
     tags:
       - 'release-*'
 

diff --git a/backend/basic/src/dto.rs b/backend/basic/src/dto.rs
@@ -13,8 +13,7 @@ use tardis::web::poem_openapi;
 /// Basic query condition object
 ///
 /// 基础的查询条件对象
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, poem_openapi::Object)]
 pub struct BasicQueryCondInfo {
     /// Query field
     #[oai(validator(min_length = "1"))]

diff --git a/backend/basic/src/enumeration.rs b/backend/basic/src/enumeration.rs
@@ -7,8 +7,7 @@ use tardis::web::poem_openapi;
 /// API classification
 ///
 /// API分类
-#[derive(Display, Debug)]
-#[derive(poem_openapi::Tags)]
+#[derive(Display, Debug, poem_openapi::Tags)]
 pub enum ApiTag {
     /// Common Console, mostly starting with ``cc``, generally do not require authentication.
     ///
@@ -45,8 +44,7 @@ pub enum ApiTag {
 /// Basic query operator
 ///
 /// 基础查询操作符
-#[derive(Display, Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
-#[derive(poem_openapi::Enum)]
+#[derive(Display, Clone, Debug, PartialEq, Eq, Deserialize, Serialize, poem_openapi::Enum)]
 pub enum BasicQueryOpKind {
     #[oai(rename = "=")]
     Eq,

diff --git a/backend/basic/src/helper.rs b/backend/basic/src/helper.rs
@@ -1,4 +1,3 @@
-
 pub mod db_helper;
 
 pub mod request_helper;
diff --git a/backend/basic/src/rbum.rs b/backend/basic/src/rbum.rs
@@ -1,4 +1,3 @@
-
 pub(crate) mod domain;
 pub mod dto;
 pub mod helper;

diff --git a/backend/basic/src/rbum/dto/rbum_cert_conf_dto.rs b/backend/basic/src/rbum/dto/rbum_cert_conf_dto.rs
@@ -11,8 +11,7 @@ use crate::rbum::rbum_enumeration::RbumCertConfStatusKind;
 /// Add request for certificate configuration
 ///
 /// 凭证配置添加请求
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object)]
 pub struct RbumCertConfAddReq {
     /// Certificate configuration type
     ///
@@ -268,8 +267,7 @@ pub struct RbumCertConfAddReq {
 /// Modify request for certificate configuration
 ///
 /// 凭证配置修改请求
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object)]
 pub struct RbumCertConfModifyReq {
     /// Certificate configuration name
     ///
@@ -442,8 +440,7 @@ pub struct RbumCertConfModifyReq {
 /// Certificate configuration summary information
 ///
 /// 凭证配置概要信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumCertConfSummaryResp {
     /// Certificate configuration id
     ///
@@ -543,8 +540,7 @@ pub struct RbumCertConfSummaryResp {
 /// Certificate configuration detail information
 ///
 /// 凭证配置详细信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumCertConfDetailResp {
     /// Certificate configuration id
     ///
@@ -662,8 +658,7 @@ pub struct RbumCertConfDetailResp {
 /// Certificate configuration id and extension information
 ///
 /// 凭证配置id和扩展信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumCertConfIdAndExtResp {
     /// Certificate configuration id
     ///

diff --git a/backend/basic/src/rbum/dto/rbum_cert_dto.rs b/backend/basic/src/rbum/dto/rbum_cert_dto.rs
@@ -11,8 +11,7 @@ use crate::rbum::rbum_enumeration::{RbumCertRelKind, RbumCertStatusKind};
 /// Add request for certificate
 ///
 /// 凭证添加请求
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object)]
 pub struct RbumCertAddReq {
     /// Certification access key
     ///
@@ -175,8 +174,7 @@ pub struct RbumCertAddReq {
 /// Modify request for certificate
 ///
 /// 凭证修改请求
-#[derive(Serialize, Deserialize, Debug, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Default, poem_openapi::Object)]
 pub struct RbumCertModifyReq {
     /// Certification access key
     ///
@@ -247,8 +245,7 @@ pub struct RbumCertModifyReq {
 /// Certificate summary information
 ///
 /// 凭证概要信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumCertSummaryResp {
     /// Certification id
     ///
@@ -309,8 +306,7 @@ pub struct RbumCertSummaryResp {
 /// Certificate summary information with secret key
 ///
 /// 带有密钥的凭证概要信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumCertSummaryWithSkResp {
     /// Certification id
     ///
@@ -383,8 +379,7 @@ pub struct RbumCertSummaryWithSkResp {
 /// Certificate detail information
 ///
 /// 凭证详细信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumCertDetailResp {
     /// Certification id
     ///

diff --git a/backend/basic/src/rbum/dto/rbum_domain_dto.rs b/backend/basic/src/rbum/dto/rbum_domain_dto.rs
@@ -11,8 +11,7 @@ use crate::rbum::rbum_enumeration::RbumScopeLevelKind;
 /// Add request for resource domain
 ///
 /// 资源域添加请求
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object)]
 pub struct RbumDomainAddReq {
     /// Resource domain code
     ///
@@ -53,8 +52,7 @@ pub struct RbumDomainAddReq {
 /// Modify request for resource domain
 ///
 /// 资源域修改请求
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object)]
 pub struct RbumDomainModifyReq {
     /// Resource domain name
     ///
@@ -88,8 +86,7 @@ pub struct RbumDomainModifyReq {
 /// Resource domain summary information
 ///
 /// 资源域概要信息
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, Clone, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumDomainSummaryResp {
     /// Resource domain id
     ///
@@ -123,8 +120,7 @@ pub struct RbumDomainSummaryResp {
 /// Resource domain detail information
 ///
 /// 资源域详细信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumDomainDetailResp {
     /// Resource domain id
     ///

diff --git a/backend/basic/src/rbum/dto/rbum_filer_dto.rs b/backend/basic/src/rbum/dto/rbum_filer_dto.rs
@@ -11,8 +11,7 @@ use crate::rbum::rbum_enumeration::{RbumCertConfStatusKind, RbumCertRelKind, Rbu
 /// Resource basic filter
 ///
 /// 资源基础过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumBasicFilterReq {
     /// Whether to ignore the scope
@@ -80,8 +79,7 @@ pub struct RbumBasicFilterReq {
 /// Resource certificate configuration filter
 ///
 /// 资源凭证配置过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumCertConfFilterReq {
     /// Basic filter
@@ -113,8 +111,7 @@ pub struct RbumCertConfFilterReq {
 /// Resource certificate filter
 ///
 /// 资源凭证过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumCertFilterReq {
     /// Basic filter
@@ -174,8 +171,7 @@ pub struct RbumCertFilterReq {
 /// Resource kind filter
 ///
 /// 资源类型过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumKindFilterReq {
     /// Basic filter
@@ -191,8 +187,7 @@ pub struct RbumKindFilterReq {
 /// Resource kind attribute filter
 ///
 /// 资源类型属性过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumKindAttrFilterReq {
     /// Basic filter
@@ -212,8 +207,7 @@ pub struct RbumKindAttrFilterReq {
 /// Resource item attribute filter
 ///
 /// 资源项属性过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumItemAttrFilterReq {
     /// Basic filter
@@ -233,8 +227,7 @@ pub struct RbumItemAttrFilterReq {
 /// Resource relation filter
 ///
 /// 资源关联过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumRelFilterReq {
     /// Basic filter
@@ -282,8 +275,7 @@ pub struct RbumRelFilterReq {
 /// Resource relation extension filter
 ///
 /// 资源关联扩展过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumRelExtFilterReq {
     /// Basic filter
@@ -299,8 +291,7 @@ pub struct RbumRelExtFilterReq {
 /// Resource set filter
 ///
 /// 资源集过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 pub struct RbumSetFilterReq {
     /// Basic filter
     ///
@@ -319,8 +310,7 @@ pub struct RbumSetFilterReq {
 /// Resource set category(node) filter
 ///
 /// 资源集分类（节点）过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 pub struct RbumSetCateFilterReq {
     /// Basic filter
     ///
@@ -363,8 +353,7 @@ pub struct RbumSetCateFilterReq {
 /// Resource set category(node) mount resource item filter
 ///
 /// 资源集分类（节点）挂载资源项的过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 pub struct RbumSetItemFilterReq {
     /// Basic filter
     ///
@@ -434,8 +423,7 @@ pub struct RbumSetItemFilterReq {
 /// Resource set filter
 ///
 /// 资源集过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 pub struct RbumSetTreeFilterReq {
     /// Resource category (node) sys_codes
     ///
@@ -510,8 +498,7 @@ pub struct RbumSetTreeFilterReq {
 /// Resource set category (node) associated filter for mounted resource items
 ///
 /// 资源集分类（节点）挂载资源项的关联过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumSetItemRelFilterReq {
     /// Resource set id and resource category (node) id set
@@ -535,8 +522,7 @@ pub struct RbumSetItemRelFilterReq {
 /// Simple Resource item relation filter
 ///
 /// 简单的资源项关联过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumItemRelSimpleFilterReq {
     /// Whether the related party is a ``from`` party
@@ -560,8 +546,7 @@ pub struct RbumItemRelSimpleFilterReq {
 /// Resource item relation filter
 ///
 /// 资源项关联过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumItemRelFilterReq {
     /// Is it optional
@@ -625,8 +610,7 @@ pub trait RbumItemFilterFetcher {
 /// Resource item basic filter
 ///
 /// 资源项基础过滤器
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, poem_openapi::Object)]
 #[serde(default)]
 pub struct RbumItemBasicFilterReq {
     /// Basic filter

diff --git a/backend/basic/src/rbum/dto/rbum_item_attr_dto.rs b/backend/basic/src/rbum/dto/rbum_item_attr_dto.rs
@@ -10,8 +10,7 @@ use tardis::web::poem_openapi;
 /// Add request for resource item extended attribute value
 ///
 /// 资源项扩展属性值添加请求
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object)]
 pub struct RbumItemAttrAddReq {
     /// Extended attribute value
     ///
@@ -33,8 +32,7 @@ pub struct RbumItemAttrAddReq {
 /// Modify request for resource item extended attribute value
 ///
 /// 资源项扩展属性值修改请求
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object)]
 pub struct RbumItemAttrModifyReq {
     /// Extended attribute value
     ///
@@ -46,8 +44,7 @@ pub struct RbumItemAttrModifyReq {
 /// Batch add or modify request for resource item extended attribute values
 ///
 /// 批量添加或修改资源项扩展属性值请求
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object)]
 pub struct RbumItemAttrsAddOrModifyReq {
     /// Add or modify value collection
     ///
@@ -67,8 +64,7 @@ pub struct RbumItemAttrsAddOrModifyReq {
 /// Resource item extended attribute value summary information
 ///
 /// 源项扩展属性值概要信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumItemAttrSummaryResp {
     /// Extended attribute value id
     ///
@@ -100,8 +96,7 @@ pub struct RbumItemAttrSummaryResp {
 /// Resource item extended attribute value detail information
 ///
 /// 源项扩展属性值详细信息
-#[derive(Serialize, Deserialize, Debug)]
-#[derive(poem_openapi::Object, sea_orm::FromQueryResult)]
+#[derive(Serialize, Deserialize, Debug, poem_openapi::Object, sea_orm::FromQueryResult)]
 pub struct RbumItemAttrDetailResp {
     /// Extended attribute value id
     ///
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ name: Publish bios-iam crate @@
     on:
       push:
+        branches:
+          - release-iam
         tags:
           - 'release-*'
@@ Expand Down @@