|
|
|
@ -40,7 +40,7 @@ public class ActFmInvoker {
|
|
|
|
|
public static final String PROVIDER_GOOGLE= "google";
|
|
|
|
|
public static final String PROVIDER_PASSWORD = "password";
|
|
|
|
|
|
|
|
|
|
private static final int API_VERSION = 6;
|
|
|
|
|
private static final int API_VERSION = 7;
|
|
|
|
|
|
|
|
|
|
@Autowired private RestClient restClient;
|
|
|
|
|
|
|
|
|
@ -171,7 +171,6 @@ public class ActFmInvoker {
|
|
|
|
|
}
|
|
|
|
|
params.add(new Pair<String, Object>("app_id", APP_ID));
|
|
|
|
|
params.add(new Pair<String, Object>("time", System.currentTimeMillis() / 1000L));
|
|
|
|
|
params.add(new Pair<String, Object>("api", API_VERSION));
|
|
|
|
|
if(token != null) {
|
|
|
|
|
boolean foundTokenKey = false;
|
|
|
|
|
for (Pair<String, Object> curr : params) {
|
|
|
|
@ -203,8 +202,8 @@ public class ActFmInvoker {
|
|
|
|
|
else
|
|
|
|
|
url = "http:" + url;
|
|
|
|
|
|
|
|
|
|
StringBuilder requestBuilder = new StringBuilder(url).append(method).append('?');
|
|
|
|
|
StringBuilder sigBuilder = new StringBuilder();
|
|
|
|
|
StringBuilder requestBuilder = new StringBuilder(url).append(API_VERSION).append("/").append(method).append('?');
|
|
|
|
|
StringBuilder sigBuilder = new StringBuilder(method);
|
|
|
|
|
for(Pair<String, Object> entry : params) {
|
|
|
|
|
if(entry.getRight() == null)
|
|
|
|
|
continue;
|
|
|
|
|