Commit b739224d authored by 雍欢's avatar 雍欢

修改web_app.name赋值方式,使项目可以部署到 / 下面

parent e5a211f2
...@@ -66,6 +66,7 @@ public class PlugInFilter implements Filter { ...@@ -66,6 +66,7 @@ public class PlugInFilter implements Filter {
/** /**
* 创建JS文件系统应用名 * 创建JS文件系统应用名
*/ */
@Deprecated
private void initPath(String contextPath, String realPath) { private void initPath(String contextPath, String realPath) {
Constants.WEB_APP = contextPath; Constants.WEB_APP = contextPath;
OutputStream fout = null; OutputStream fout = null;
......
package com.huigou.uasp.client.views; package com.huigou.uasp.client.views;
import java.util.HashMap; import com.huigou.context.MessageSourceContext;
import java.util.LinkedHashMap; import com.huigou.freemarker.FreemarkerUtil;
import java.util.Map; import com.huigou.util.ClassHelper;
import com.huigou.util.StringUtil;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport; import javax.servlet.jsp.tagext.TagSupport;
import java.util.HashMap;
import com.huigou.context.MessageSourceContext; import java.util.LinkedHashMap;
import com.huigou.freemarker.FreemarkerUtil; import java.util.Map;
import com.huigou.util.ClassHelper;
import com.huigou.util.StringUtil;
/** /**
* JSP 标签基类 * JSP 标签基类
...@@ -264,6 +263,12 @@ public abstract class AbstractTag extends TagSupport { ...@@ -264,6 +263,12 @@ public abstract class AbstractTag extends TagSupport {
return request; return request;
} }
protected String getRequestBasePath() {
HttpServletRequest request = getRequest();
String serverHost = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
return serverHost + request.getContextPath();
}
public boolean isTrue(Object key) { public boolean isTrue(Object key) {
if (key == null) { if (key == null) {
return false; return false;
......
...@@ -2,8 +2,6 @@ package com.huigou.uasp.client.views; ...@@ -2,8 +2,6 @@ package com.huigou.uasp.client.views;
import javax.servlet.jsp.PageContext; import javax.servlet.jsp.PageContext;
import com.huigou.util.Constants;
public class HeadBaseTag extends AbstractTag { public class HeadBaseTag extends AbstractTag {
private static final long serialVersionUID = 5070404679322295999L; private static final long serialVersionUID = 5070404679322295999L;
...@@ -41,7 +39,7 @@ public class HeadBaseTag extends AbstractTag { ...@@ -41,7 +39,7 @@ public class HeadBaseTag extends AbstractTag {
} }
} }
} }
addParameter("webApp", Constants.WEB_APP); addParameter("webApp", getRequestBasePath());
} }
} }
package com.huigou.uasp.client.views; package com.huigou.uasp.client.views;
import com.huigou.util.Constants; import javax.servlet.http.HttpServletRequest;
/** /**
* 国际化资源读取 * 国际化资源读取
...@@ -31,7 +31,10 @@ public class I18NTag extends AbstractTag { ...@@ -31,7 +31,10 @@ public class I18NTag extends AbstractTag {
protected void evaluateExtraParams() { protected void evaluateExtraParams() {
super.evaluateExtraParams(); super.evaluateExtraParams();
addParameter("webApp", Constants.WEB_APP); HttpServletRequest request = getRequest();
String serverHost = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
String basePath = serverHost + request.getContextPath();
addParameter("webApp", getRequestBasePath());
if (null != dictionary) { if (null != dictionary) {
addParameter("dictionary", dictionary); addParameter("dictionary", dictionary);
} }
......
package com.huigou.uasp.client.views; package com.huigou.uasp.client.views;
import com.huigou.cache.SystemCache; import com.huigou.cache.SystemCache;
import com.huigou.util.Constants;
import com.huigou.util.StringUtil; import com.huigou.util.StringUtil;
/** /**
...@@ -56,7 +55,7 @@ public class LinkImportTag extends AbstractTag { ...@@ -56,7 +55,7 @@ public class LinkImportTag extends AbstractTag {
if (StringUtil.isBlank(href)) { if (StringUtil.isBlank(href)) {
return; return;
} }
String prefix = Constants.WEB_APP; String prefix = getRequestBasePath();
StringBuffer linkUrl = new StringBuffer(); StringBuffer linkUrl = new StringBuffer();
if (href.startsWith(prefix)) { if (href.startsWith(prefix)) {
linkUrl.append(href); linkUrl.append(href);
......
package com.huigou.uasp.client.views; package com.huigou.uasp.client.views;
import com.huigou.cache.SystemCache; import com.huigou.cache.SystemCache;
import com.huigou.util.Constants;
import com.huigou.util.StringUtil; import com.huigou.util.StringUtil;
/** /**
...@@ -46,7 +45,7 @@ public class ScriptImportTag extends AbstractTag { ...@@ -46,7 +45,7 @@ public class ScriptImportTag extends AbstractTag {
if (StringUtil.isBlank(src)) { if (StringUtil.isBlank(src)) {
return; return;
} }
String prefix = Constants.WEB_APP; String prefix = getRequestBasePath();
StringBuffer linkUrl = new StringBuffer(); StringBuffer linkUrl = new StringBuffer();
if (src.startsWith(prefix)) { if (src.startsWith(prefix)) {
linkUrl.append(src); linkUrl.append(src);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment