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

2、接口返回参数中添加追踪状态码traceCode,用于查看服务处理日志，方便调试与定故障定位；
3、添加项目调试模式(isDebug参数)，调用maat通用接口时，调式携带提交内容，生产过程为空；

.project

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>maat_service</name>
+	<name>galaxy</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
+		<!--<buildCommand>
 			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
 			<arguments>
 			</arguments>
-		</buildCommand>
+		</buildCommand>-->
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>

.settings/org.eclipse.wst.common.component

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="maat_service-0.0.1-SNAPSHOT">
+    <wb-module deploy-name="galaxy-0.0.1-SNAPSHOT">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
-        <property name="java-output-path" value="/maat_service/target/classes"/>
-        <property name="context-root" value="maat_service"/>
+        <property name="java-output-path" value="/galaxy/target/classes"/>
+        <property name="context-root" value="galaxy"/>
     </wb-module>
 </project-modules>

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">
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>war</packaging>
-	<name>maat_service</name>
+	<name>galaxy</name>
 	<groupId>com.nis.springmvc</groupId>
-	<artifactId>maat_service</artifactId>
+	<artifactId>galaxy</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<!-- 仓库地址构建 -->
 	<repositories>

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;
+	}
 	
 }

src/main/java/com/nis/restful/DefaultRestErrorConverter.java

@@ -24,6 +24,7 @@ public class DefaultRestErrorConverter implements RestConverter<Map> {
 		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<Map> {
 		if(re.getLogSource() != null){
 			errorMap.put(RestConstants.REST_SERVICE_LOG_SOURCE, re.getLogSource());
 		}
-
+		
 		return errorMap;
 	}
 

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;
 	}
 	

src/main/java/com/nis/restful/DefaultRestSuccessConverter.java

