Commit b739224d authored by 雍欢's avatar 雍欢

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

parent e5a211f2
......@@ -66,6 +66,7 @@ public class PlugInFilter implements Filter {
/**
* 创建JS文件系统应用名
*/
@Deprecated
private void initPath(String contextPath, String realPath) {
Constants.WEB_APP = contextPath;
OutputStream fout = null;
......
package com.huigou.uasp.client.views;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import com.huigou.context.MessageSourceContext;
import com.huigou.freemarker.FreemarkerUtil;
import com.huigou.util.ClassHelper;
import com.huigou.util.StringUtil;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
import com.huigou.context.MessageSourceContext;
import com.huigou.freemarker.FreemarkerUtil;
import com.huigou.util.ClassHelper;
import com.huigou.util.StringUtil;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* JSP 标签基类
*
*
* @author xxin
*/
public abstract class AbstractTag extends TagSupport {
......@@ -166,14 +165,14 @@ public abstract class AbstractTag extends TagSupport {
/**
* 模板
*
*
* @return
*/
protected abstract String getDefaultTemplate();
/**
* 组合模板路径
*
*
* @return
*/
protected String getTemplate() {
......@@ -247,7 +246,7 @@ public abstract class AbstractTag extends TagSupport {
/**
* 获取上下文环境
*
*
* @return
*/
protected ServletContext getServletContext() {
......@@ -256,7 +255,7 @@ public abstract class AbstractTag extends TagSupport {
/**
* 获取请求
*
*
* @return
*/
protected HttpServletRequest getRequest() {
......@@ -264,6 +263,12 @@ public abstract class AbstractTag extends TagSupport {
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) {
if (key == null) {
return false;
......@@ -273,7 +278,7 @@ public abstract class AbstractTag extends TagSupport {
/**
* 上下文中找参数值
*
*
* @param key
* @param cls
* @return
......
......@@ -2,8 +2,6 @@ package com.huigou.uasp.client.views;
import javax.servlet.jsp.PageContext;
import com.huigou.util.Constants;
public class HeadBaseTag extends AbstractTag {
private static final long serialVersionUID = 5070404679322295999L;
......@@ -41,7 +39,7 @@ public class HeadBaseTag extends AbstractTag {
}
}
}
addParameter("webApp", Constants.WEB_APP);
addParameter("webApp", getRequestBasePath());
}
}
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 {
protected void 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) {
addParameter("dictionary", dictionary);
}
......
package com.huigou.uasp.client.views;
import com.huigou.cache.SystemCache;
import com.huigou.util.Constants;
import com.huigou.util.StringUtil;
/**
......@@ -56,7 +55,7 @@ public class LinkImportTag extends AbstractTag {
if (StringUtil.isBlank(href)) {
return;
}
String prefix = Constants.WEB_APP;
String prefix = getRequestBasePath();
StringBuffer linkUrl = new StringBuffer();
if (href.startsWith(prefix)) {
linkUrl.append(href);
......
package com.huigou.uasp.client.views;
import com.huigou.cache.SystemCache;
import com.huigou.util.Constants;
import com.huigou.util.StringUtil;
/**
......@@ -46,7 +45,7 @@ public class ScriptImportTag extends AbstractTag {
if (StringUtil.isBlank(src)) {
return;
}
String prefix = Constants.WEB_APP;
String prefix = getRequestBasePath();
StringBuffer linkUrl = new StringBuffer();
if (src.startsWith(prefix)) {
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