From 6cb083ebeee88dfa8a43642986b533940edd7cd4 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Sat, 19 May 2018 11:30:50 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=94=B9=E4=B8=BAgalaxy=EF=BC=8C=E5=B9=B6=E5=B0=86=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BB=A3=E7=A0=81=E4=B8=AD=E6=9C=89=E5=85=B3gk?= =?UTF-8?q?=E7=9A=84=E7=9B=AE=E5=BD=95=E6=94=B9=E4=B8=BAgalaxy;=202?= =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E8=BF=BD=E8=B8=AA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=A0=81traceCode,=E7=94=A8=E4=BA=8E=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=A4=84=E7=90=86=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E8=B0=83=E8=AF=95=E4=B8=8E=E5=AE=9A=E6=95=85?= =?UTF-8?q?=E9=9A=9C=E5=AE=9A=E4=BD=8D=EF=BC=9B=203=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E8=B0=83=E8=AF=95=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?(isDebug=E5=8F=82=E6=95=B0)=EF=BC=8C=E8=B0=83=E7=94=A8maat?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3=E6=97=B6=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E5=BC=8F=E6=90=BA=E5=B8=A6=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .project | 6 +- .settings/org.eclipse.wst.common.component | 6 +- pom.xml | 4 +- .../com/nis/domain/ServicesRequestLog.java | 7 + .../restful/DefaultRestErrorConverter.java | 3 +- .../nis/restful/DefaultRestErrorResolver.java | 1 + .../restful/DefaultRestSuccessConverter.java | 3 +- .../java/com/nis/restful/RestConstants.java | 2 + src/main/java/com/nis/restful/RestResult.java | 16 +- .../com/nis/restful/RestServiceException.java | 12 +- .../java/com/nis/restful/SwaggerConfig.java | 2 +- src/main/java/com/nis/util/Constants.java | 5 + .../web/controller/BaseRestController.java | 9 +- .../restful/ConfigSourcesController.java | 6 +- .../restful/ConfigTestController.java | 6 +- .../com/nis/web/dao/ServicesRequestLogDao.xml | 9 +- .../nis/web/service/SaveRequestLogThread.java | 10 +- .../service/ServicesRequestLogService.java | 3 +- src/main/resources/jdbc.properties | 8 +- src/main/resources/nis.properties | 7 +- src/main/webapp/WEB-INF/web.xml | 386 ++++++++---------- src/main/webapp/swagger/index.html | 6 +- .../page/dataDict/addOrUpdateDataDict.jsp | 12 +- .../test/page/dataDict/allDataDictName.jsp | 8 +- .../test/page/dataDict/allDataDictVal.jsp | 8 +- src/main/webapp/test/page/findAndSave.jsp | 10 +- .../webapp/test/page/log/gkConstantly.jsp | 26 +- src/main/webapp/test/page/log/gkLog.jsp | 28 +- .../webapp/test/page/log/jcConstantly.jsp | 28 +- .../webapp/test/page/serviceLog/getAllLog.jsp | 6 +- .../test/page/serviceLog/getLogInfo.jsp | 4 +- src/test/java/com/nis/test/RestfulTest.java | 2 +- 32 files changed, 327 insertions(+), 322 deletions(-) diff --git a/.project b/.project index e4f82a8..a0f2464 100644 --- a/.project +++ b/.project @@ -1,15 +1,15 @@ - maat_service + galaxy - + org.eclipse.jdt.core.javabuilder diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index fa4931f..7350c94 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,12 +1,12 @@ - + - - + + diff --git a/pom.xml b/pom.xml index cffb483..89a2b00 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 war - maat_service + galaxy com.nis.springmvc - maat_service + galaxy 0.0.1-SNAPSHOT diff --git a/src/main/java/com/nis/domain/ServicesRequestLog.java b/src/main/java/com/nis/domain/ServicesRequestLog.java index cb08743..7f8a4a8 100644 --- a/src/main/java/com/nis/domain/ServicesRequestLog.java +++ b/src/main/java/com/nis/domain/ServicesRequestLog.java @@ -41,6 +41,7 @@ public class ServicesRequestLog implements Serializable { private Integer businessCode; private String exceptionInfo; private String serverIp; + private String traceCode; /** * serverIp @@ -216,5 +217,11 @@ public class ServicesRequestLog implements Serializable { public void setExceptionInfo(String exceptionInfo) { this.exceptionInfo = exceptionInfo; } + public String getTraceCode() { + return traceCode; + } + public void setTraceCode(String traceCode) { + this.traceCode = traceCode; + } } diff --git a/src/main/java/com/nis/restful/DefaultRestErrorConverter.java b/src/main/java/com/nis/restful/DefaultRestErrorConverter.java index 9a7f272..4c939d3 100644 --- a/src/main/java/com/nis/restful/DefaultRestErrorConverter.java +++ b/src/main/java/com/nis/restful/DefaultRestErrorConverter.java @@ -24,6 +24,7 @@ public class DefaultRestErrorConverter implements RestConverter { errorMap.put(RestConstants.REST_SERVICE_REASON, re.getBusinessCode() .getErrorReason()); errorMap.put(RestConstants.REST_SERVICE_MSG, re.getMsg()); + errorMap.put(RestConstants.TRACE_CODE, re.getTraceCode()); errorMap.put(RestConstants.REST_SERVICE_URI, re.getFromUri()); if(re.getActiveSys() != null){ @@ -32,7 +33,7 @@ public class DefaultRestErrorConverter implements RestConverter { if(re.getLogSource() != null){ errorMap.put(RestConstants.REST_SERVICE_LOG_SOURCE, re.getLogSource()); } - + return errorMap; } diff --git a/src/main/java/com/nis/restful/DefaultRestErrorResolver.java b/src/main/java/com/nis/restful/DefaultRestErrorResolver.java index 14dcadd..d3fda62 100644 --- a/src/main/java/com/nis/restful/DefaultRestErrorResolver.java +++ b/src/main/java/com/nis/restful/DefaultRestErrorResolver.java @@ -63,6 +63,7 @@ public class DefaultRestErrorResolver implements RestErrorResolver,InitializingB }else { error.setFromUri("unknow url"); } + error.setTraceCode(((RestServiceException) ex).getTraceCode()); return error; } diff --git a/src/main/java/com/nis/restful/DefaultRestSuccessConverter.java b/src/main/java/com/nis/restful/DefaultRestSuccessConverter.java index 0f97067..5c9c3ad 100644 --- a/src/main/java/com/nis/restful/DefaultRestSuccessConverter.java +++ b/src/main/java/com/nis/restful/DefaultRestSuccessConverter.java @@ -36,8 +36,9 @@ public class DefaultRestSuccessConverter implements RestConverter { successMap.put(RestConstants.REST_SERVICE_REASON, re.getBusinessCode() .getErrorReason()); successMap.put(RestConstants.REST_SERVICE_MSG, re.getMsg()); + successMap.put(RestConstants.TRACE_CODE, re.getTraceCode()); successMap.put(RestConstants.REST_SERVICE_URI, re.getFromUri()); - + return successMap; } diff --git a/src/main/java/com/nis/restful/RestConstants.java b/src/main/java/com/nis/restful/RestConstants.java index 931c50e..6b62d5c 100644 --- a/src/main/java/com/nis/restful/RestConstants.java +++ b/src/main/java/com/nis/restful/RestConstants.java @@ -21,6 +21,8 @@ public class RestConstants { public static final String REST_SERVICE_LOG_SOURCE = "logSource"; + public static final String TRACE_CODE = "traceCode"; + //暂时4个 /** diff --git a/src/main/java/com/nis/restful/RestResult.java b/src/main/java/com/nis/restful/RestResult.java index ef15d74..d921f83 100644 --- a/src/main/java/com/nis/restful/RestResult.java +++ b/src/main/java/com/nis/restful/RestResult.java @@ -50,11 +50,16 @@ public class RestResult { */ private String logSource; + /** + * 追踪状态码 + */ + private String traceCode; + public RestResult(){ } - public RestResult(HttpStatus status, RestBusinessCode businessCode, String msg,String fromUri,String activeSys,String fromSign) { + public RestResult(HttpStatus status, RestBusinessCode businessCode, String msg,String fromUri,String activeSys,String fromSign,String traceCode) { super(); this.status = status; this.businessCode = businessCode; @@ -62,6 +67,7 @@ public class RestResult { this.fromUri = fromUri; this.activeSys=activeSys; this.logSource=logSource; + this.traceCode=traceCode; } @@ -152,6 +158,14 @@ public class RestResult { this.data = data; } + public String getTraceCode() { + return traceCode; + } + + public void setTraceCode(String traceCode) { + this.traceCode = traceCode; + } + public String toString() { return new StringBuilder().append("HttpStatus:").append(getStatus().value()) .append(" errorcode:") diff --git a/src/main/java/com/nis/restful/RestServiceException.java b/src/main/java/com/nis/restful/RestServiceException.java index 49b7242..410791a 100644 --- a/src/main/java/com/nis/restful/RestServiceException.java +++ b/src/main/java/com/nis/restful/RestServiceException.java @@ -12,6 +12,7 @@ public class RestServiceException extends RuntimeException{ private String activeSys; + private String traceCode; /** * */ @@ -29,6 +30,7 @@ public class RestServiceException extends RuntimeException{ public RestServiceException(SaveRequestLogThread thread,long time,String message) { super(message); this.errorCode = 998; //未知错误 + this.traceCode = thread.getTraceCode(); thread.setConsumerTime(time); thread.setBusinessCode(this.getErrorCode()); if(StringUtils.isEmpty(thread.getExceptionInfo())) @@ -43,6 +45,7 @@ public class RestServiceException extends RuntimeException{ public RestServiceException(SaveRequestLogThread thread,long time,String message,int errorCode) { super(message); this.errorCode = errorCode; + this.traceCode = thread.getTraceCode(); thread.setConsumerTime(time); thread.setBusinessCode(this.getErrorCode()); if(StringUtils.isEmpty(thread.getExceptionInfo())) @@ -71,6 +74,13 @@ public class RestServiceException extends RuntimeException{ public void setActiveSys(String activeSys) { this.activeSys = activeSys; } - + public String getTraceCode() { + return traceCode; + } + + public void setTraceCode(String traceCode) { + this.traceCode = traceCode; + } + } diff --git a/src/main/java/com/nis/restful/SwaggerConfig.java b/src/main/java/com/nis/restful/SwaggerConfig.java index 8a87e6e..b2220ca 100644 --- a/src/main/java/com/nis/restful/SwaggerConfig.java +++ b/src/main/java/com/nis/restful/SwaggerConfig.java @@ -58,7 +58,7 @@ public class SwaggerConfig { "V1.0", "doufenghu@iie.ac.cn", "My Apps API Licence Type", - "http://127.0.0.1:8080/gk/swagger/"); + "http://127.0.0.1:8080/galaxy/swagger/"); return apiInfo; } } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index b29574d..b48fdab 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -143,6 +143,11 @@ public final class Constants { * 是否开启业务校验 */ public static final boolean SERVICE_VALIDATE = Configurations.getBooleanProperty("serviceValidate", true); + + /** + * 是否开启Debug模式 + */ + public static final boolean IS_DEBUG = Configurations.getBooleanProperty("isDebug", true); /** * 日志本地存储时间 */ diff --git a/src/main/java/com/nis/web/controller/BaseRestController.java b/src/main/java/com/nis/web/controller/BaseRestController.java index d2b43a6..93a6f55 100644 --- a/src/main/java/com/nis/web/controller/BaseRestController.java +++ b/src/main/java/com/nis/web/controller/BaseRestController.java @@ -9,6 +9,7 @@ package com.nis.web.controller; import java.beans.PropertyEditorSupport; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; @@ -42,7 +43,7 @@ import com.nis.web.service.ServicesRequestLogService; */ public class BaseRestController { protected final Logger logger = Logger.getLogger(this.getClass()); - + private SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHssSSS"); /** * * @Title: serviceResponse @@ -81,6 +82,7 @@ public class BaseRestController { } restResult.setFromUri(request.getRequestURI()); restResult.setMsg(msg); + restResult.setTraceCode(thread.getTraceCode()); thread.setConsumerTime(time); thread.setBusinessCode(restResult.getBusinessCode().getValue()); new Thread(thread).start(); @@ -127,6 +129,7 @@ public class BaseRestController { restResult.setFromUri(request.getRequestURI()); restResult.setData(data); restResult.setMsg(msg); + restResult.setTraceCode(thread.getTraceCode()); thread.setConsumerTime(time); thread.setBusinessCode(restResult.getBusinessCode().getValue()); new Thread(thread).start(); @@ -208,6 +211,7 @@ public class BaseRestController { restResult.setFromUri(request.getRequestURI()); restResult.setData(data); restResult.setMsg(msg); + restResult.setTraceCode(thread.getTraceCode()); thread.setConsumerTime(time); thread.setExceptionInfo(msg); thread.setBusinessCode(restResult.getBusinessCode().getValue()); @@ -238,6 +242,7 @@ public class BaseRestController { restResult.setMsg(msg); restResult.setActiveSys(activeSys); restResult.setLogSource(logSource); + restResult.setTraceCode(thread.getTraceCode()); thread.setConsumerTime(time); thread.setBusinessCode(restResult.getBusinessCode().getValue()); new Thread(thread).start(); @@ -257,6 +262,7 @@ public class BaseRestController { if (re.getLogSource() != null) { successMap.put(RestConstants.REST_SERVICE_LOG_SOURCE, re.getLogSource()); } + successMap.put(RestConstants.TRACE_CODE, re.getTraceCode()); successMap.put(RestConstants.REST_SERVICE_DATA, re.getData()); logger.info("结果集处理结束----" + System.currentTimeMillis()); return successMap; @@ -352,6 +358,7 @@ public class BaseRestController { SaveRequestLogThread thread = SaveRequestLogThread.getNewSaveRequestLogThread(request); thread.setService(service); thread.setOpAction(opAction); + thread.setTraceCode(sdf.format(new Date())+(Math.round((Math.random()*9+1)*10000)+"")); if (data != null && ConfigCommonSource.class.isAssignableFrom(data.getClass())) { ConfigCommonSource source = (ConfigCommonSource) data; thread.setOperator(source.getOperator()); diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index 51c346f..0287c6e 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java @@ -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) { diff --git a/src/main/java/com/nis/web/controller/restful/ConfigTestController.java b/src/main/java/com/nis/web/controller/restful/ConfigTestController.java index 14fa9a8..8f860d9 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigTestController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigTestController.java @@ -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(); diff --git a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml index b95909e..6aa5320 100644 --- a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml +++ b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml @@ -14,11 +14,12 @@ + ID, OPERATOR, VERSION, OPACTION,OPTIME, REQUEST_CONTENT, REQUEST_TIME,REQUEST_IP, - CONSUMER_TIME,BUSINESS_CODE,EXCEPTION_INFO,SERVER_IP + CONSUMER_TIME,BUSINESS_CODE,EXCEPTION_INFO,SERVER_IP,TRACE_CODE
diff --git a/src/main/webapp/test/page/dataDict/addOrUpdateDataDict.jsp b/src/main/webapp/test/page/dataDict/addOrUpdateDataDict.jsp index ffd64b5..f33dfc8 100644 --- a/src/main/webapp/test/page/dataDict/addOrUpdateDataDict.jsp +++ b/src/main/webapp/test/page/dataDict/addOrUpdateDataDict.jsp @@ -30,7 +30,7 @@ function setDict() { $.ajax({ type : 'post', - url : '/gk/service/cfg/v1/getDict', + url : '/galaxy/service/cfg/v1/getDict', data : "dictValId=" +<%=dictValId%> , async : false, success : function(data, textStatus) { @@ -48,7 +48,7 @@ function setDictName() { $.ajax({ type : 'get', - url : '/gk/service/cfg/v1/getAllDictName', + url : '/galaxy/service/cfg/v1/getAllDictName', async : false, success : function(data, textStatus) { var option = ""; @@ -96,9 +96,9 @@ var dataDictId = $("#dataDictId").val(); var addOrUpdate=$("#addOrUpdate").val(); var data = ""; - var url = '/gk/service/cfg/v1/addDictName'; + var url = '/galaxy/service/cfg/v1/addDictName'; if (addOrUpdate == "update") { - url = '/gk/service/cfg/v1/updateDictName'; + url = '/galaxy/service/cfg/v1/updateDictName'; data = "dictId=" + $("#dictId").val() + "&dictVal=" + dictVal; } else { data = "dataDictId=" + dataDictId + "&addDictName=" + addDictName @@ -130,7 +130,7 @@ function setDataDictEffective(){ $.ajax({ type : 'post', - url : '/gk/service/cfg/v1/setDataDictEffective', + url : '/galaxy/service/cfg/v1/setDataDictEffective', dataType : 'json', async : false, success : function(data, textStatus) { @@ -159,7 +159,7 @@
-
0) { @@ -57,7 +57,7 @@ $ .ajax({ type : 'get', - url : '/gk/service/cfg/v1/getAllDictName', + url : '/galaxy/service/cfg/v1/getAllDictName', async : false, success : function(data, textStatus) { if (data.data.length > 0) { @@ -192,7 +192,7 @@ function delForAjax(id) { $.ajax({ type : 'post', - url : '/gk/service/cfg/v1/delDictName', + url : '/galaxy/service/cfg/v1/delDictName', data : { "dictNameId" : id }, @@ -234,7 +234,7 @@ function setDataDictEffective(){ $.ajax({ type : 'post', - url : '/gk/service/cfg/v1/setDataDictEffective', + url : '/galaxy/service/cfg/v1/setDataDictEffective', dataType : 'json', async : false, success : function(data, textStatus) { diff --git a/src/main/webapp/test/page/dataDict/allDataDictVal.jsp b/src/main/webapp/test/page/dataDict/allDataDictVal.jsp index 99f0894..f5570a6 100644 --- a/src/main/webapp/test/page/dataDict/allDataDictVal.jsp +++ b/src/main/webapp/test/page/dataDict/allDataDictVal.jsp @@ -36,7 +36,7 @@ function getAllDictName() { $.ajax({ type : 'get', - url : '/gk/service/cfg/v1/getAllDictName', + url : '/galaxy/service/cfg/v1/getAllDictName', async : false, success : function(data, textStatus) { if (data.data.length > 0) { @@ -58,7 +58,7 @@ $ .ajax({ type : 'post', - url : '/gk/service/cfg/v1/findAllDataDict', + url : '/galaxy/service/cfg/v1/findAllDataDict', data : $("#form2").serialize(), //dataType : 'json', async : false, @@ -195,7 +195,7 @@ function delForAjax(id) { $.ajax({ type : 'post', - url : '/gk/service/cfg/v1/delDictVal', + url : '/galaxy/service/cfg/v1/delDictVal', data : { "dictValId" : id }, @@ -237,7 +237,7 @@ function setDataDictEffective(){ $.ajax({ type : 'post', - url : '/gk/service/cfg/v1/setDataDictEffective', + url : '/galaxy/service/cfg/v1/setDataDictEffective', dataType : 'json', async : false, success : function(data, textStatus) { diff --git a/src/main/webapp/test/page/findAndSave.jsp b/src/main/webapp/test/page/findAndSave.jsp index 73d738c..0c0edcb 100644 --- a/src/main/webapp/test/page/findAndSave.jsp +++ b/src/main/webapp/test/page/findAndSave.jsp @@ -67,7 +67,7 @@ $ .ajax({ type : 'post', - url : '/gk/service/cfg/v1/findCompile', + url : '/galaxy/service/cfg/v1/findCompile', data : $("#form2").serialize(), //dataType : 'json', async : false, @@ -230,7 +230,7 @@ alert("请先选择数据在插入"); return; } - url = '/gk/service/cfg/v1/saveByQuery'; + url = '/galaxy/service/cfg/v1/saveByQuery'; $.ajax({ type : 'post', url : url, @@ -239,7 +239,7 @@ async : true, success : function(data, textStatus) { if (data == 'ok') { - alert("插入成功,请去gk_pz数据库中查询相应数据"); + alert("插入成功,请去galaxy_pz数据库中查询相应数据"); } else { alert("插入失败"); } @@ -248,7 +248,7 @@ }); } else if (obj == 'all') { - url = '/gk/service/cfg/v1/saveAllByQuery'; + url = '/galaxy/service/cfg/v1/saveAllByQuery'; $.ajax({ type : 'post', url : url, @@ -257,7 +257,7 @@ async : true, success : function(data, textStatus) { if (data == 'ok') { - alert("插入成功,请去gk_pz数据库中查询相应数据"); + alert("插入成功,请去galaxy_pz数据库中查询相应数据"); } else { alert("插入失败"); } diff --git a/src/main/webapp/test/page/log/gkConstantly.jsp b/src/main/webapp/test/page/log/gkConstantly.jsp index 6ba36f3..34668a4 100644 --- a/src/main/webapp/test/page/log/gkConstantly.jsp +++ b/src/main/webapp/test/page/log/gkConstantly.jsp @@ -643,7 +643,7 @@ var objVal = $(obj).val(); if (objVal == '1') { - $("#urlAddr").val("/gk/service/log/v1/dfJitFlSrcReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/dfJitFlSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -663,7 +663,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '2') { - $("#urlAddr").val("/gk/service/log/v1/dfJitFlDestReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/dfJitFlDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -682,7 +682,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '3') { - $("#urlAddr").val("/gk/service/log/v1/dfJitAffairSrcReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/dfJitAffairSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -702,7 +702,7 @@ } else if (objVal == '4') { $("#urlAddr") - .val("/gk/service/log/v1/dfJitAffairDestReportSources"); + .val("/galaxy/service/log/v1/dfJitAffairDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -722,7 +722,7 @@ } else if (objVal == '5') { $("#urlAddr") - .val("/gk/service/log/v1/dfJitMissionSrcReportSources"); + .val("/galaxy/service/log/v1/dfJitMissionSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -741,7 +741,7 @@ } else if (objVal == '6') { $("#urlAddr").val( - "/gk/service/log/v1/dfJitMissionDestReportSources"); + "/galaxy/service/log/v1/dfJitMissionDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -759,7 +759,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '7') { $("#urlAddr").val( - "/gk/service/log/v1/dfJitGuaranteeSrcReportSources"); + "/galaxy/service/log/v1/dfJitGuaranteeSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -778,7 +778,7 @@ } else if (objVal == '8') { $("#urlAddr").val( - "/gk/service/log/v1/dfJitGuaranteeDestReportSources"); + "/galaxy/service/log/v1/dfJitGuaranteeDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -796,7 +796,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '9') { - $("#urlAddr").val("/gk/service/log/v1/dfJitTagSrcReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/dfJitTagSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -813,7 +813,7 @@ $("#ipProvince").text("源IP所属省"); $("#ipCity").text("源IP所属市"); } else if (objVal == '10') { - $("#urlAddr").val("/gk/service/log/v1/dfJitTagDestReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/dfJitTagDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -831,7 +831,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '11') { - $("#urlAddr").val("/gk/service/log/v1/dfJitIdSrcReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/dfJitIdSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -849,7 +849,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '12') { - $("#urlAddr").val("/gk/service/log/v1/dfJitIdDestReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/dfJitIdDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -949,7 +949,7 @@ diff --git a/src/main/webapp/test/page/log/gkLog.jsp b/src/main/webapp/test/page/log/gkLog.jsp index 10fadb3..cc13f9b 100644 --- a/src/main/webapp/test/page/log/gkLog.jsp +++ b/src/main/webapp/test/page/log/gkLog.jsp @@ -722,7 +722,7 @@ var objVal = $(obj).val(); if (objVal == '1') { - $("#urlAddr").val("/gk/service/log/v1/dfIpPortLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfIpPortLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -742,7 +742,7 @@ //$("#ipCity").text("源IP所属市"); } else if (objVal == '2') { - $("#urlAddr").val("/gk/service/log/v1/dfHttpReqLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfHttpReqLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -761,7 +761,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '3') { - $("#urlAddr").val("/gk/service/log/v1/dfHttpResLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfHttpResLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -780,7 +780,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '4') { - $("#urlAddr").val("/gk/service/log/v1/dfHttpKeywordLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfHttpKeywordLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -799,7 +799,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '5') { - $("#urlAddr").val("/gk/service/log/v1/dfMailLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfMailLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -817,7 +817,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '6') { - $("#urlAddr").val("/gk/service/log/v1/dfDnsLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfDnsLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -834,7 +834,7 @@ $("#ipProvince").text("目的IP所属省"); $("#ipCity").text("目的IP所属市"); } else if (objVal == '7') { - $("#urlAddr").val("/gk/service/log/v1/dfFtpLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfFtpLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -852,7 +852,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '8') { - $("#urlAddr").val("/gk/service/log/v1/dfPPTPLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfPPTPLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -870,7 +870,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '9') { - $("#urlAddr").val("/gk/service/log/v1/dfL2tpLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfL2tpLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -887,7 +887,7 @@ $("#ipProvince").text("源IP所属省"); $("#ipCity").text("源IP所属市"); } else if (objVal == '10') { - $("#urlAddr").val("/gk/service/log/v1/dfIpsecLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfIpsecLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -905,7 +905,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '11') { - $("#urlAddr").val("/gk/service/log/v1/dfOpenVpnLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfOpenVpnLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -923,7 +923,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '12') { - $("#urlAddr").val("/gk/service/log/v1/dfSSHLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfSSHLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -941,7 +941,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '13') { - $("#urlAddr").val("/gk/service/log/v1/dfSSLLogs"); + $("#urlAddr").val("/galaxy/service/log/v1/dfSSLLogs"); var cl1 = ' '; $("#cl1").html(cl1); @@ -1041,7 +1041,7 @@ diff --git a/src/main/webapp/test/page/log/jcConstantly.jsp b/src/main/webapp/test/page/log/jcConstantly.jsp index 0d9a66a..52117ca 100644 --- a/src/main/webapp/test/page/log/jcConstantly.jsp +++ b/src/main/webapp/test/page/log/jcConstantly.jsp @@ -678,7 +678,7 @@ $("#th2").show(); var objVal = $(obj).val(); if (objVal == '1') { - $("#urlAddr").val("/gk/service/log/v1/djJitFlSrcReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/djJitFlSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -697,7 +697,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '2') { - $("#urlAddr").val("/gk/service/log/v1/djJitFlDestReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/djJitFlDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -716,7 +716,7 @@ } else if (objVal == '3') { - $("#urlAddr").val("/gk/service/log/v1/djJitAffairSrcReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/djJitAffairSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -735,7 +735,7 @@ } else if (objVal == '4') { $("#urlAddr") - .val("/gk/service/log/v1/djJitAffairDestReportSources"); + .val("/galaxy/service/log/v1/djJitAffairDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -754,7 +754,7 @@ } else if (objVal == '5') { $("#urlAddr") - .val("/gk/service/log/v1/djJitMissionSrcReportSources"); + .val("/galaxy/service/log/v1/djJitMissionSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -773,7 +773,7 @@ } else if (objVal == '6') { $("#urlAddr").val( - "/gk/service/log/v1/djJitMissionDestReportSources"); + "/galaxy/service/log/v1/djJitMissionDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -792,7 +792,7 @@ } else if (objVal == '7') { $("#urlAddr").val( - "/gk/service/log/v1/djJitGuaranteeSrcReportSources"); + "/galaxy/service/log/v1/djJitGuaranteeSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -811,7 +811,7 @@ } else if (objVal == '8') { $("#urlAddr").val( - "/gk/service/log/v1/djJitGuaranteeDestReportSources"); + "/galaxy/service/log/v1/djJitGuaranteeDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -829,7 +829,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '9') { - $("#urlAddr").val("/gk/service/log/v1/djJitTagSrcReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/djJitTagSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -847,7 +847,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '10') { - $("#urlAddr").val("/gk/service/log/v1/djJitTagDestReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/djJitTagDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -865,7 +865,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '11') { - $("#urlAddr").val("/gk/service/log/v1/djJitIdSrcReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/djJitIdSrcReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -883,7 +883,7 @@ $("#ipCity").text("源IP所属市"); } else if (objVal == '12') { - $("#urlAddr").val("/gk/service/log/v1/djJitIdDestReportSources"); + $("#urlAddr").val("/galaxy/service/log/v1/djJitIdDestReportSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -901,7 +901,7 @@ $("#ipCity").text("目的IP所属市"); } else if (objVal == '13') { - $("#urlAddr").val("/gk/service/log/v1/djCkStatLogSources"); + $("#urlAddr").val("/galaxy/service/log/v1/djCkStatLogSources"); var cl1 = ' '; $("#cl1").html(cl1); @@ -1003,7 +1003,7 @@ diff --git a/src/main/webapp/test/page/serviceLog/getAllLog.jsp b/src/main/webapp/test/page/serviceLog/getAllLog.jsp index 8a28aa9..89f5c28 100644 --- a/src/main/webapp/test/page/serviceLog/getAllLog.jsp +++ b/src/main/webapp/test/page/serviceLog/getAllLog.jsp @@ -51,7 +51,7 @@ $ .ajax({ type : 'post', - url : '/gk/service/log/v1/getAllLog', + url : '/galaxy/service/log/v1/getAllLog', data : $("#form2").serialize(), //dataType : 'json', async : false, @@ -254,7 +254,7 @@ alert("请先选择数据在删除"); return; } - url = '/gk/service/log/v1/deleteById'; + url = '/galaxy/service/log/v1/deleteById'; $.ajax({ type : 'get', url : url, @@ -272,7 +272,7 @@ }); } else if (obj == 'all') { - url = '/gk/service/log/v1/deleteAll'; + url = '/galaxy/service/log/v1/deleteAll'; $.ajax({ type : 'get', url : url, diff --git a/src/main/webapp/test/page/serviceLog/getLogInfo.jsp b/src/main/webapp/test/page/serviceLog/getLogInfo.jsp index c9756fd..2562877 100644 --- a/src/main/webapp/test/page/serviceLog/getLogInfo.jsp +++ b/src/main/webapp/test/page/serviceLog/getLogInfo.jsp @@ -23,7 +23,7 @@ function setLogInfo() { $.ajax({ type : 'post', - url : '/gk/service/log/v1/getAllLog', + url : '/galaxy/service/log/v1/getAllLog', data : "id="+<%=id%>, async : false, success : function(data, textStatus) { @@ -92,7 +92,7 @@
-