@@ -36,8 +36,9 @@ public class DefaultRestSuccessConverter implements RestConverter<Map> {
 		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;
 	}
 

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个
 	
 	/**

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:")

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;
+	}
+	
 }

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;
 	    }
 }

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);
 	/**
 	 * 日志本地存储时间
 	 */

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());

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) {

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();

src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml

@@ -14,11 +14,12 @@
 		<result column="BUSINESS_CODE" jdbcType="INTEGER" property="businessCode" />
 		<result column="EXCEPTION_INFO" jdbcType="VARCHAR" property="exceptionInfo" />
 		<result column="SERVER_IP" jdbcType="VARCHAR" property="serverIp" />
+		<result column="TRACE_CODE" jdbcType="VARCHAR" property="traceCode" />
 	</resultMap>
 	<sql id="Base_Column_List">
 		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
 	</sql>
 	<select id="getAllLog" parameterType="com.nis.domain.restful.ServicesRequestLogBean"
 		resultMap="ServicesRequestLogMap">
@@ -123,6 +124,9 @@
 			<if test="serverIp != null">
 				SERVER_IP,
 			</if>
+			<if test="traceCode != null">
+				TRACE_CODE,
+			</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			SEQ_SERVICES_REQUEST_LOG.Nextval,
@@ -159,6 +163,9 @@
 			<if test="serverIp != null">
 				#{serverIp,jdbcType=VARCHAR},
 			</if>
+			<if test="traceCode != null">
+				#{traceCode,jdbcType=VARCHAR},
+			</if>
 		</trim>
 	</insert>
 </mapper>

src/main/java/com/nis/web/service/SaveRequestLogThread.java

@@ -41,6 +41,7 @@ public class SaveRequestLogThread implements Runnable {
 	private long consumerTime;
 	private int businessCode;
 	private String exceptionInfo;
+	private String traceCode;
 	/* (non-Javadoc)
 	 * @see java.lang.Runnable#run()
 	 */
@@ -52,7 +53,7 @@ public class SaveRequestLogThread implements Runnable {
 		CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_C);//开启数据源C
 		// TODO Auto-generated method stub
 		if(service!=null){
-			service.saveRequestLog(remoteAddr,requestURI,queryString,contextPath, operator, version, opAction, opTime, content, requestTime, consumerTime,businessCode,exceptionInfo);
+			service.saveRequestLog(remoteAddr,requestURI,queryString,contextPath, operator, version, opAction, opTime, content, requestTime, consumerTime,businessCode,exceptionInfo,traceCode);
 		}else{
 			logger.error("service 为空！");
 		}
@@ -362,4 +363,11 @@ public class SaveRequestLogThread implements Runnable {
 	public void setExceptionInfo(String exceptionInfo) {
 		this.exceptionInfo = exceptionInfo;
 	}
+	public String getTraceCode() {
+		return traceCode;
+	}
+	public void setTraceCode(String traceCode) {
+		this.traceCode = traceCode;
+	}
+	
 }

src/main/java/com/nis/web/service/ServicesRequestLogService.java

@@ -91,7 +91,7 @@ public class ServicesRequestLogService {
 	 */
 	public void saveRequestLog(String requestAddr, String requestURI, String queryString, String contextPath,
 			String operator, String version, int opAction, Date opTime, Object content, Date requestTime,
-			long consumerTime, int businessCode, String exceptionInfo) {
+			long consumerTime, int businessCode, String exceptionInfo,String traceCode) {
 		logger.info("开始记录日志---");
 		logger.info("请求IP---" + requestAddr);
 		logger.info("请求路径---" + requestURI);
@@ -107,6 +107,7 @@ public class ServicesRequestLogService {
 		log.setConsumerTime(consumerTime);
 		log.setBusinessCode(businessCode);
 		log.setExceptionInfo(exceptionInfo);
+		log.setTraceCode(traceCode);
 		try {
 			if(Constants.SERVCER_HOST!=null){
 				log.setServerIp(Constants.SERVCER_HOST);

src/main/resources/jdbc.properties

@@ -27,10 +27,10 @@ jdbc.log.key=pHl+0udycGQWNZcN68Sv9A==
 jdbc.log.password=Z/pVMDXcWNxzVGAX0yRp3Q==
 
 jdbc.logA.driver=oracle.jdbc.driver.OracleDriver
-#jdbc.logA.url=jdbc:oracle:thin:@10.0.6.212:1523:app
-jdbc.logA.url=jdbc:oracle:thin:@10.174.196.21:1521:orcl
-#jdbc.logA.username=gk_log_a
-jdbc.logA.username=z2_5x9loga
+jdbc.logA.url=jdbc:oracle:thin:@10.0.6.212:1523:app
+#jdbc.logA.url=jdbc:oracle:thin:@10.174.196.21:1521:orcl
+jdbc.logA.username=gk_log_a
+#jdbc.logA.username=z2_5x9loga
 jdbc.logA.key=SXHfLUwzPw0cQEc1wzwM4w==
 jdbc.logA.password=auvtDoVZpGP6P4OqfBrWAg==
 

src/main/resources/nis.properties

@@ -52,7 +52,7 @@ work.notify.remind.interval=60000
 #============================#
 
 #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
-productName=gk
+productName=galaxy
 copyrightYear=2015
 version=V1.0.0
 
@@ -219,7 +219,7 @@ clusterBStartTime=1503504000725
 isCommit=true
 ############################################################################################################################################
 ############################################################################################################################################
-httpUrl=http://127.0.0.1:8080/gk/service/cfg/v1/configSources
+httpUrl=http://127.0.0.1:8080/galaxy/service/cfg/v1/configSources
 #use elasticsearch or not#
 isUseES=false
 
@@ -235,3 +235,6 @@ jdbc.hive.AName=xa_dfbhit_hive
 jdbc.hive.BName=xa_z2_mesalog_hive
 
 maxPageSize=100000
+
+#是否开启Debug模式
+isDebug=true

src/main/webapp/WEB-INF/web.xml

@@ -1,225 +1,163 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app  
-        version="3.0"  
-        xmlns="http://java.sun.com/xml/ns/javaee"  
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> 
-  <session-config>
-    <session-timeout>30</session-timeout>
-  </session-config>
-  
-  <context-param>
-  	<param-name>contextConfigLocation</param-name>
-  	<param-value>classpath:applicationContext*.xml</param-value>
-  </context-param>
-  
-  <listener>
-  	<listener-class>
-  		org.springframework.web.context.ContextLoaderListener
-  	</listener-class>
-  </listener>
-  
-  <listener>
-        <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>  
-  </listener>
-  
-  <filter>
-    <filter-name>characterEncodingFilter</filter-name>
-    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-    <init-param>
-      <param-name>encoding</param-name>
-      <param-value>UTF-8</param-value>
-    </init-param>
-    <init-param>
-      <param-name>forceEncoding</param-name>
-      <param-value>true</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>characterEncodingFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <!-- Apache Shiro -->
-  <!-- The filter-name matches name of a 'shiroFilter' bean inside applicationContext-shiro.xml -->
-  <filter>
-  	<filter-name>shiroFilter</filter-name>
-  	<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-  	<init-param>
-  		<param-name>targetFilterLifecyle</param-name>
-  		<param-value>true</param-value>
-  	</init-param>
-  </filter>
-  
-  <filter-mapping>
-  	<filter-name>shiroFilter</filter-name>
-  	<url-pattern>/*</url-pattern>
-  </filter-mapping>
-  
-  <!-- SiteMesh -->
-  <filter>
-  	<filter-name>sitemesh</filter-name>
-  	<filter-class>org.sitemesh.config.ConfigurableSiteMeshFilter</filter-class>
-  </filter>
-  
-  <filter-mapping>
-  	<filter-name>sitemesh</filter-name>
-  	<url-pattern>/nis/*</url-pattern>
-  </filter-mapping>
-  <filter>
-    <filter-name>corsFilter</filter-name>
-    <filter-class>com.nis.filter.CORSFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>corsFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  
-  
- 
-  <servlet>
-    <servlet-name>DispatcherServlet</servlet-name>
-    <servlet-class>
-  		org.springframework.web.servlet.DispatcherServlet
-  	</servlet-class>
-    <init-param>
-      <param-name>contextConfigLocation</param-name>
-      <param-value>classpath:spring-mvc*.xml</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet-mapping>
-    <servlet-name>DispatcherServlet</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
-  
-  
-  
-   <!-- 以Listener方式启动LOG4j -->
-	<listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
-  
-  	<!-- 以Listener方式启动spring -->
-  	<!-- 
-	<listener>
-		<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
-	</listener>
-    -->
-  
-  	<context-param>
-		<param-name>webAppRootKey</param-name>
-		<param-value>nis.root</param-value>
-	</context-param>
-  
-  
-  <!-- 让web应用程序启动那个时自动添加属性文件 -->
-	<!-- <context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>classpath:log4j.properties</param-value>
-	</context-param> -->
-	<!-- <context-param>
-		日志页面的刷新间隔
-		<param-name>log4jRefreshInterval</param-name>
-		<param-value>60000</param-value>
-	</context-param>
-	 -->
-	
-	<!-- CKFinder -->
-	<servlet>
-		<servlet-name>CKFinderConnectorServlet</servlet-name>
-		<servlet-class>com.nis.web.controller.CKFinderConnectorServlet</servlet-class>
-		<init-param>
-			<param-name>XMLConfig</param-name>
-			<param-value>/WEB-INF/ckfinder.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<init-param>
-			<param-name>configuration</param-name>
-			<param-value>com.nis.web.controller.CKFinderConfig</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>CKFinderConnectorServlet</servlet-name>
-		<url-pattern>/static/ckfinder/core/connector/java/connector.java</url-pattern>
-	</servlet-mapping>
-	<filter>
-		<filter-name>FileUploadFilter</filter-name>
-		<filter-class>com.ckfinder.connector.FileUploadFilter</filter-class>
-		<init-param>
-			<param-name>sessionCookieName</param-name>
-			<param-value>JSESSIONID</param-value>
-		</init-param>
-		<init-param>
-			<param-name>sessionParameterName</param-name>
-			<param-value>jsessionid</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>FileUploadFilter</filter-name>
-		<url-pattern>/static/ckfinder/core/connector/java/connector.java</url-pattern>
-	</filter-mapping>
-  
-  
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>*.jpg</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>*.gif</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>*.png</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>*.js</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>*.css</url-pattern>
-  </servlet-mapping>
-  
-  
-  <error-page>
-	<error-code>500</error-code>
-	<location>/WEB-INF/views/error/500.jsp</location>
-  </error-page>
-  <error-page>
-	 <error-code>404</error-code>
-	 <location>/WEB-INF/views/error/404.jsp</location>
-  </error-page>
-  
-    <!-- 数据字典监听器 -->
-<!-- 	<listener> -->
-<!-- 		<listener-class> -->
-<!-- 			com.nis.listener.SystemConfigListener -->
-<!-- 		</listener-class> -->
-<!-- 	</listener> -->
-		
-  
-  
-  
-  
-  <!-- 测试使用,后期会删除 -->
-  <jsp-config>
-    <taglib>
-      <taglib-uri>/jstl/c</taglib-uri>
-      <taglib-location>/WEB-INF/tlds/c.tld</taglib-location>
-    </taglib>
-    <taglib>
-      <taglib-uri>/jstl/fn</taglib-uri>
-      <taglib-location>/WEB-INF/tlds/fn.tld</taglib-location>
-    </taglib>
-    <taglib>
-      <taglib-uri>/jstl/fmt</taglib-uri>
-      <taglib-location>/WEB-INF/tlds/fmt.tld</taglib-location>
-    </taglib>
-  </jsp-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:jsp="http://java.sun.com/xml/ns/javaee/jsp" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+  <session-config>
+    <session-timeout>30</session-timeout>
+  </session-config>
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>classpath:applicationContext*.xml</param-value>
+  </context-param>
+  <listener>
+    <listener-class>
+  		org.springframework.web.context.ContextLoaderListener
+  	</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+  </listener>
+  <filter>
+    <filter-name>characterEncodingFilter</filter-name>
+    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+    <init-param>
+      <param-name>encoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+    <init-param>
+      <param-name>forceEncoding</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>characterEncodingFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <filter>
+    <filter-name>shiroFilter</filter-name>
+    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    <init-param>
+      <param-name>targetFilterLifecyle</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>shiroFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <filter>
+    <filter-name>sitemesh</filter-name>
+    <filter-class>org.sitemesh.config.ConfigurableSiteMeshFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>sitemesh</filter-name>
+    <url-pattern>/nis/*</url-pattern>
+  </filter-mapping>
+  <filter>
+    <filter-name>corsFilter</filter-name>
+    <filter-class>com.nis.filter.CORSFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>corsFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <servlet>
+    <servlet-name>DispatcherServlet</servlet-name>
+    <servlet-class>
+  		org.springframework.web.servlet.DispatcherServlet
+  	</servlet-class>
+    <init-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>classpath:spring-mvc*.xml</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DispatcherServlet</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+  <listener>
+    <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+  </listener>
+  <context-param>
+    <param-name>webAppRootKey</param-name>
+    <param-value>nis.root</param-value>
+  </context-param>
+  <servlet>
+    <servlet-name>CKFinderConnectorServlet</servlet-name>
+    <servlet-class>com.nis.web.controller.CKFinderConnectorServlet</servlet-class>
+    <init-param>
+      <param-name>XMLConfig</param-name>
+      <param-value>/WEB-INF/ckfinder.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>configuration</param-name>
+      <param-value>com.nis.web.controller.CKFinderConfig</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>CKFinderConnectorServlet</servlet-name>
+    <url-pattern>/static/ckfinder/core/connector/java/connector.java</url-pattern>
+  </servlet-mapping>
+  <filter>
+    <filter-name>FileUploadFilter</filter-name>
+    <filter-class>com.ckfinder.connector.FileUploadFilter</filter-class>
+    <init-param>
+      <param-name>sessionCookieName</param-name>
+      <param-value>JSESSIONID</param-value>
+    </init-param>
+    <init-param>
+      <param-name>sessionParameterName</param-name>
+      <param-value>jsessionid</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>FileUploadFilter</filter-name>
+    <url-pattern>/static/ckfinder/core/connector/java/connector.java</url-pattern>
+  </filter-mapping>
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>*.jpg</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>*.gif</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>*.png</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>*.js</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>*.css</url-pattern>
+  </servlet-mapping>
+  <error-page>
+    <error-code>500</error-code>
+    <location>/WEB-INF/views/error/500.jsp</location>
+  </error-page>
+  <error-page>
+    <error-code>404</error-code>
+    <location>/WEB-INF/views/error/404.jsp</location>
+  </error-page>
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/jstl/c</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/c.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>/jstl/fn</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/fn.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>/jstl/fmt</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/fmt.tld</taglib-location>
+    </taglib>
+  </jsp-config>
 </web-app>

src/main/webapp/swagger/index.html

@@ -38,7 +38,7 @@
       if (url && url.length > 1) {
         url = decodeURIComponent(url[1]);
       } else {
-        url = "http://127.0.0.1:8080/gk/api-docs";
+        url = "http://127.0.0.1:8080/galaxy/api-docs";
       }
 
       hljs.configure({
@@ -70,7 +70,7 @@
           }
         },
         onFailure: function(data) {
-          log("Unable to Load GK UI");
+          log("Unable to Load GALAXY UI");
         },
         docExpansion: "none",
         jsonEditor: false,
@@ -92,7 +92,7 @@
 <body class="swagger-section">
 <div id='header'>
   <div class="swagger-ui-wrap">
-    <a id="logo" href="/gk/api-docs"><img class="logo__img" alt="swagger" height="30" width="30" src="images/logo_small.png" /><span class="logo__title">GK API</span></a>
+    <a id="logo" href="/galaxy/api-docs"><img class="logo__img" alt="swagger" height="30" width="30" src="images/logo_small.png" /><span class="logo__title">GALAXY API</span></a>
     <form id='api_selector'>
       <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
       <div id='auth_container'></div>

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 = "<option value=''>请选择</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 @@
 				</div>
 				<div class="portlet-body form">
 					<!-- BEGIN FORM-->
-					<form action="/gk/service/cfg/v1/addDictName"
+					<form action="/galaxy/service/cfg/v1/addDictName"
 						class="form-horizontal" method="post" name="taskMainForm"
 						enctype="multipart/form-data">
 						<input type="hidden" value="add" id="addOrUpdate"> <input

src/main/webapp/test/page/dataDict/allDataDictName.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) {
@@ -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) {

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) {

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("插入失败");
 					}

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 = '<label class="col-md-5 control-label">分类</label> <input type="text" class="form-control task-input-small"	name="searchFl" id="searchFl" placeholder="分类" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">分类</label> <input type="text" class="form-control task-input-small"	name="searchFl" id="searchFl" placeholder="分类" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">事件</label> <input type="text" class="form-control task-input-small"	name="searchAffair" id="searchAffair" placeholder="事件" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">事件</label> <input type="text" class="form-control task-input-small"	name="searchAffair" id="searchAffair" placeholder="事件" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">任务</label> <input type="text" class="form-control task-input-small"	name="searchMission" id="searchMission" placeholder="任务" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">任务</label> <input type="text" class="form-control task-input-small"	name="searchMission" id="searchMission" placeholder="任务" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">保障期</label> <input type="text" class="form-control task-input-small"	name="searchGuarantee" id="searchGuarantee" placeholder="保障期" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">保障期</label> <input type="text" class="form-control task-input-small"	name="searchGuarantee" id="searchGuarantee" placeholder="保障期" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">标签</label> <input type="text" class="form-control task-input-small"	name="searchTag" id="searchTag" placeholder="标签" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">标签</label> <input type="text" class="form-control task-input-small"	name="searchTag" id="searchTag" placeholder="标签" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">配置ID</label> <input type="text" class="form-control task-input-small"	name="searchId" id="searchId" placeholder="配置ID" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">配置ID</label> <input type="text" class="form-control task-input-small"	name="searchId" id="searchId" placeholder="配置ID" maxlength="64">';
 			$("#cl1").html(cl1);
 
@@ -949,7 +949,7 @@
 
 			<form name="form2" id="form2">
 				<input type="hidden" id="urlAddr" name="urlAddr"
-					value="/gk/service/log/v1/dfJitFlSrcReportSources"> <input
+					value="/galaxy/service/log/v1/dfJitFlSrcReportSources"> <input
 					type="hidden" id="pageNo" name="pageNo" value="1"> <input
 					type="hidden" id="pageSize" name="pageSize" value="30"> <input
 					type="hidden" id="totalCount" name="totalCount">

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 = '<label class="col-md-5 control-label">配置ID&nbsp;&nbsp;&nbsp;</label> <input type="text" class="form-control input-small"	name="searchFl" id="searchFl" placeholder="分类" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">分类</label> <input type="text" class="form-control input-small"	name="searchFl" id="searchFl" placeholder="分类" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">事件</label> <input type="text" class="form-control input-small"	name="searchAffair" id="searchAffair" placeholder="事件" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">事件</label> <input type="text" class="form-control input-small"	name="searchAffair" id="searchAffair" placeholder="事件" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">任务</label> <input type="text" class="form-control input-small"	name="searchMission" id="searchMission" placeholder="任务" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">任务</label> <input type="text" class="form-control input-small"	name="searchMission" id="searchMission" placeholder="任务" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">保障期</label> <input type="text" class="form-control input-small"	name="searchGuarantee" id="searchGuarantee" placeholder="保障期" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">保障期</label> <input type="text" class="form-control input-small"	name="searchGuarantee" id="searchGuarantee" placeholder="保障期" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">标签</label> <input type="text" class="form-control input-small"	name="searchTag" id="searchTag" placeholder="标签" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">标签</label> <input type="text" class="form-control input-small"	name="searchTag" id="searchTag" placeholder="标签" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">配置ID</label> <input type="text" class="form-control input-small"	name="searchId" id="searchId" placeholder="配置ID" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">配置ID</label> <input type="text" class="form-control input-small"	name="searchId" id="searchId" placeholder="配置ID" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">配置ID</label> <input type="text" class="form-control input-small"	name="searchId" id="searchId" placeholder="配置ID" maxlength="64">';
 			$("#cl1").html(cl1);
 
@@ -1041,7 +1041,7 @@
 
 			<form name="form2" id="form2">
 				<input type="hidden" id="urlAddr" name="urlAddr"
-					value="/gk/service/log/v1/dfJitFlSrcReportSources"> <input
+					value="/galaxy/service/log/v1/dfJitFlSrcReportSources"> <input
 					type="hidden" id="pageNo" name="pageNo" value="1"> <input
 					type="hidden" id="pageSize" name="pageSize" value="30"> <input
 					type="hidden" id="totalCount" name="totalCount">

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 = '<label class="col-md-5 control-label">分类</label> <input type="text" class="form-control task-input-small"	name="searchFl" id="searchFl" placeholder="分类" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">分类</label> <input type="text" class="form-control task-input-small"	name="searchFl" id="searchFl" placeholder="分类" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">事件</label> <input type="text" class="form-control task-input-small"	name="searchAffair" id="searchAffair" placeholder="事件" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">事件</label> <input type="text" class="form-control task-input-small"	name="searchAffair" id="searchAffair" placeholder="事件" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">任务</label> <input type="text" class="form-control task-input-small"	name="searchMission" id="searchMission" placeholder="任务" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">任务</label> <input type="text" class="form-control task-input-small"	name="searchMission" id="searchMission" placeholder="任务" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">保障期</label> <input type="text" class="form-control task-input-small"	name="searchGuarantee" id="searchGuarantee" placeholder="保障期" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">保障期</label> <input type="text" class="form-control task-input-small"	name="searchGuarantee" id="searchGuarantee" placeholder="保障期" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">标签</label> <input type="text" class="form-control task-input-small"	name="searchTag" id="searchTag" placeholder="标签" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">标签</label> <input type="text" class="form-control task-input-small"	name="searchTag" id="searchTag" placeholder="标签" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">配置ID</label> <input type="text" class="form-control task-input-small"	name="searchId" id="searchId" placeholder="配置ID" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">配置ID</label> <input type="text" class="form-control task-input-small"	name="searchId" id="searchId" placeholder="配置ID" maxlength="64">';
 			$("#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 = '<label class="col-md-5 control-label">配置ID</label> <input type="text" class="form-control task-input-small"	name="searchId" id="searchId" placeholder="配置ID" maxlength="64">';
 			$("#cl1").html(cl1);
 
@@ -1003,7 +1003,7 @@
 
 			<form name="form2" id="form2">
 				<input type="hidden" id="urlAddr" name="urlAddr"
-					value="/gk/service/log/v1/dfJitFlSrcReportSources"> <input
+					value="/galaxy/service/log/v1/dfJitFlSrcReportSources"> <input
 					type="hidden" id="pageNo" name="pageNo" value="1"> <input
 					type="hidden" id="pageSize" name="pageSize" value="30"> <input
 					type="hidden" id="totalCount" name="totalCount">

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,

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 @@
 				</div>
 				<div class="portlet-body form">
 					<!-- BEGIN FORM-->
-					<form action="/gk/service/cfg/v1/addDictName"
+					<form action="/galaxy/service/cfg/v1/addDictName"
 						class="form-horizontal" method="post" name="taskMainForm"
 						enctype="multipart/form-data">
 						<input type="hidden" value="add" id="addOrUpdate"> <input

src/test/java/com/nis/test/RestfulTest.java

@@ -25,7 +25,7 @@ import com.nis.util.StringUtil;
 * @version V1.0 
 */
 public class RestfulTest {
-	public static final String REST_SERVICE_URL = "http://127.0.0.1:8080/gk/service/v1/";
+	public static final String REST_SERVICE_URL = "http://127.0.0.1:8080/galaxy/service/v1/";
 	
 	/**
 	 *