diff --git a/app/config/urlConfig.json b/app/config/urlConfig.json index 0bb379c048..f43726ccc0 100644 --- a/app/config/urlConfig.json +++ b/app/config/urlConfig.json @@ -13,7 +13,9 @@ "chart_socket_url":"", "secure_active_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/active", "secure_refresh_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth" + "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth", + "secure_product_id": "10028", + "secureProductSecret": "6b4c4db8286547b78b1def2d76f70fb3" }, "online": { "och_url": "https://tech.zhidaohulian.com", @@ -28,7 +30,9 @@ "chart_socket_url":"", "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth", + "secure_product_id": "10028", + "secureProductSecret": "6b4c4db8286547b78b1def2d76f70fb3" }, "demo": { "och_url": "http://tech-dev.zhidaohulian.com", @@ -43,7 +47,9 @@ "chart_socket_url":"", "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth", + "secure_product_id": "10028", + "secureProductSecret": "6b4c4db8286547b78b1def2d76f70fb3" } }, "dali": { @@ -60,7 +66,9 @@ "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws", "secure_active_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/active", "secure_refresh_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth" + "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth", + "secure_product_id": "10031", + "secureProductSecret": "bda7164f3e8241848d011dcc710f89db" }, "online": { "och_url": "https://och-driver-eh.zhidaozhixing.com", @@ -75,7 +83,9 @@ "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws", "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth", + "secure_product_id": "10031", + "secureProductSecret": "bda7164f3e8241848d011dcc710f89db" }, "demo": { "och_url": "https://och-a.zhidaozhixing.com", @@ -90,7 +100,9 @@ "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws", "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth", + "secure_product_id": "10031", + "secureProductSecret": "bda7164f3e8241848d011dcc710f89db" } }, "yantai": { @@ -107,7 +119,9 @@ "chart_socket_url":"", "secure_active_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/active", "secure_refresh_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth" + "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth", + "secure_product_id": "10032", + "secureProductSecret": "1514404272484a48b478d082911fcaf9" }, "online": { "och_url": "https://och-driver-yt.zhidaozhixing.com", @@ -122,7 +136,9 @@ "chart_socket_url":"", "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth", + "secure_product_id": "10032", + "secureProductSecret": "1514404272484a48b478d082911fcaf9" }, "demo": { "och_url": "https://och-a.zhidaozhixing.com", @@ -137,7 +153,9 @@ "chart_socket_url":"", "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth", + "secure_product_id": "10032", + "secureProductSecret": "1514404272484a48b478d082911fcaf9" } }, "saas": { @@ -153,7 +171,9 @@ "chart_socket_url":"", "secure_active_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/active", "secure_refresh_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth" + "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth", + "secure_product_id": "10030", + "secureProductSecret": "85dcf995430746f6b1c2d4fe6817ff2e" }, "online": { "och_url": "https://mogogo-driver.zhidaozhixing.com", @@ -167,7 +187,9 @@ "chart_socket_url":"", "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth", + "secure_product_id": "10030", + "secureProductSecret": "85dcf995430746f6b1c2d4fe6817ff2e" }, "demo": { "och_url": "http://tech-dev.zhidaohulian.com", @@ -181,7 +203,9 @@ "chart_socket_url":"", "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", - "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth", + "secure_product_id": "10030", + "secureProductSecret": "85dcf995430746f6b1c2d4fe6817ff2e" } } } diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/secret/PassPortSecret.java b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/secret/PassPortSecret.java index dc6aa73660..61e2af1c17 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/secret/PassPortSecret.java +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/secret/PassPortSecret.java @@ -64,8 +64,8 @@ public class PassPortSecret { .deviceActive(FunctionBuildConfig.urlJson.getSecureActive()) .deviceRefresh(FunctionBuildConfig.urlJson.getSecureRefresh()) .deviceAuth(FunctionBuildConfig.urlJson.getSecureAuth()) - .productId(getProductId()) - .productSecret(getProductSecret()) + .productId(FunctionBuildConfig.urlJson.getSecureProductId()) + .productSecret(FunctionBuildConfig.urlJson.getSecureProductSecret()) .sn(deviceId) .certPath(path).build()); } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt index cc6ddb0f6a..fe31fc4ed4 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt @@ -29,6 +29,10 @@ data class UrlConfig( val secureRefresh: String, @SerializedName("secure_auth_url") val secureAuth: String, + @SerializedName("secure_product_id") + val secureProductId: String, + @SerializedName("secure_product_secret") + val secureProductSecret: String, @SerializedName("heart_beat_interval") val heartBeatInterval: Int