Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The addition of the information center configuration management of the god compass has been added to the dashboard and panel additions and deletions #109

Merged
merged 5 commits into from Dec 15, 2017
Merged

The addition of the information center configuration management of the god compass has been added to the dashboard and panel additions and deletions #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d71629
Merge pull request #2 from uavorg/master
BeliefYou8 Dec 14, 2017
53daf6c
调整代码格式
Dec 14, 2017
e7f6a13
调整代码格式，增加代码对比
Dec 15, 2017
ef53f94
调整js代码格式
Dec 15, 2017
331cd3f
规范js代码格式
Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1,122 changes: 1,040 additions & 82 deletions com.creditease.uav.console/src/main/java/com/creditease/uav/grafana/DashboardManagement.java
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 40 additions & 12 deletions ...ditease/uav/grafana/GrafanaHttpUtils.java → ...creditease/uav/grafana/GrafanaClient.java
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;

import javax.servlet.http.HttpServletRequest;
Expand All @@ -34,12 +35,16 @@
import com.creditease.uav.httpasync.HttpAsyncClientFactory;

@SuppressWarnings("unchecked")
public class GrafanaHttpUtils {
public class GrafanaClient {

private static HttpAsyncClient httpAsyncClient = null;
private static Map<String, String> configMap = new HashMap<String, String>();
private HttpAsyncClient httpAsyncClient = null;
private Map<String, String> configMap = new HashMap<String, String>();

public static void init(HttpServletRequest request) {
GrafanaClient(HttpServletRequest request) {
init(request);
}

public void init(HttpServletRequest request) {

if (configMap.isEmpty()) {
configMap = JSONHelper.toObject(
Expand All @@ -65,13 +70,12 @@ public static void init(HttpServletRequest request) {
* :包含配置信息，请求参数，传递参数，请求类型，请求地址
* @return
*/
public static Future<HttpResponse> doAsyncHttp(String type, String path, String dataStr,
GrafanaHttpCallBack callback) {
public Future<HttpResponse> doAsyncHttp(String type, String path, String dataStr, GrafanaHttpCallBack callback) {

return doAsyncHttp(type, path, dataStr, null, callback);
}

public static Future<HttpResponse> doAsyncHttp(String type, String path, String dataStr, Map<String, String> head,
public Future<HttpResponse> doAsyncHttp(String type, String path, String dataStr, Map<String, String> head,
GrafanaHttpCallBack callback) {

Future<HttpResponse> response = null;
Expand Down Expand Up @@ -109,7 +113,7 @@ else if ("delete".equals(type)) {
return response;
}

public static String getConfigValue(String key) {
public String getConfigValue(String key) {

if (!configMap.containsKey(key)) {
return null;
Expand All @@ -119,17 +123,17 @@ public static String getConfigValue(String key) {

}

private static String getAuthLoginId() {
private String getAuthLoginId() {

return getConfigValue("authorization.loginId");
}

private static String getAuthLoginPwd() {
private String getAuthLoginPwd() {

return getConfigValue("authorization.loginPwd");
}

private static Map<String, String> getHttpReqHead() {
private Map<String, String> getHttpReqHead() {

Map<String, String> header = new HashMap<String, String>();
String authorInfo = getAuthLoginId() + ":" + getAuthLoginPwd();
Expand All @@ -140,10 +144,34 @@ private static Map<String, String> getHttpReqHead() {
return header;
}

private static String getApiHttpReqUrl(String methodPath) {
private String getApiHttpReqUrl(String methodPath) {

return getConfigValue("api.url") + methodPath;

}

public HttpResponse doHttp(String type, String path, String dataStr, GrafanaHttpCallBack callback) {

HttpResponse response = null;
try {
response = doAsyncHttp(type, path, dataStr, null, callback).get();
}
catch (InterruptedException | ExecutionException e) {
}

return response;
}

public HttpResponse doHttp(String type, String path, String dataStr, Map<String, String> head,
GrafanaHttpCallBack callback) {

HttpResponse response = null;
try {
response = doAsyncHttp(type, path, dataStr, head, callback).get();
}
catch (InterruptedException | ExecutionException e) {
}

return response;
}
}