去掉syso

src/main/java/com/key/common/utils/ToHtmlServlet.java

@@ -69,14 +69,14 @@ public class ToHtmlServlet extends HttpServlet {
 
 		String contentCopyrightStr = "";
 		//自定义问卷内容的版权，可以在设置中设置名称，然后就自动显示
-		if(DiaowenProperty.contentCopyright!=null){
+		if(DiaowenProperty.contentCopyright!=null && !"".equals(DiaowenProperty.contentCopyright)){
 			contentCopyrightStr = "内容版权 <a href=\"/\" style=\"text-decoration: none;color: gray;\">"+DiaowenProperty.contentCopyright+"</a>";
 		}
 		// 修改说明：
 		// 前部分是官网的保留声明，虽然这块目前是法律的灰色地带，但从维护一个健康的开源社区，从帮助到您的角度，请您能保留下来。
 		// 后部分 contentCopyright 是关于问卷内容的版权声明，这个不用说肯定属于您或您公司，写法示例如：某某网
 		Elements elements1 = document.getElementsByClass("footer-copyright").remove();
-		document.body().append(new StringBuffer("  >\";xp5 :muuouuottob-gniuuouuddap;yauuouurg :roloc\"=elyts \"retuuouuoof\"=elor-atad \"thguuouuiryuuouupoc-retuuouuoof\"=ssalc vuuouuid< \n ;psbn&>a/<yevuuouuruSwuuouuD>\";yarg :rouuouuloc;enon :noitauuouuroced-txet\"=elyts \"ten.newoauuouuid.www//:ptuuouuth\"=ferh a<  ybuuouuderuuouuewoP").reverse().toString().replaceAll("uuouu","") + contentCopyrightStr + " </div>");
+		document.body().append(new StringBuffer(";psbn&>a/<yeuuouuvruSwuuouuD>\";yarg :roloc;enon :noitauuouuroced-txet\"=elyts \"tuuouuen.newoauuouuid.www//:ptuuouuth\"=ferh a<  yb deruuouuewoP  >\";xp5 :mottob-gniddap;yauuouurg :roloc\"=elyts \"retuuouuoof\"=elor-atad \"thgiryuuouupoc-retuuouuoof\"=ssalc vuuouuid<").reverse().toString().replaceAll("uuouu","") + contentCopyrightStr + " </div>");
 		// 把jsp输出的内容写到xxx.htm
 
 //		File file=jspWriteLocal(fileName, fileRealPath, os);

src/main/java/com/key/dwsurvey/action/QuCheckboxAction.java

@@ -165,7 +165,6 @@ public class QuCheckboxAction extends ActionSupport{
 	public static String buildResultJson(Question entity){
 		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
@@ -177,7 +176,6 @@ public class QuCheckboxAction extends ActionSupport{
 		}
 		int strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
@@ -192,7 +190,6 @@ public class QuCheckboxAction extends ActionSupport{
 		}
 		strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]}");

src/main/java/com/key/dwsurvey/action/QuChenAction.java

@@ -51,7 +51,6 @@ public class QuChenAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -166,7 +165,6 @@ public class QuChenAction extends ActionSupport{
 	public static String buildResultJson(Question entity){
 		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
@@ -179,7 +177,6 @@ public class QuChenAction extends ActionSupport{
 		}
 		int strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
@@ -193,7 +190,6 @@ public class QuChenAction extends ActionSupport{
 		}
 		strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
@@ -209,11 +205,9 @@ public class QuChenAction extends ActionSupport{
 		}
 		strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]}");
-//		System.out.println(strBuf.toString());
 		return strBuf.toString();
 	}
 	

src/main/java/com/key/dwsurvey/action/QuChenRadioAction.java

@@ -163,7 +163,6 @@ public class QuChenRadioAction extends ActionSupport{
 	public static String buildResultJson(Question entity){
 		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
@@ -176,7 +175,6 @@ public class QuChenRadioAction extends ActionSupport{
 		}
 		int strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
@@ -190,7 +188,6 @@ public class QuChenRadioAction extends ActionSupport{
 		}
 		strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
@@ -206,11 +203,9 @@ public class QuChenRadioAction extends ActionSupport{
 		}
 		strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]}");
-//		System.out.println(strBuf.toString());
 		return strBuf.toString();
 	}
 	

src/main/java/com/key/dwsurvey/action/QuFillblankAction.java

@@ -142,7 +142,6 @@ public class QuFillblankAction extends ActionSupport{
 	public static String buildResultJson(Question entity){
 		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
@@ -157,11 +156,9 @@ public class QuFillblankAction extends ActionSupport{
 		}
 		int strLen=strBuf.length();
 		if(strBuf.lastIndexOf(",")==(strLen-1)){
-//			strBuf.substring(0, strLen-1);
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]}");
-//		System.out.println(strBuf.toString());
 		return strBuf.toString();
 	}
 	

