KeYuan před 8 roky
rodič
revize
e0a93f7646

+ 1 - 0
LICENSE

@@ -1,3 +1,4 @@
+Powered by DWSurvey<http://www.diaowen.net>
 
 DWSurvey<http://www.diaowen.net> is an Open Source project
 licensed under the terms of the LGPLv3 license.Please see

+ 2 - 11
src/main/java/com/key/dwsurvey/action/MyCollectAction.java

@@ -50,16 +50,12 @@ public class MyCollectAction extends ActionSupport{
 	public String execute() throws Exception {
 		HttpServletRequest request=Struts2Utils.getRequest();
 		String tabId=request.getParameter("tabId");
-		
-		
+
 		String baseUrl = "";
 		baseUrl = request.getScheme() +"://" + request.getServerName()  
 						+ (request.getServerPort() == 80 ? "" : ":" +request.getServerPort())
                         + request.getContextPath();
-//                        + request.getServletPath();
-//		if (request.getQueryString() != null){
-//			url += "?" + request.getQueryString();
-//		}
+
 		request.setAttribute("baseUrl", baseUrl);
 
 		User user=accountManager.getCurUser();
@@ -67,11 +63,6 @@ public class MyCollectAction extends ActionSupport{
     		SurveyDirectory surveyDirectory=surveyDirectoryManager.getSurveyByUser(surveyId, user.getId());
     		if(surveyDirectory!=null){
     			request.setAttribute("survey", surveyDirectory);
-    			/*for (int i = 0; i < 1000; i++) {
-    				invokeMessageProducer.send();
-    			}*/
-    			
-    			
     			if(IFRAME.equals(tabId)){
     				return IFRAME;
     			}else if(MAIL_INPUT.equals(tabId)){

+ 9 - 0
src/main/java/com/key/dwsurvey/entity/DataCross.java

@@ -3,6 +3,15 @@ package com.key.dwsurvey.entity;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 答案 是非题结果保存表
+ *
+ * @author keyuan
+ * @date 2012-10-21下午9:26:10
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 public class DataCross {
 	
 	

+ 9 - 0
src/main/java/com/key/dwsurvey/entity/ImportError.java

@@ -7,6 +7,15 @@ import javax.persistence.Table;
 
 import com.key.common.base.entity.IdEntity;
 
+/**
+ * 答案 是非题结果保存表
+ *
+ * @author keyuan
+ * @date 2012-10-21下午9:26:10
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 @Entity
 @Table(name="t_importError")
 public class ImportError extends IdEntity{

+ 9 - 0
src/main/java/com/key/dwsurvey/entity/MailInviteInbox.java

@@ -5,6 +5,15 @@ import javax.persistence.Table;
 
 import com.key.common.base.entity.IdEntity;
 
+/**
+ * 答案 是非题结果保存表
+ *
+ * @author keyuan
+ * @date 2012-10-21下午9:26:10
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 @Entity
 @Table(name="t_mail_invite_inbox")
 public class MailInviteInbox extends IdEntity{

+ 7 - 1
src/main/java/com/key/dwsurvey/entity/SurveyAnswer.java

@@ -7,7 +7,13 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 
 import com.key.common.base.entity.IdEntity;
-
+/**
+ * 具体的一次调查
+ * @author keyuan
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 @Entity
 @Table(name="t_survey_answer")
 public class SurveyAnswer extends IdEntity{

+ 1 - 1
src/main/java/com/key/dwsurvey/entity/SurveyMailInvite.java

@@ -8,7 +8,7 @@ import javax.persistence.Table;
 import com.key.common.base.entity.IdEntity;
 
 /**
- *
+ *  邮件服务
  * https://github.com/wkeyuan/DWSurvey
  * http://dwsurvey.net
  */

+ 7 - 1
src/main/java/com/key/dwsurvey/entity/SysDbBackup.java

@@ -6,7 +6,13 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 import com.key.common.base.entity.IdEntity;
-
+/**
+ * 用作备分
+ * @author keyuan
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 @Entity
 @Table(name="t_sys_db_backup")
 public class SysDbBackup extends IdEntity{

+ 7 - 1
src/main/java/com/key/dwsurvey/entity/SysEmail.java

@@ -6,7 +6,13 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 import com.key.common.base.entity.IdEntity;
-
+/**
+ * 系统邮件
+ * @author keyuan
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 @Entity
 @Table(name="t_sys_email")
 public class SysEmail extends IdEntity{

+ 7 - 1
src/main/java/com/key/dwsurvey/entity/SysLog.java

@@ -1,7 +1,13 @@
 package com.key.dwsurvey.entity;
 
 import com.key.common.base.entity.IdEntity;
-
+/**
+ * 系统日志
+ * @author keyuan
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 public class SysLog extends IdEntity{
 
 }

+ 7 - 1
src/main/java/com/key/dwsurvey/entity/SysProperty.java

@@ -1,5 +1,11 @@
 package com.key.dwsurvey.entity;
-
+/**
+ * 配置
+ * @author keyuan
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 public class SysProperty {
 	
 	//站点名称 

+ 7 - 1
src/main/java/com/key/dwsurvey/entity/SysSendEmail.java

@@ -3,7 +3,13 @@ package com.key.dwsurvey.entity;
 import java.util.Date;
 
 import com.key.common.base.entity.IdEntity;
-
+/**
+ * 系统邮件
+ * @author keyuan
+ *
+ * https://github.com/wkeyuan/DWSurvey
+ * http://dwsurvey.net
+ */
 public class SysSendEmail extends IdEntity {
 	//收件用户
 	private String inboxUserId;

+ 1 - 1
src/main/webapp/WEB-INF/page/layouts/admin-info.jsp

@@ -3,7 +3,7 @@
 <div style="color: gray;">
 	<h3 style="line-height: 40px;">联系信息</h3>
 	<p style="line-height: 40px;">邮箱:service@diaowen.net</p>
-	<p style="line-height: 40px;">电话:457647860</p>
+	<p style="line-height: 40px;">电话:0000000000</p>
 	<p style="line-height: 40px;">京ICP备13050030号-3</p>
 </div>
 

+ 4 - 1
src/main/webapp/WEB-INF/page/layouts/default.jsp

@@ -25,11 +25,14 @@
 	
 	<div class="dw_foot" style="padding-top:20px;">
 		<%@ include file="/WEB-INF/page/layouts/footer-1.jsp"%>
+
+		<!-- 必须保留声明 start -->
 		<div class="footer-copyright" style="color: gray;padding-top: 0px;font-size: 16px;padding-bottom: 16px;">
-			Powered by <a href="http://www.dwsurvey.net" style="text-decoration: none;color: gray;">DWSurvey3.0</a>
+			Powered by <a href="http://www.dwsurvey.net" style="text-decoration: none;color: gray;">DWSurvey</a>
 			&nbsp;&nbsp;&nbsp;Copyright © 2012-2017
 			<a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">调问网</a>
 		</div>
+		<!-- 必须保留声明 end -->
 	</div>
 	
 	

+ 3 - 1
src/main/webapp/WEB-INF/page/layouts/footer-0.jsp

@@ -5,7 +5,9 @@
 	
 	<div class="dw_footnav">
 		<a href="/" style="color: gray;font-size: 16px;">京ICP备13050030号-3&nbsp;&nbsp;&nbsp;</a>
-	</div> 
+	</div>
+
+	<!-- 必须保留声明 -->
 	<div class="footer-copyright" style="color: gray;padding-top: 0px;font-size: 16px;">
 		Powered by <a href="http://www.dwsurvey.net" style="text-decoration: none;color: gray;">DWSurvey</a>
 		&nbsp;&nbsp;&nbsp;Copyright © 2012-2016

+ 4 - 2
src/main/webapp/WEB-INF/page/layouts/footer-2.jsp

@@ -7,15 +7,17 @@
 	</div> -->
     <div class="dw_footcopy" style="font-size: 16px;color: gray;">
     	<p style="margin-bottom: 6px;">
-    	邮箱:service@diaowen.net&nbsp;&nbsp;&nbsp;电话:457647860&nbsp;&nbsp;&nbsp;
+    	邮箱:service@diaowen.net&nbsp;&nbsp;&nbsp;电话:000000000&nbsp;&nbsp;&nbsp;
     	<a href="/" style="color: gray;font-size: 16px;">京ICP备13050030号-3</a>
     	</p>
     </div>
+	<!-- 必须保留声明 start -->
 	<div class="footer-copyright" style="color: gray;padding-top: 0px;font-size: 16px;">
 		Powered by <a href="http://www.dwsurvey.net" style="text-decoration: none;color: gray;">DWSurvey</a>
-		&nbsp;&nbsp;&nbsp;Copyright © 2012-2016
+		&nbsp;&nbsp;&nbsp;Copyright © 2012-2017
 		<a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">调问网</a>
 	</div>
+	<!-- 必须保留声明 end -->
 </div>
 
 <%-- <div id="footer_wrapper">

+ 4 - 2
src/main/webapp/login.jsp

@@ -6,7 +6,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>调问网-专业且开源的问卷表单系统</title>
-<meta name="keywords" content="调问开源问卷表单,调查问卷,问卷调查系统,调查问卷设计,调查问卷格式,大学生问卷,在线问卷,表单系统" />
+<meta name="keywords" content="调问开源问卷表单,DWSurvey,调查问卷,问卷调查系统,调查问卷设计,调查问卷格式,大学生问卷,在线问卷,表单系统" />
 <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>
@@ -209,11 +209,13 @@ label.error{
 	</div>
 	
 	<div class="dw_foot" style="padding-top:15px;">
+		<!-- 必须保留声明 start -->
 	<div class="footer-copyright" style="color: gray;padding-top: 0px;font-size: 16px;">
-		Powered by <a href="http://www.dwsurvey.net" style="text-decoration: none;color: gray;">DWSurvey3.0</a>
+		Powered by <a href="http://www.dwsurvey.net" style="text-decoration: none;color: gray;">DWSurvey</a>
 		&nbsp;&nbsp;&nbsp;Copyright © 2012-2017
 		<a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">调问网</a>
 	</div>
+		<!-- 必须保留声明 end -->
 	</div>
 	
 	</div>