gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、项目名称改为galaxy，并将项目代码中有关gk的目录改为galaxy;

Browse Source 
2、接口返回参数中添加追踪状态码traceCode,用于查看服务处理日志，方便调试与定故障定位；
3、添加项目调试模式(isDebug参数)，调用maat通用接口时，调式携带提交内容，生产过程为空；
This commit is contained in:
zhangdongxu
2018-05-19 11:30:50 +08:00
parent d825c96145
commit 6cb083ebee
32 changed files with 327 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
View File

@@ -118,7 +118,7 @@ public class ConfigSourcesController extends BaseRestController {
}
return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response,
"编译配置数据插入成功" + sb.toString(), configSource);
"编译配置数据插入成功" + sb.toString(), Constants.IS_DEBUG?configSource:null);
}
@RequestMapping(value = "/cfg/v1/configSources", method = RequestMethod.PUT)
@@ -183,7 +183,7 @@ public class ConfigSourcesController extends BaseRestController {
RestBusinessCode.missing_args.getValue());
}
return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response,
"编译配置修改成功" + sb.toString(), configSource);
"编译配置修改成功" + sb.toString(), Constants.IS_DEBUG?configSource:null);
}
@RequestMapping(value = "/cfg/v1/configModifySources", method = RequestMethod.PUT)
@@ -303,7 +303,7 @@ public class ConfigSourcesController extends BaseRestController {
}
return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response,
"修改编译配置数据成功" + sb.toString(), configSource);
"修改编译配置数据成功" + sb.toString(), Constants.IS_DEBUG?configSource:null);
}
private void validateConfigSource(SaveRequestLogThread thread, long start, ConfigSource configSource) {

6
src/main/java/com/nis/web/controller/restful/ConfigTestController.java
View File

@@ -318,7 +318,7 @@ public class ConfigTestController extends BaseRestController {
System.out.println(id);
try {
// String url =
// "http://127.0.0.1:8888/gk/service/cfg/v1/configSources";
// "http://127.0.0.1:8888/galaxy/service/cfg/v1/configSources";
String url = Configurations.getStringProperty("httpUrl", "");
ConfigSourceTest configSource = new ConfigSourceTest();
configSource.setOpTime(new Date());
@@ -392,7 +392,7 @@ public class ConfigTestController extends BaseRestController {
JsonConfig jsonConfig = new JsonConfig();
jsonConfig.registerJsonValueProcessor(Date.class, new JsonDateValueProcessor());
// String url =
// "http://127.0.0.1:8888/gk/service/cfg/v1/configSources";
// "http://127.0.0.1:8888/galaxy/service/cfg/v1/configSources";
String url = Configurations.getStringProperty("httpUrl", "");
JSONArray jsonArray = JSONArray.fromObject(configSource, jsonConfig);
String jsonStr = jsonArray.getString(0);
@@ -533,7 +533,7 @@ public class ConfigTestController extends BaseRestController {
String result = "";
try {
String urlNameString = url + "?" + param;
urlNameString = "http://127.0.0.1:8888/gk/service/log/v1/dfStatLogDailySources?pageNo=1&pageSize=2";
urlNameString = "http://127.0.0.1:8888/galaxy/service/log/v1/dfStatLogDailySources?pageNo=1&pageSize=2";
URL realUrl = new URL(urlNameString);
// 打开和URL之间的连接
URLConnection conn = realUrl.openConnection();