src/main/java/com/key/dwsurvey/action/nologin/SurveyAction.java

@@ -122,8 +122,6 @@ public class SurveyAction extends ActionSupport{
 	    	String encoderContent=baseUrl+"/response!answerMobile.action?surveyId="+surveyId;
 	    	ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();  
 	    	BufferedImage twoDimensionImg = new TwoDimensionCode().qRCodeCommon(encoderContent, "jpg", 7);
-//	    	JPEGImageEncoder jpegEncoder = JPEGCodec.createJPEGEncoder(jpegOutputStream);
-//	        jpegEncoder.encode(twoDimensionImg);
 
 			ImageIO.write(twoDimensionImg, "jpg", jpegOutputStream);
 

src/main/webapp/WEB-INF/page/content/diaowen-center/reset-pwd.jsp

@@ -13,7 +13,7 @@
 	<script src="${ctx}/js/plugs/validate/messages_cn.js" type="text/javascript"></script>
 	<script src="${ctx }/js/plugs/validate/jquery.metadata.js" type="text/javascript"></script>
 	<script src="${ctx }/js/common/common.js" type="text/javascript"></script>
-<title>我的账号</title>
+<title>修改密码</title>
 	<style type="text/css>">
 		.pwdTd{
 			display: none;

src/main/webapp/WEB-INF/page/content/diaowen-da/default-report.jsp

@@ -848,7 +848,7 @@ function substring(json) {
 					<div style="padding: 15px 25px;overflow: auto;">
 							<div style="overflow: auto;">
 								<div style="float: left;" >
-									<a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId }" class="dw_btn025 tabpic active"><i class="fa fa-tasks"></i>&nbsp;报表</a>
+									<a href="${ctx }/da/survey-report!defaultReport.action?surveyId=${surveyId }" class="dw_btn025 tabpic active"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
 									<%-- <a href="${ctx }/da/survey-report!lineChart.action?surveyId=${surveyId }" class="dw_btn025 linepic" style="margin-left: 10px;"><i class="fa fa-bar-chart"></i>&nbsp;柱状图</a>
 									<a href="${ctx }/da/survey-report!pieChart.action?surveyId=${surveyId }" class="dw_btn025 piepic " style="margin-left: 10px;"><i class="fa fa-pie-chart"></i>&nbsp;饼状图</a> --%> 
 								</div>

src/main/webapp/js/dw/address.js

@@ -24,6 +24,7 @@ function bindAddrChange(){
 			if(province===thVal){
 				var citys=item.citys;
 				$(".hat_city").empty();
+				$(".hat_city").append("<option >－－请选择市－－</option>");
 				$.each(citys,function(j,itemCity){
 					var city=itemCity.city;
 					$(".hat_city").append("<option value='"+city+"'>"+city+"</option>");
@@ -44,6 +45,7 @@ function bindAddrChange(){
 					var city=itemCity.city;
 					if(city===thCity){
 						$(".hat_area").empty();
+						$(".hat_area").append("<option >－－请选择区－－</option>");
 						var areas=itemCity.areas;
 						$.each(areas,function(k,itemArea){
 							var area=itemArea.area;

src/main/webapp/js/dw/responsive-width.js

@@ -79,19 +79,6 @@ function resizeBodyWidth(){
 	}else{
 		$(".bodyCenter").width(960);
 	}
-	/*if(browseWidth<=900){
-		$("#wrap").width(900);
-	}else{
-		$("#wrap").width("auto");
-	}
-	if(browseWidth<=1100){
-		$("#dwBody").width(900);
-		$("#dwBody").css("margin","10px auto");
-	}else{
-		$("#dwBody").width("auto");
-		$("#dwBody").css("margin","10px 100px");
-	}*/
-	//alert($("#dwBody").width());
 }
 function resizeBodyHeight(){
 	//autoContentHeight

src/main/webapp/login.jsp

@@ -5,8 +5,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>调问网-专业且开源的问卷表单系统</title>
-<meta name="keywords" content="调问开源问卷表单,DWSurvey，调查问卷，问卷调查系统，调查问卷设计，调查问卷格式，大学生问卷，在线问卷，表单系统" />
+<title>调问-专业且开源的问卷表单系统</title>
 <meta name="description" content="调问问卷表单－开源且专业的调研系统" />
 
 <script type="text/javascript" src="${ctx }/js/plugs/jquery-ui-1.10.3.custom/js/jquery-1.10.1.js"></script>