Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
test
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
邬友楠
test
Commits
b739224d
Commit
b739224d
authored
Jun 05, 2020
by
雍欢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改web_app.name赋值方式,使项目可以部署到 / 下面
parent
e5a211f2
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
23 deletions
+28
-23
PlugInFilter.java
...rc/main/java/com/huigou/uasp/bmp/plugin/PlugInFilter.java
+1
-0
AbstractTag.java
...c/main/java/com/huigou/uasp/client/views/AbstractTag.java
+19
-14
HeadBaseTag.java
...c/main/java/com/huigou/uasp/client/views/HeadBaseTag.java
+1
-3
I18NTag.java
...p/src/main/java/com/huigou/uasp/client/views/I18NTag.java
+5
-2
LinkImportTag.java
...main/java/com/huigou/uasp/client/views/LinkImportTag.java
+1
-2
ScriptImportTag.java
...in/java/com/huigou/uasp/client/views/ScriptImportTag.java
+1
-2
No files found.
huigou-uasp/src/main/java/com/huigou/uasp/bmp/plugin/PlugInFilter.java
View file @
b739224d
...
@@ -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
;
...
...
huigou-uasp/src/main/java/com/huigou/uasp/client/views/AbstractTag.java
View file @
b739224d
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
;
...
...
huigou-uasp/src/main/java/com/huigou/uasp/client/views/HeadBaseTag.java
View file @
b739224d
...
@@ -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
()
);
}
}
}
}
huigou-uasp/src/main/java/com/huigou/uasp/client/views/I18NTag.java
View file @
b739224d
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
);
}
}
...
...
huigou-uasp/src/main/java/com/huigou/uasp/client/views/LinkImportTag.java
View file @
b739224d
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
);
...
...
huigou-uasp/src/main/java/com/huigou/uasp/client/views/ScriptImportTag.java
View file @
b739224d
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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment