diff --git a/conf/system/emoneyRequest.json b/conf/system/emoneyRequest.json index 1c99631..6c7880f 100644 --- a/conf/system/emoneyRequest.json +++ b/conf/system/emoneyRequest.json @@ -1,5 +1,5 @@ { - "isAnonymous" : false, + "isAnonymous" : true, "username" : "emy1730978", "password" : "ubVa0vNmD+JJC4171eLYUw==", "authorization" : "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImN0eSI6IkpXVCJ9.eyJ1dWQiOjEwMTQ2MDA5MDcsInVpZCI6Mjg1ODMyMzcsImRpZCI6IjhlMjRiN2U0NjM0NTRlNWE2ODNhODE0ZGRkZDU4MGZkIiwidHlwIjo0LCJhY2MiOiI4ZTI0YjdlNDYzNDU0ZTVhNjgzYTgxNGRkZGQ1ODBmZCIsInN3dCI6MSwibGd0IjoxNzQ2ODgyODc4MTc2LCJuYmYiOjE3NDY4ODI4NzgsImV4cCI6MTc0ODYxMDg3OCwiaWF0IjoxNzQ2ODgyODc4fQ.YDG61MPnRypUC1HDGoRRzTtcx_J_tnAqM6XowXT7Jzk", @@ -14,21 +14,5 @@ "buildId" : "SKQ1.221119.001", "chromeVersion" : "116.0.5845.163", "emoneyVersion" : "5.8.1", - "emappViewMode" : "1", - "usernamePasswordLoginObject" : { - "appVersion" : "5.8.1", - "productId" : 4, - "softwareType" : "Mobile", - "deviceName" : "CPH2487", - "ssid" : "0", - "platform" : "android", - "exIdentify" : "{\"IMEI\":\"\",\"AndroidID\":\"7c135cebb4c94177\",\"MAC\":\"\",\"OSFingerPrint\":\"OnePlus\\/CPH2487\\/OP5961L1:13\\/SKQ1.221119.001\\/T.R4T3.1057738-62b8-3b9:user\\/release-keys\"}", - "osVersion" : "33", - "accId" : "emy1730978", - "guid" : "8e24b7e463454e5a683a814dddd580fd", - "accType" : 1, - "pwd" : "ubVa0vNmD+JJC4171eLYUw==", - "channelId" : "1711", - "hardware" : "b2c3c02fc9b068beb3ee3d88855e9426" - } + "emappViewMode" : "1" } \ No newline at end of file diff --git a/src/main/java/quant/rich/emoney/entity/config/EmoneyRequestConfig.java b/src/main/java/quant/rich/emoney/entity/config/EmoneyRequestConfig.java index ff2856d..a5b942e 100644 --- a/src/main/java/quant/rich/emoney/entity/config/EmoneyRequestConfig.java +++ b/src/main/java/quant/rich/emoney/entity/config/EmoneyRequestConfig.java @@ -1,6 +1,5 @@ package quant.rich.emoney.entity.config; -import java.net.Proxy; import java.time.LocalDateTime; import java.util.Objects; @@ -26,11 +25,11 @@ import lombok.extern.slf4j.Slf4j; import quant.rich.emoney.entity.config.DeviceInfoConfig.DeviceInfo; import quant.rich.emoney.interfaces.ConfigInfo; import quant.rich.emoney.interfaces.IConfig; -import quant.rich.emoney.interfaces.ValidEmoneyRequestConfig; import quant.rich.emoney.patch.okhttp.PatchOkHttp; import quant.rich.emoney.util.EncryptUtils; import quant.rich.emoney.util.SpringContextHolder; import quant.rich.emoney.util.TextUtils; +import quant.rich.emoney.validator.EmoneyRequestConfigValid; /** * 用于配置请求时的请求行为,一般而言,请求头与安卓系统的信息有关(build.prop) @@ -42,7 +41,7 @@ import quant.rich.emoney.util.TextUtils; @Data @Accessors(chain = true) @Slf4j -@ValidEmoneyRequestConfig +@EmoneyRequestConfigValid @ConfigInfo(field = "emoneyRequest", name = "益盟请求设置", initDefault = true) public class EmoneyRequestConfig implements IConfig { @@ -384,6 +383,7 @@ public class EmoneyRequestConfig implements IConfig { * 根据本例信息(包括保存的用户名和密码)生成一个用于登录的 ObjectNode * @return */ + @JsonIgnore public ObjectNode getUsernamePasswordLoginObject() { return getUsernamePasswordLoginObject(username, password); }