Merge remote-tracking branch 'origin/main'

src/shared/models/TODO.md

 - [ ] app-service - jqy
-- [ ] auth-service - zk
+- [x] auth-service - zk
 - [ ] chain-service - zk
 - [ ] cloud-service - zk
 - [x] commodity-service - gxk

src/shared/models/auth-service/AuthConsole.ts

@@ -4,19 +4,7 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthConsoleGetReq extends Model<AuthConsoleGetReq> {
-  @JsonProperty() userId: string
-  constructor(payload: Partial<AuthConsoleGetReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthConsole extends Model<AuthConsole> {
-  constructor(payload: Partial<AuthConsole>) {
-    super(payload)
-  }
-
   /**
    * 获取控制台列表
    * @param payload
@@ -27,3 +15,8 @@ export class AuthConsole extends Model<AuthConsole> {
     })
   }
 }
+
+@Serializable()
+export class AuthConsoleGetReq extends Model<AuthConsoleGetReq> {
+  @JsonProperty() userId: string
+}

src/shared/models/auth-service/AuthMenuInfo.ts

@@ -4,20 +4,7 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthMenuInfoGetReq extends Model<AuthMenuInfoGetReq> {
-  @JsonProperty() objectId: string
-  @JsonProperty() userId: string
-  constructor(payload: Partial<AuthMenuInfoGetReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthOperationRoleTree extends Model<AuthOperationRoleTree> {
-  constructor(payload: Partial<AuthOperationRoleTree>) {
-    super(payload)
-  }
-
   /**
    * 获取菜单信息
    * @param payload
@@ -28,3 +15,9 @@ export class AuthOperationRoleTree extends Model<AuthOperationRoleTree> {
     })
   }
 }
+
+@Serializable()
+export class AuthMenuInfoGetReq extends Model<AuthMenuInfoGetReq> {
+  @JsonProperty() objectId: string
+  @JsonProperty() userId: string
+}

src/shared/models/auth-service/AuthOperation.ts

@@ -4,20 +4,7 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthOperationGetReq extends Model<AuthOperationGetReq> {
-  @JsonProperty() userId: string
-  @JsonProperty() objectId: string
-  constructor(payload: Partial<AuthOperationGetReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthOperation extends Model<AuthOperation> {
-  constructor(payload: Partial<AuthOperation>) {
-    super(payload)
-  }
-
   /**
    * 根据类型id获取对象列表
    * @param payload
@@ -28,3 +15,9 @@ export class AuthOperation extends Model<AuthOperation> {
     })
   }
 }
+
+@Serializable()
+export class AuthOperationGetReq extends Model<AuthOperationGetReq> {
+  @JsonProperty() userId: string
+  @JsonProperty() objectId: string
+}

src/shared/models/auth-service/AuthOperationRole.ts

@@ -4,19 +4,7 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthOperationRoleGetReq extends Model<AuthOperationRoleGetReq> {
-  @JsonProperty() roleId: string
-  constructor(payload: Partial<AuthOperationRoleGetReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthOperationRole extends Model<AuthOperationRole> {
-  constructor(payload: Partial<AuthOperationRole>) {
-    super(payload)
-  }
-
   /**
    * 查询角色在对象上的权限信息(设置)
    * @param payload
@@ -27,3 +15,8 @@ export class AuthOperationRole extends Model<AuthOperationRole> {
     })
   }
 }
+
+@Serializable()
+export class AuthOperationRoleGetReq extends Model<AuthOperationRoleGetReq> {
+  @JsonProperty() roleId: string
+}

src/shared/models/auth-service/AuthOperationRoleTree.ts

@@ -4,19 +4,7 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthOperationRoleTreeGetReq extends Model<AuthOperationRoleTreeGetReq> {
-  @JsonProperty() roleId: string
-  constructor(payload: Partial<AuthOperationRoleTreeGetReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthOperationRoleTree extends Model<AuthOperationRoleTree> {
-  constructor(payload: Partial<AuthOperationRoleTree>) {
-    super(payload)
-  }
-
   /**
    * 查询角色在对象上的权限信息(查看)
    * @param payload
@@ -27,3 +15,8 @@ export class AuthOperationRoleTree extends Model<AuthOperationRoleTree> {
     })
   }
 }
+
+@Serializable()
+export class AuthOperationRoleTreeGetReq extends Model<AuthOperationRoleTreeGetReq> {
+  @JsonProperty() roleId: string
+}

src/shared/models/auth-service/AuthOperationUser.ts

@@ -4,20 +4,7 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthOperationUserGetReq extends Model<AuthOperationUserGetReq> {
-  @JsonProperty() userId: string
-  @JsonProperty() objectId: string
-  constructor(payload: Partial<AuthOperationUserGetReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthOperationUser extends Model<AuthOperationUser> {
-  constructor(payload: Partial<AuthOperationUser>) {
-    super(payload)
-  }
-
   /**
    * 获取按钮权限信息
    * @param payload
@@ -28,3 +15,9 @@ export class AuthOperationUser extends Model<AuthOperationUser> {
     })
   }
 }
+
+@Serializable()
+export class AuthOperationUserGetReq extends Model<AuthOperationUserGetReq> {
+  @JsonProperty() userId: string
+  @JsonProperty() objectId: string
+}

src/shared/models/auth-service/AuthOperationUserRole.ts

-import { JsonProperty, Serializable } from 'typescript-json-serializer'
+import { Serializable } from 'typescript-json-serializer'
 import { api } from '@shared/http/axios'
 import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
 export class AuthOperationUserRole extends Model<AuthOperationUserRole> {
-  constructor(payload: Partial<AuthOperationUserRole>) {
-    super(payload)
-  }
-
   /**
    * 模糊搜索当前控制台的角色
    */

src/shared/models/auth-service/AuthRole.ts

@@ -4,31 +4,9 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthRolePostReq extends Model<AuthRolePostReq> {
-  @JsonProperty() name: string
-  @JsonProperty() description: string
-  @JsonProperty() type: number
-  @JsonProperty() objectId: string
-  constructor(payload: Partial<AuthRolePostReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
-export class AuthRolePutReq extends Model<AuthRolePutReq> {
-  @JsonProperty() id: string
+export class AuthRole extends Model<AuthRole> {
   @JsonProperty() name: string
   @JsonProperty() description: string
-  constructor(payload: Partial<AuthRolePutReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
-export class AuthRole extends Model<AuthRole> {
-  constructor(payload: Partial<AuthRole>) {
-    super(payload)
-  }
 
   /**
    * 新增角色
@@ -50,3 +28,14 @@ export class AuthRole extends Model<AuthRole> {
     })
   }
 }
+
+@Serializable()
+export class AuthRolePostReq extends Model<AuthRolePostReq> {
+  @JsonProperty() type: number
+  @JsonProperty() objectId: string
+}
+
+@Serializable()
+export class AuthRolePutReq extends Model<AuthRolePutReq> {
+  @JsonProperty() id: string
+}

src/shared/models/auth-service/AuthRoleAuth.ts

@@ -4,21 +4,7 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthRoleAuthPutReq extends Model<AuthRoleAuthPutReq> {
-  @JsonProperty() objId: string
-  @JsonProperty() opIds: []
-  @JsonProperty() roleId: string
-  constructor(payload: Partial<AuthRoleAuthPutReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthRoleAuth extends Model<AuthRoleAuth> {
-  constructor(payload: Partial<AuthRoleAuth>) {
-    super(payload)
-  }
-
   /**
    * 修改角色权限
    * @param payload
@@ -29,3 +15,10 @@ export class AuthRoleAuth extends Model<AuthRoleAuth> {
     })
   }
 }
+
+@Serializable()
+export class AuthRoleAuthPutReq extends Model<AuthRoleAuthPutReq> {
+  @JsonProperty() objId: string
+  @JsonProperty() opIds: []
+  @JsonProperty() roleId: string
+}

src/shared/models/auth-service/AuthRoleAuthSuper.ts

@@ -2,30 +2,9 @@ import { JsonProperty, Serializable } from 'typescript-json-serializer'
 import { api } from '@shared/http/axios'
 import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
-import { AuthRoleAuthPutReq } from '@shared/models/auth-service/AuthRoleAuth'
-
-@Serializable()
-export class AuthRoleAuthSuperGetReq extends Model<AuthRoleAuthSuperGetReq> {
-  @JsonProperty() roleId: string
-  constructor(payload: Partial<AuthRoleAuthSuperGetReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
-export class AuthRoleAuthSuperPutReq extends Model<AuthRoleAuthSuperPutReq> {
-  @JsonProperty() payload: []
-  constructor(payload: Partial<AuthRoleAuthSuperPutReq>) {
-    super(payload)
-  }
-}
 
 @Serializable()
 export class AuthRoleAuthSuper extends Model<AuthRoleAuthSuper> {
-  constructor(payload: Partial<AuthRoleAuthSuper>) {
-    super(payload)
-  }
-
   /**
    * 查询角色在各个对象上的权限信息(超管设置权限)
    */
@@ -45,3 +24,13 @@ export class AuthRoleAuthSuper extends Model<AuthRoleAuthSuper> {
     })
   }
 }
+
+@Serializable()
+export class AuthRoleAuthSuperGetReq extends Model<AuthRoleAuthSuperGetReq> {
+  @JsonProperty() roleId: string
+}
+
+@Serializable()
+export class AuthRoleAuthSuperPutReq extends Model<AuthRoleAuthSuperPutReq> {
+  @JsonProperty() payload: []
+}

src/shared/models/auth-service/AuthRolePermissionPage.ts

@@ -4,24 +4,9 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthRolePermissionPagePostReq extends Model<AuthRolePermissionPagePostReq> {
-  @JsonProperty() objectId: string
-  @JsonProperty() userId: string
-  @JsonProperty() pageIndex?: string
-  @JsonProperty() pageSize: string
-  @JsonProperty() param: string
-  constructor(payload: Partial<AuthRolePermissionPagePostReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthRolePermissionPage extends Model<AuthRolePermissionPage> {
   @JsonProperty() list: []
   @JsonProperty() totalCount: number
-  constructor(payload: Partial<AuthRolePermissionPage>) {
-    super(payload)
-  }
   /**
    * 分页查询角色权限列表
    * @param payload
@@ -32,3 +17,12 @@ export class AuthRolePermissionPage extends Model<AuthRolePermissionPage> {
     })
   }
 }
+
+@Serializable()
+export class AuthRolePermissionPagePostReq extends Model<AuthRolePermissionPagePostReq> {
+  @JsonProperty() objectId: string
+  @JsonProperty() userId: string
+  @JsonProperty() pageIndex?: string
+  @JsonProperty() pageSize: string
+  @JsonProperty() param: string
+}

src/shared/models/auth-service/AuthRoleRoleId.ts

@@ -4,19 +4,7 @@ import { HttpResponse } from '@shared/http/HttpResponse'
 import { Model } from '@shared/models/Model'
 
 @Serializable()
-export class AuthRoleRoleIdDeleteReq extends Model<AuthRoleRoleIdDeleteReq> {
-  @JsonProperty() roleId: string
-  constructor(payload: Partial<AuthRoleRoleIdDeleteReq>) {
-    super(payload)
-  }
-}
-
-@Serializable()
 export class AuthRoleRoleId extends Model<AuthRoleRoleId> {
-  constructor(payload: Partial<AuthRoleRoleId>) {
-    super(payload)
-  }
-
   /**
    * 删除当前控制台的角色
    * @param payload
@@ -27,3 +15,8 @@ export class AuthRoleRoleId extends Model<AuthRoleRoleId> {
     })
   }
 }
+
+@Serializable()
+export class AuthRoleRoleIdDeleteReq extends Model<AuthRoleRoleIdDeleteReq> {
+  @JsonProperty() roleId: string
+}

src/shared/models/auth-service/AuthRolesConsole.ts

@@ -11,7 +11,4 @@ export class AuthRolesConsole extends Model<AuthRolesConsole> {
   static async get() {
     return await api.get<HttpResponse>('/services/auth-service/role/console')
   }
-  constructor(payload: Partial<AuthRolesConsole>) {
-    super(payload)
-  }
 }