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
2213facd
Commit
2213facd
authored
Jun 05, 2020
by
雍欢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改web_app.name赋值方式,使项目可以部署到 / 下面
parent
1ff3e080
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
403 additions
and
347 deletions
+403
-347
Index.jsp
huigou-xt/src/main/webapp/Index.jsp
+342
-307
job.jsp
huigou-xt/src/main/webapp/WEB-INF/decorators/job.jsp
+7
-0
main.jsp
huigou-xt/src/main/webapp/WEB-INF/decorators/main.jsp
+45
-37
print.jsp
huigou-xt/src/main/webapp/WEB-INF/decorators/print.jsp
+7
-1
FreeFlowBackQuery.jsp
huigou-xt/src/main/webapp/system/bpm/FreeFlowBackQuery.jsp
+1
-1
headBase.ftl
huigou-xt/src/main/webapp/template/simple/headBase.ftl
+1
-1
No files found.
huigou-xt/src/main/webapp/Index.jsp
View file @
2213facd
This diff is collapsed.
Click to expand it.
huigou-xt/src/main/webapp/WEB-INF/decorators/job.jsp
View file @
2213facd
...
...
@@ -12,6 +12,10 @@
response
.
setHeader
(
"Cache-Control"
,
"No-cache"
);
response
.
setDateHeader
(
"Expires"
,
-
1
);
response
.
setHeader
(
"Cache-Control"
,
"No-store"
);
String
serverHost
=
request
.
getScheme
()
+
"://"
+
request
.
getServerName
()
+
":"
+
request
.
getServerPort
();
String
basePath
=
serverHost
+
request
.
getContextPath
();
request
.
setAttribute
(
"basePath"
,
basePath
);
%>
<!DOCTYPE html>
<html>
...
...
@@ -27,6 +31,9 @@
<meta
http-equiv=
"cache-control"
content=
"no-cache"
>
<meta
name=
"format-detection"
content=
"telephone=no,email=no,address=no"
>
<!--[if (gt IE 9)|!(IE)]><!-->
<x:link
href=
"/themes/font-face.css"
/>
<!--<![endif]-->
<script
type=
"application/javascript"
>
var
web_app
=
{
name
:
'${basePath}'
};
</script>
<x:base
include=
"base,grid,tree,layout,dialog,combox,comboDialog,selectOrg,commonTree"
/>
<x:link
href=
"/themes/extend.css"
/>
<!--[if lt IE 9]>
...
...
huigou-xt/src/main/webapp/WEB-INF/decorators/main.jsp
View file @
2213facd
<%@ page
contentType=
"text/html; charset=UTF-8"
%>
<%@ page
contentType=
"text/html; charset=UTF-8"
%>
<%@ page
import=
"com.huigou.context.ContextUtil"
%>
<%@ page
import=
"com.huigou.util.Constants"
%>
<%@ taglib
uri=
"http://www.opensymphony.com/sitemesh/decorator"
prefix=
"decorator"
%>
<%@ taglib
uri=
"http://www.opensymphony.com/sitemesh/page"
prefix=
"page"
%>
<%@ taglib
uri=
"http://java.sun.com/jsp/jstl/core"
prefix=
"c"
%>
<%@ taglib
uri=
"/WEB-INF/taglib.tld"
prefix=
"x"
%>
<%@ taglib
uri=
"/WEB-INF/JSTLFunction.tld"
prefix=
"f"
%>
<%@ taglib
uri=
"http://www.opensymphony.com/sitemesh/decorator"
prefix=
"decorator"
%>
<%@ taglib
uri=
"http://www.opensymphony.com/sitemesh/page"
prefix=
"page"
%>
<%@ taglib
uri=
"http://java.sun.com/jsp/jstl/core"
prefix=
"c"
%>
<%@ taglib
uri=
"/WEB-INF/taglib.tld"
prefix=
"x"
%>
<%@ taglib
uri=
"/WEB-INF/JSTLFunction.tld"
prefix=
"f"
%>
<%
String
token
=
(
String
)
ContextUtil
.
getSession
().
getAttribute
(
Constants
.
CSRF_TOKEN
);
response
.
setHeader
(
"Pragma"
,
"No-cache"
);
response
.
setHeader
(
"Cache-Control"
,
"No-cache"
);
response
.
setDateHeader
(
"Expires"
,
-
1
);
response
.
setHeader
(
"Cache-Control"
,
"No-store"
);
String
token
=
(
String
)
ContextUtil
.
getSession
().
getAttribute
(
Constants
.
CSRF_TOKEN
);
response
.
setHeader
(
"Pragma"
,
"No-cache"
);
response
.
setHeader
(
"Cache-Control"
,
"No-cache"
);
response
.
setDateHeader
(
"Expires"
,
-
1
);
response
.
setHeader
(
"Cache-Control"
,
"No-store"
);
String
serverHost
=
request
.
getScheme
()
+
"://"
+
request
.
getServerName
()
+
":"
+
request
.
getServerPort
();
String
basePath
=
serverHost
+
request
.
getContextPath
();
request
.
setAttribute
(
"basePath"
,
basePath
);
%>
<!DOCTYPE html>
<html>
<head>
<meta
charset=
"utf-8"
/>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge,Chrome=1"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1, shrink-to-fit=no"
/>
<!-- 360浏览器默认使用Webkit内核 -->
<meta
name=
"renderer"
content=
"webkit"
>
<title><decorator:title
default=
"
${
f:
systemParameter
(
'SYSTEM.NAME'
)
}
"
/></title>
<meta
http-equiv=
"expires"
content=
"0"
>
<meta
http-equiv=
"pragma"
content=
"no-cache"
>
<meta
http-equiv=
"cache-control"
content=
"no-cache"
>
<meta
name=
"format-detection"
content=
"telephone=no,email=no,address=no"
>
<!--[if (gt IE 9)|!(IE)]><!-->
<x:link
href=
"/themes/font-face.css"
/>
<!--<![endif]-->
<x:base
include=
"base"
/>
<x:link
href=
"/themes/extend.css"
/>
<!--[if lt IE 9]>
<head>
<meta
charset=
"utf-8"
/>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge,Chrome=1"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1, shrink-to-fit=no"
/>
<!-- 360浏览器默认使用Webkit内核 -->
<meta
name=
"renderer"
content=
"webkit"
>
<title><decorator:title
default=
"
${
f:
systemParameter
(
'SYSTEM.NAME'
)
}
"
/></title>
<meta
http-equiv=
"expires"
content=
"0"
>
<meta
http-equiv=
"pragma"
content=
"no-cache"
>
<meta
http-equiv=
"cache-control"
content=
"no-cache"
>
<meta
name=
"format-detection"
content=
"telephone=no,email=no,address=no"
>
<!--[if (gt IE 9)|!(IE)]><!-->
<x:link
href=
"/themes/font-face.css"
/>
<!--<![endif]-->
<script
type=
"application/javascript"
>
var
web_app
=
{
name
:
'${basePath}'
};
</script>
<x:base
include=
"base"
/>
<x:link
href=
"/themes/extend.css"
/>
<!--[if lt IE 9]>
<x:script
src=
'/lib/bootstrap/html5shiv.min.js'
/>
<x:script
src=
'/lib/bootstrap/respond.min.js'
/>
<![endif]-->
<decorator:head/>
<x:script
src=
'/common/OPpermission.jsp'
/>
</head>
<body>
<input
type=
"hidden"
id=
"csrfTokenElement"
value=
"
<%=
token
%>
"
/>
<x:hidden
name=
"isReadOnly"
id=
"mainPageReadOnlyFlag"
/>
<div
id=
"ui-screen-over-loading"
class=
"ui-main-page-loading"
></div>
<div
class=
"main-package-over"
>
<decorator:body/>
</div>
</body>
<decorator:head/>
<x:script
src=
'/common/OPpermission.jsp'
/>
</head>
<body>
<input
type=
"hidden"
id=
"csrfTokenElement"
value=
"
<%=
token
%>
"
/>
<x:hidden
name=
"isReadOnly"
id=
"mainPageReadOnlyFlag"
/>
<div
id=
"ui-screen-over-loading"
class=
"ui-main-page-loading"
></div>
<div
class=
"main-package-over"
>
<decorator:body/>
</div>
</body>
</html>
\ No newline at end of file
huigou-xt/src/main/webapp/WEB-INF/decorators/print.jsp
View file @
2213facd
...
...
@@ -7,13 +7,19 @@
<%@ taglib
uri=
"http://java.sun.com/jsp/jstl/core"
prefix=
"c"
%>
<%
String
token
=
(
String
)
ContextUtil
.
getSession
().
getAttribute
(
Constants
.
CSRF_TOKEN
);
String
serverHost
=
request
.
getScheme
()
+
"://"
+
request
.
getServerName
()
+
":"
+
request
.
getServerPort
();
String
basePath
=
serverHost
+
request
.
getContextPath
();
request
.
setAttribute
(
"basePath"
,
basePath
);
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
xmlns=
"http://www.w3.org/1999/xhtml"
>
<head>
<title><decorator:title /></title>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
/>
<meta
name=
"format-detection"
content=
"telephone=no,email=no,address=no"
>
<meta
name=
"format-detection"
content=
"telephone=no,email=no,address=no"
>
<script
type=
"application/javascript"
>
var
web_app
=
{
name
:
'${basePath}'
};
</script>
<x:base
include=
"base"
/>
<x:link
href=
"/themes/css/print.css"
/>
<x:script
src=
'/javaScript/print.js'
/>
...
...
huigou-xt/src/main/webapp/system/bpm/FreeFlowBackQuery.jsp
View file @
2213facd
...
...
@@ -5,7 +5,7 @@
<head>
<x:base
include=
"layout,dialog,grid,dateTime"
/>
<script
src=
'
<c:url
value=
"/javaScript/UICtrl.js"
/>
'
type=
"text/javascript"
></script>
<
script
src=
'
<c:url
value=
"/javaScript/WEB_APP.js"
/>
'
type=
"text/javascript"
></script
>
<
%--<script src='<c:url value="/javaScript/WEB_APP.js"/>' type="text/javascript"></script>--%
>
<script
src=
'
<c:url
value=
"/javaScript/common.js"
/>
'
type=
"text/javascript"
></script>
<script
src=
'
<c:url
value=
"/system/bpm/FreeFlowBackQuery.js"
/>
'
type=
"text/javascript"
></script>
</head>
...
...
huigou-xt/src/main/webapp/template/simple/headBase.ftl
View file @
2213facd
...
...
@@ -3,7 +3,7 @@
<link href='${parameters.webApp?default("")?html}/themes/fontawesome/css/font-awesome.min.css' rel='stylesheet' type='text/css'/>
<link href='${parameters.webApp?default("")?html}/themes/css/style.css?v=20181010' rel='stylesheet' type='text/css'/>
<link href='${parameters.webApp?default("")?html}/themes/css/ui.css?v=20181009' rel='stylesheet' type='text/css'/>
<script src='${parameters.webApp?default("")?html}/javaScript/WEB_APP.js' type='text/javascript'></script
>
<#-- <script src='${parameters.webApp?default("")?html}/javaScript/WEB_APP.js' type='text/javascript'></script>--
>
<script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.min.js' type='text/javascript'></script>
<script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.json-2.4.min.js' type='text/javascript'></script>
<script src='${parameters.webApp?default("")?html}/lib/jquery/jquery.i18n.properties.js' type='text/javascript'></script>
...
...
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