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