refactor: 全框架 JSON 操作迁移到 simapi_serialization
- 依赖:新增 simapi_serialization path 依赖(保留 soulsoft_serialization 供 soulsoft web 栈传递使用) - SimApiJson.json / SimApiUtil.json → JsonSerializer.Serialize - SimApiUtil.fromJson / base64DecodeTo → JsonSerializer.Deserialize(去 ISerialization 约束) - SimApiHttpClient signQuery/aesQuery/aesSignQuery/query → 去约束,反序列化换新库 - SimApiBaseResponse/SimApiDataResponse/SimApiLoginItem/AesBodyRequest/AuthSDK DTO → 去 @Serialization 宏/去 soulsoft 接口,改纯 POCO(simapi_serialization 反射) - SimApiBaseResponse 标 @SerializerParent:子类响应序列化包含 _code/_message - SimApiResultWriter / SimApiExceptionMiddleware → 响应输出走 simapi_serialization(统一 _code/_message 格式) - SimApiRequestLogMiddleware 截断 → Deserialize<HashMap<String,Any>> + 重序列化 - SimApiAuthDto JsonValue 字段 → HashMap<String,Any>;SimApiCache.get<T> 去约束 - webdemo:AuthController readFromJson 换 Deserialize;cjpm.toml 补依赖 - 验证:webdemo 启动正常,GET/POST 接口响应格式统一,S3 存储全链路 OK
This commit is contained in:
@@ -7,18 +7,15 @@
|
||||
package simapi.communications
|
||||
|
||||
import std.collection.*
|
||||
import soulsoft_serialization.*
|
||||
|
||||
/**
|
||||
* 登录信息项:Token 认证通过后注入请求上下文。
|
||||
* 对齐 C# SimApiLoginItem(Id / Type / Meta / Extra,camelCase 输出 id/type/meta/extra)。
|
||||
* 对齐 C# SimApiLoginItem(Id / Type / Meta / Extra)。
|
||||
*
|
||||
* 说明:因 _extra 为 HashMap<String, Any>(Any 不满足 soulsoft 的 ISerialization<V> 约束,
|
||||
* 无法用 @Serialization 宏),故手动实现 ISerialization<SimApiLoginItem>(serialize + deserialize);
|
||||
* 调用方统一通过 JsonSerializer.serializeObject<T>() / deserializeObject<T>() 使用
|
||||
* (对齐 .NET JsonSerializer.Serialize / Deserialize)。
|
||||
* 序列化/反序列化由 simapi_serialization 反射处理(免标注、免约束),
|
||||
* 字段 _id/_types/_meta/_extra 全部为受支持类型(String/Array/HashMap)。
|
||||
*/
|
||||
public class SimApiLoginItem <: ISerialization<SimApiLoginItem> {
|
||||
public class SimApiLoginItem {
|
||||
public var _id: String = ""
|
||||
public var _types: Array<String> = ["user"]
|
||||
public var _meta: HashMap<String, String> = HashMap<String, String>()
|
||||
@@ -39,129 +36,4 @@ public class SimApiLoginItem <: ISerialization<SimApiLoginItem> {
|
||||
this._meta = HashMap<String, String>()
|
||||
this._extra = HashMap<String, Any>()
|
||||
}
|
||||
|
||||
/**
|
||||
* 序列化为 DataModel:{"id","type","meta","extra"}。
|
||||
*/
|
||||
public func serializeObject(options: JsonSerializerOptions): DataModel {
|
||||
let dms = DataModelStruct()
|
||||
dms.add(Field("id", DataModelString(_id)))
|
||||
// type: string[]
|
||||
let typesSeq = DataModelSeq()
|
||||
for (t in _types) {
|
||||
typesSeq.add(DataModelString(t))
|
||||
}
|
||||
dms.add(Field("type", typesSeq))
|
||||
// meta: object<string,string>
|
||||
let metaStruct = DataModelStruct()
|
||||
for ((k, v) in _meta) {
|
||||
metaStruct.add(Field(k, DataModelString(v)))
|
||||
}
|
||||
dms.add(Field("meta", metaStruct))
|
||||
// extra: object<string,any>
|
||||
let extraStruct = DataModelStruct()
|
||||
for ((k, v) in _extra) {
|
||||
extraStruct.add(Field(k, anyToDataModel(v)))
|
||||
}
|
||||
dms.add(Field("extra", extraStruct))
|
||||
dms
|
||||
}
|
||||
|
||||
/**
|
||||
* 从 DataModel 反序列化:{"id","type","meta","extra"}。
|
||||
*/
|
||||
public static func deserializeObject(dm: DataModel, options: JsonSerializerOptions): SimApiLoginItem {
|
||||
let item = SimApiLoginItem()
|
||||
if (let dms: DataModelStruct <- dm) {
|
||||
for (field in dms.getFields()) {
|
||||
match (field.getName()) {
|
||||
case "id" => item._id = field.getData() |> dataModelToString
|
||||
case "type" =>
|
||||
let list = ArrayList<String>()
|
||||
if (let seq: DataModelSeq <- field.getData()) {
|
||||
for (sub in seq.getItems()) {
|
||||
list.add(dataModelToString(sub))
|
||||
}
|
||||
}
|
||||
item._types = list.toArray()
|
||||
case "meta" =>
|
||||
if (let metaStruct: DataModelStruct <- field.getData()) {
|
||||
for (sub in metaStruct.getFields()) {
|
||||
item._meta[sub.getName()] = dataModelToString(sub.getData())
|
||||
}
|
||||
}
|
||||
case "extra" =>
|
||||
if (let extraStruct: DataModelStruct <- field.getData()) {
|
||||
for (sub in extraStruct.getFields()) {
|
||||
item._extra[sub.getName()] = dataModelToAny(sub.getData())
|
||||
}
|
||||
}
|
||||
case _ => ()
|
||||
}
|
||||
}
|
||||
}
|
||||
item
|
||||
}
|
||||
|
||||
private static func dataModelToString(dm: DataModel): String {
|
||||
if (let s: DataModelString <- dm) {
|
||||
return s.getValue()
|
||||
}
|
||||
if (let i: DataModelInt <- dm) {
|
||||
return "${i.getValue()}"
|
||||
}
|
||||
if (let b: DataModelBool <- dm) {
|
||||
return "${b.getValue()}"
|
||||
}
|
||||
""
|
||||
}
|
||||
|
||||
private static func dataModelToAny(dm: DataModel): Any {
|
||||
if (let s: DataModelString <- dm) {
|
||||
return s.getValue()
|
||||
}
|
||||
if (let i: DataModelInt <- dm) {
|
||||
return i.getValue()
|
||||
}
|
||||
if (let b: DataModelBool <- dm) {
|
||||
return b.getValue()
|
||||
}
|
||||
if (let f: DataModelFloat <- dm) {
|
||||
return f.getValue()
|
||||
}
|
||||
if (let dms: DataModelStruct <- dm) {
|
||||
var map = HashMap<String, Any>()
|
||||
for (field in dms.getFields()) {
|
||||
map[field.getName()] = dataModelToAny(field.getData())
|
||||
}
|
||||
return map
|
||||
}
|
||||
if (let seq: DataModelSeq <- dm) {
|
||||
let list = ArrayList<Any>()
|
||||
for (item in seq.getItems()) {
|
||||
list.add(dataModelToAny(item))
|
||||
}
|
||||
return list.toArray()
|
||||
}
|
||||
""
|
||||
}
|
||||
|
||||
private static func anyToDataModel(v: Any): DataModel {
|
||||
if (let s: String <- v) {
|
||||
return DataModelString(s)
|
||||
}
|
||||
if (let i: Int64 <- v) {
|
||||
return DataModelInt(i)
|
||||
}
|
||||
if (let b: Bool <- v) {
|
||||
return DataModelBool(b)
|
||||
}
|
||||
if (let f: Float64 <- v) {
|
||||
return DataModelFloat(f)
|
||||
}
|
||||
if (let s: ToString <- v) {
|
||||
return DataModelString(s.toString())
|
||||
}
|
||||
DataModelNull()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user