refactor(logger): 日志改用 logrus 全局包级调用,移除 Logger 注入接口
为什么:并入宿主项目后须与宿主日志体系一致——宿主统一用 pkg/logger 初始化 logrus 全局实例并直接 logrus.Xxx 包级调用;包一层 Logger 接口会让 logrus 的 caller 定位(报告调用文件:行号)失准。 改动: - 删除 logger 包(Logger 接口 / Default / SetDefault,默认本就是 logrus.StandardLogger) - 11 个结构体移除 lgr logger.Logger 字段、SetLogger 方法及构造中的 lgr 初始化 - 192 处 lgr.Xxxf 调用改为 logrus.Xxxf,日志消息文本保持不变 - xiaomi.Client 移除 Logger() 访问器,air_conditioner 回读日志去掉判空调用直连 logrus - miot_i18n.go 两处标准库 log.Printf 改为 logrus.Errorf,统一日志出口 - go.mod:logrus 从 indirect 提升为直接依赖 - goimports/goformat 全树规范化:此前部分文件未 gofmt(单行 if、对齐),本次顺带 格式化,纯空白/换行变化,无逻辑改动 验证:go build / go vet / go test ./... 全部通过(bridge、miot、xiaomi、devices、specs)
This commit is contained in:
+38
-38
@@ -248,10 +248,10 @@ func (c *MIoTHttpClient) UpdateHTTPHeader(cloudServer, clientID, accessToken str
|
||||
// Aligns with Python: __api_request_headers property.
|
||||
func (c *MIoTHttpClient) apiRequestHeaders() map[string]string {
|
||||
return map[string]string{
|
||||
"Host": c.host,
|
||||
"Host": c.host,
|
||||
"X-Client-BizId": "haapi",
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": "Bearer" + c.accessToken,
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": "Bearer" + c.accessToken,
|
||||
"X-Client-AppId": c.clientID,
|
||||
}
|
||||
}
|
||||
@@ -514,11 +514,11 @@ func (c *MIoTHttpClient) getDevRoomPage(maxID string) (map[string]map[string]int
|
||||
// Aligns with Python: get_homeinfos_async().
|
||||
func (c *MIoTHttpClient) GetHomeInfos() (map[string]interface{}, error) {
|
||||
resObj, err := c.mihomeAPIPost("/app/v2/homeroom/gethome", map[string]interface{}{
|
||||
"limit": float64(150),
|
||||
"fetch_share": true,
|
||||
"limit": float64(150),
|
||||
"fetch_share": true,
|
||||
"fetch_share_dev": true,
|
||||
"plat_form": float64(0),
|
||||
"app_ver": float64(9),
|
||||
"plat_form": float64(0),
|
||||
"app_ver": float64(9),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -531,7 +531,7 @@ func (c *MIoTHttpClient) GetHomeInfos() (map[string]interface{}, error) {
|
||||
|
||||
var uid string
|
||||
homeInfos := map[string]map[string]interface{}{
|
||||
"homelist": {},
|
||||
"homelist": {},
|
||||
"share_home_list": {},
|
||||
}
|
||||
|
||||
@@ -567,16 +567,16 @@ func (c *MIoTHttpClient) GetHomeInfos() (map[string]interface{}, error) {
|
||||
}
|
||||
|
||||
homeInfos[deviceSource][hid] = map[string]interface{}{
|
||||
"home_id": hid,
|
||||
"home_name": h["name"],
|
||||
"city_id": h["city_id"],
|
||||
"longitude": h["longitude"],
|
||||
"latitude": h["latitude"],
|
||||
"address": h["address"],
|
||||
"dids": toStringSlice(h["dids"]),
|
||||
"room_info": roomInfo,
|
||||
"group_id": CalcGroupID(huid, hid),
|
||||
"uid": huid,
|
||||
"home_id": hid,
|
||||
"home_name": h["name"],
|
||||
"city_id": h["city_id"],
|
||||
"longitude": h["longitude"],
|
||||
"latitude": h["latitude"],
|
||||
"address": h["address"],
|
||||
"dids": toStringSlice(h["dids"]),
|
||||
"room_info": roomInfo,
|
||||
"group_id": CalcGroupID(huid, hid),
|
||||
"uid": huid,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -701,26 +701,26 @@ func (c *MIoTHttpClient) getDeviceListPage(dids []string, startDID string) (map[
|
||||
}
|
||||
|
||||
deviceInfos[did] = map[string]interface{}{
|
||||
"did": did,
|
||||
"uid": device["uid"],
|
||||
"name": name,
|
||||
"urn": urn,
|
||||
"model": model,
|
||||
"connect_type": device["pid"],
|
||||
"token": device["token"],
|
||||
"online": device["isOnline"],
|
||||
"icon": device["icon"],
|
||||
"parent_id": device["parent_id"],
|
||||
"manufacturer": strings.Split(model, ".")[0],
|
||||
"voice_ctrl": device["voice_ctrl"],
|
||||
"rssi": device["rssi"],
|
||||
"owner": device["owner"],
|
||||
"pid": device["pid"],
|
||||
"local_ip": device["local_ip"],
|
||||
"ssid": device["ssid"],
|
||||
"bssid": device["bssid"],
|
||||
"order_time": device["orderTime"],
|
||||
"fw_version": fwVersion,
|
||||
"did": did,
|
||||
"uid": device["uid"],
|
||||
"name": name,
|
||||
"urn": urn,
|
||||
"model": model,
|
||||
"connect_type": device["pid"],
|
||||
"token": device["token"],
|
||||
"online": device["isOnline"],
|
||||
"icon": device["icon"],
|
||||
"parent_id": device["parent_id"],
|
||||
"manufacturer": strings.Split(model, ".")[0],
|
||||
"voice_ctrl": device["voice_ctrl"],
|
||||
"rssi": device["rssi"],
|
||||
"owner": device["owner"],
|
||||
"pid": device["pid"],
|
||||
"local_ip": device["local_ip"],
|
||||
"ssid": device["ssid"],
|
||||
"bssid": device["bssid"],
|
||||
"order_time": device["orderTime"],
|
||||
"fw_version": fwVersion,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user