Skip to content

Commit 8671c38

Browse files
billchen198318billchen198318
committed
update code and page modify url slash.
1 parent fdcc3a7 commit 8671c38

36 files changed

Lines changed: 161 additions & 154 deletions

‎core-base/src/com/netsteadfast/greenstep/util/MenuSupportUtils.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,24 @@ public static TbSysProg loadSysProg(String progId) throws ServiceException, Exce
122122
}
123123
return tbSysProg;
124124
}
125-
125+
126+
private static String getUrlPath(String url, String slash) {
127+
if (url.endsWith(slash)) {
128+
return url;
129+
}
130+
return url + slash;
131+
}
132+
126133
public static String getUrl(String basePath, TbSys sys, TbSysProg sysProg, String jsessionId) throws Exception {
127134
String url = "";
128135
if (YesNo.YES.equals(sys.getIsLocal())) {
129-
url = basePath + "/" + sysProg.getUrl() + ( (sysProg.getUrl().indexOf("?")>0 || sysProg.getUrl().indexOf("&")>0) ? "&" : "?" ) + Constants.IS_DOJOX_CONTENT_PANE_XHR_LOAD + "=" + YesNo.YES;
136+
url = getUrlPath(basePath, "/") + sysProg.getUrl() + ( (sysProg.getUrl().indexOf("?")>0 || sysProg.getUrl().indexOf("&")>0) ? "&" : "?" ) + Constants.IS_DOJOX_CONTENT_PANE_XHR_LOAD + "=" + YesNo.YES;
130137
} else {
131138
String head = "http://";
132139
if (basePath.startsWith("https")) {
133140
head = "https://";
134141
}
135-
url = head + sys.getHost() + "/" + sys.getContextPath() + "/" + sysProg.getUrl()
142+
url = head + getUrlPath(sys.getHost(), "/") + getUrlPath(sys.getContextPath(), "/") + sysProg.getUrl()
136143
+ ( (sysProg.getUrl().indexOf("?")>0 || sysProg.getUrl().indexOf("&")>0) ? "&" : "?" ) + Constants.IS_DOJOX_CONTENT_PANE_XHR_LOAD + "=" + YesNo.YES;
137144
//+ "&" + Constants.APP_SITE_CROSS_JSESS_ID_PARAM + "=" + jsessionId;
138145

‎core-web/WebContent/pages/common-froala-editor.jsp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ if (!StringUtils.isBlank(uploadOid)) {
4545
<meta http-equiv="description" content="bambooCORE">
4646

4747

48-
<link href="<%=mainSysBasePath%>/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
48+
<link href="<%=mainSysBasePath%>font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
4949

5050

51-
<script type="text/javascript" src="<%=mainSysBasePath%>/jquery/jquery-3.2.1.min.js"></script>
51+
<script type="text/javascript" src="<%=mainSysBasePath%>jquery/jquery-3.2.1.min.js"></script>
5252

5353

5454
<!-- Include Editor style. -->
55-
<link href="<%=mainSysBasePath%>/froala_editor/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />
56-
<link href="<%=mainSysBasePath%>/froala_editor/css/froala_style.min.css" rel="stylesheet" type="text/css" />
55+
<link href="<%=mainSysBasePath%>froala_editor/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />
56+
<link href="<%=mainSysBasePath%>froala_editor/css/froala_style.min.css" rel="stylesheet" type="text/css" />
5757
<!-- Include Editor JS files. -->
58-
<script type="text/javascript" src="<%=mainSysBasePath%>/froala_editor/js/froala_editor.pkgd.min.js"></script>
58+
<script type="text/javascript" src="<%=mainSysBasePath%>froala_editor/js/froala_editor.pkgd.min.js"></script>
5959

6060

6161
<script type="text/javascript">

‎core-web/WebContent/pages/header.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
99
<table border="0" width="100%" cellpadding="0" cellspacing="0">
1010
<tr valign="top">
1111
<td align="left" valign="middle" bgcolor="#F5F5F5">
12-
<img src="<%=basePath%>/images/head_logo.jpg" border="0" alt="logo" style="vertical-align:middle;margin-top:0.25em"/>&nbsp;&nbsp;<font size='2' color='#394045' style="vertical-align:middle;margin-top:0.25em"><b><s:property value="programName"/></b></font>
12+
<img src="<%=basePath%>images/head_logo.jpg" border="0" alt="logo" style="vertical-align:middle;margin-top:0.25em"/>&nbsp;&nbsp;<font size='2' color='#394045' style="vertical-align:middle;margin-top:0.25em"><b><s:property value="programName"/></b></font>
1313
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<font size='1' color="#F5F5F5">ID:&nbsp;<s:property value="programId"/></font>
1414
<br/>
1515
<hr color="#3794E5" size="2">

‎core-web/WebContent/pages/index.jsp‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,30 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
3030
<link rel="stylesheet" href="<%=basePath%>${dojoLocal}/dijit/themes/flat/flat.css?ver=${jsVerBuild}">
3131

3232

33-
<link rel="stylesheet" href="<%=basePath%>/css/core.css?ver=${jsVerBuild}" media="screen">
33+
<link rel="stylesheet" href="<%=basePath%>css/core.css?ver=${jsVerBuild}" media="screen">
3434

35-
<link rel="stylesheet" href="<%=basePath%>/d3/nv.d3.css">
35+
<link rel="stylesheet" href="<%=basePath%>d3/nv.d3.css">
3636

37-
<link rel="stylesheet" href="<%=basePath%>/leaflet/leaflet.css?ver=${jsVerBuild}" />
37+
<link rel="stylesheet" href="<%=basePath%>leaflet/leaflet.css?ver=${jsVerBuild}" />
3838

3939
<script type="text/javascript" src="<%=basePath%>core.configJsAction.action?ver=${jsVerBuild}&lc=${LocaleCode}&refreshUUID=${uuid}"></script>
4040
<script type="text/javascript" src="<%=basePath%>core.generateMenuJs.action?ver=${jsVerBuild}&lc=${LocaleCode}&refreshUUID=${uuid}"></script>
4141

42-
<script src="<%=basePath%>/leaflet/leaflet.js?ver=${jsVerBuild}"></script>
42+
<script src="<%=basePath%>leaflet/leaflet.js?ver=${jsVerBuild}"></script>
4343

4444
<script>
4545
var dojoConfig = {
4646
parseOnLoad: true,
4747
packages: [
48-
{ name: "d3", location: "<%=basePath%>/d3/", main: "d3" },
49-
{ name: "nv", location: "<%=basePath%>/d3/", main: "nv.d3" }
48+
{ name: "d3", location: "<%=basePath%>d3/", main: "d3" },
49+
{ name: "nv", location: "<%=basePath%>d3/", main: "nv.d3" }
5050
]
5151
};
5252
</script>
5353
<script type="text/javascript" src="<%=basePath%>${dojoLocal}/dojo/dojo.js?ver=${jsVerBuild}"></script>
54-
<script type="text/javascript" src="<%=basePath%>/js/home.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
55-
<script type="text/javascript" src="<%=basePath%>/js/core.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
56-
<script type="text/javascript" src="<%=basePath%>/js/page.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
54+
<script type="text/javascript" src="<%=basePath%>js/home.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
55+
<script type="text/javascript" src="<%=basePath%>js/core.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
56+
<script type="text/javascript" src="<%=basePath%>js/page.js?ver=${jsVerBuild}" djConfig="parseOnLoad: true"></script>
5757

5858
<s:if test=" \"Y\" == googleMapEnable ">
5959
<!--
@@ -65,49 +65,49 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
6565
<!-- modify applicationContext-appSettings.properties settings googleMap.enable=Y -->
6666
</s:else>
6767

68-
<script type="text/javascript" src="<%=basePath%>/jquery/jquery-3.2.1.min.js"></script>
69-
<script type="text/javascript" src="<%=basePath%>/html2canvas/html2canvas.js"></script>
70-
<script type="text/javascript" src="<%=basePath%>/html2canvas/html2canvas.svg.js"></script>
68+
<script type="text/javascript" src="<%=basePath%>jquery/jquery-3.2.1.min.js"></script>
69+
<script type="text/javascript" src="<%=basePath%>html2canvas/html2canvas.js"></script>
70+
<script type="text/javascript" src="<%=basePath%>html2canvas/html2canvas.svg.js"></script>
7171

72-
<script type="text/javascript" src="<%=basePath%>/canvg/canvg.js"></script>
73-
<script type="text/javascript" src="<%=basePath%>/canvg/rgbcolor.js"></script>
74-
<script type="text/javascript" src="<%=basePath%>/canvg/StackBlur.js"></script>
72+
<script type="text/javascript" src="<%=basePath%>canvg/canvg.js"></script>
73+
<script type="text/javascript" src="<%=basePath%>canvg/rgbcolor.js"></script>
74+
<script type="text/javascript" src="<%=basePath%>canvg/StackBlur.js"></script>
7575

7676

77-
<script type="text/javascript" src="<%=basePath%>/signature_pad/signature_pad.js"></script>
77+
<script type="text/javascript" src="<%=basePath%>signature_pad/signature_pad.js"></script>
7878

7979

8080
<!-- Highcharts -->
81-
<script src="<%=basePath%>/highcharts/js/highcharts.js"></script>
82-
<script src="<%=basePath%>/highcharts/js/highcharts-3d.js"></script>
83-
<script src="<%=basePath%>/highcharts/js/highcharts-more.js"></script>
84-
<script src="<%=basePath%>/highcharts/js/modules/heatmap.js"></script>
85-
<script src="<%=basePath%>/highcharts/js/modules/exporting.js"></script>
86-
<script src="<%=basePath%>/highcharts/js/modules/solid-gauge.js"></script>
81+
<script src="<%=basePath%>highcharts/js/highcharts.js"></script>
82+
<script src="<%=basePath%>highcharts/js/highcharts-3d.js"></script>
83+
<script src="<%=basePath%>highcharts/js/highcharts-more.js"></script>
84+
<script src="<%=basePath%>highcharts/js/modules/heatmap.js"></script>
85+
<script src="<%=basePath%>highcharts/js/modules/exporting.js"></script>
86+
<script src="<%=basePath%>highcharts/js/modules/solid-gauge.js"></script>
8787

8888

8989
<!-- ################################################################################ -->
9090
<!-- jqPlot -->
91-
<script type="text/javascript" src="<%=basePath%>/jqplot/jquery.jqplot.js"></script>
92-
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.meterGaugeRenderer.js"></script>
91+
<script type="text/javascript" src="<%=basePath%>jqplot/jquery.jqplot.js"></script>
92+
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.meterGaugeRenderer.js"></script>
9393

9494
<!-- jqPlot plugins -->
95-
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.barRenderer.js"></script>
96-
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.categoryAxisRenderer.js"></script>
97-
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.pointLabels.js"></script>
95+
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.barRenderer.js"></script>
96+
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.categoryAxisRenderer.js"></script>
97+
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.pointLabels.js"></script>
9898

99-
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.dateAxisRenderer.js"></script>
100-
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.canvasTextRenderer.js"></script>
101-
<script type="text/javascript" src="<%=basePath%>/jqplot/plugins/jqplot.canvasAxisTickRenderer.js"></script>
99+
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.dateAxisRenderer.js"></script>
100+
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.canvasTextRenderer.js"></script>
101+
<script type="text/javascript" src="<%=basePath%>jqplot/plugins/jqplot.canvasAxisTickRenderer.js"></script>
102102

103-
<link rel="stylesheet" type="text/css" href="<%=basePath%>/jqplot/jquery.jqplot.css" />
103+
<link rel="stylesheet" type="text/css" href="<%=basePath%>jqplot/jquery.jqplot.css" />
104104
<!-- ################################################################################ -->
105105

106106

107107
<!-- ################################################################################ -->
108108
<!-- OrgChart -->
109-
<script type="text/javascript" src="<%=basePath%>/OrgChart/jquery.orgchart.js"></script>
110-
<link rel="stylesheet" type="text/css" href="<%=basePath%>/OrgChart/jquery.orgchart.css" />
109+
<script type="text/javascript" src="<%=basePath%>OrgChart/jquery.orgchart.js"></script>
110+
<link rel="stylesheet" type="text/css" href="<%=basePath%>OrgChart/jquery.orgchart.css" />
111111
<!-- ################################################################################ -->
112112

113113
<style type="text/css">

‎core-web/WebContent/pages/role/user-role-management.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
2525
<style type="text/css">
2626
2727
.buttonBackNav {
28-
background-image: url(<%=basePath%>/icons/stock_left.png);
28+
background-image: url(<%=basePath%>icons/stock_left.png);
2929
background-repeat: no-repeat;
3030
width: 16px;
3131
height: 16px;
3232
text-align: center;
3333
}
3434
.buttonForwardNav {
35-
background-image: url(<%=basePath%>/icons/stock_right.png);
35+
background-image: url(<%=basePath%>icons/stock_right.png);
3636
background-repeat: no-repeat;
3737
width: 16px;
3838
height: 16px;

‎core-web/WebContent/pages/sys-common/codeeditor.jsp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
2222
<meta http-equiv="keywords" content="bambooCORE">
2323
<meta http-equiv="description" content="bambooCORE">
2424

25-
<script src="<%=basePath%>/codemirror/lib/codemirror.js" type="text/javascript"></script>
26-
<script src="<%=basePath%>/codemirror/addon/edit/matchbrackets.js"></script>
27-
<script src="<%=basePath%>/codemirror/addon/hint/show-hint.js"></script>
28-
<script src="<%=basePath%>/codemirror/mode/clike/clike.js"></script>
25+
<script src="<%=basePath%>codemirror/lib/codemirror.js" type="text/javascript"></script>
26+
<script src="<%=basePath%>codemirror/addon/edit/matchbrackets.js"></script>
27+
<script src="<%=basePath%>codemirror/addon/hint/show-hint.js"></script>
28+
<script src="<%=basePath%>codemirror/mode/clike/clike.js"></script>
2929
<!--
30-
<link rel="stylesheet" type="text/css" href="<%=basePath%>/codemirror/doc/docs.css" />
30+
<link rel="stylesheet" type="text/css" href="<%=basePath%>codemirror/doc/docs.css" />
3131
-->
32-
<link rel="stylesheet" type="text/css" href="<%=basePath%>/codemirror/lib/codemirror.css" />
33-
<link rel="stylesheet" href="<%=basePath%>/codemirror/addon/hint/show-hint.css">
32+
<link rel="stylesheet" type="text/css" href="<%=basePath%>codemirror/lib/codemirror.css" />
33+
<link rel="stylesheet" href="<%=basePath%>codemirror/addon/hint/show-hint.css">
3434

3535

36-
<script src="<%=basePath%>/codemirror/mode/xml/xml.js"></script>
37-
<script src="<%=basePath%>/codemirror/mode/javascript/javascript.js"></script>
38-
<script src="<%=basePath%>/codemirror/mode/css/css.js"></script>
39-
<script src="<%=basePath%>/codemirror/mode/htmlmixed/htmlmixed.js"></script>
40-
<script src="<%=basePath%>/codemirror/addon/mode/multiplex.js"></script>
41-
<script src="<%=basePath%>/codemirror/mode/htmlembedded/htmlembedded.js"></script>
36+
<script src="<%=basePath%>codemirror/mode/xml/xml.js"></script>
37+
<script src="<%=basePath%>codemirror/mode/javascript/javascript.js"></script>
38+
<script src="<%=basePath%>codemirror/mode/css/css.js"></script>
39+
<script src="<%=basePath%>codemirror/mode/htmlmixed/htmlmixed.js"></script>
40+
<script src="<%=basePath%>codemirror/addon/mode/multiplex.js"></script>
41+
<script src="<%=basePath%>codemirror/mode/htmlembedded/htmlembedded.js"></script>
4242

4343

4444
<style type="text/css">

‎core-web/WebContent/pages/sys-expression/sys-expression-create.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function ${programId}_page_message() {
128128
<gs:label text="${action.getText('CORE_PROG003D0002A_iframe1')}" id="CORE_PROG003D0002A_iframe1" requiredFlag="Y"></gs:label>
129129
<gs:inputfieldNoticeMsgLabel id="CORE_PROG003D0002A_content_noticeMsgLabelOnly"></gs:inputfieldNoticeMsgLabel>
130130
<br/>
131-
<iframe name="CORE_PROG003D0002A_iframe1" id="CORE_PROG003D0002A_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>/core.commonCodeEditorAction.action'></iframe>
131+
<iframe name="CORE_PROG003D0002A_iframe1" id="CORE_PROG003D0002A_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>core.commonCodeEditorAction.action'></iframe>
132132

133133
</div>
134134
</div>

‎core-web/WebContent/pages/sys-expression/sys-expression-edit.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function ${programId}_page_message() {
127127
<gs:label text="${action.getText('CORE_PROG003D0002E_iframe1')}" id="CORE_PROG003D0002E_iframe1" requiredFlag="Y"></gs:label>
128128
<gs:inputfieldNoticeMsgLabel id="CORE_PROG003D0002E_content_noticeMsgLabelOnly"></gs:inputfieldNoticeMsgLabel>
129129
<br/>
130-
<iframe name="CORE_PROG003D0002E_iframe1" id="CORE_PROG003D0002E_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>/core.commonCodeEditorAction.action?oid=${exprOid}'></iframe>
130+
<iframe name="CORE_PROG003D0002E_iframe1" id="CORE_PROG003D0002E_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>core.commonCodeEditorAction.action?oid=${exprOid}'></iframe>
131131

132132
</div>
133133
</div>

‎core-web/WebContent/pages/sys-form-method/sys-form-method-create.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function ${programId}_page_message() {
120120
<gs:label text="${action.getText('CORE_PROG001D0014A_iframe1')}" id="CORE_PROG001D0014A_iframe1" requiredFlag="Y"></gs:label>
121121
<gs:inputfieldNoticeMsgLabel id="CORE_PROG001D0014A_expressionNoticeMsgLabelOnly"></gs:inputfieldNoticeMsgLabel>
122122
<br/>
123-
<iframe name="CORE_PROG001D0014A_iframe1" id="CORE_PROG001D0014A_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>/core.commonCodeEditorAction.action'></iframe>
123+
<iframe name="CORE_PROG001D0014A_iframe1" id="CORE_PROG001D0014A_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>core.commonCodeEditorAction.action'></iframe>
124124

125125
</div>
126126
</div>

‎core-web/WebContent/pages/sys-form-method/sys-form-method-edit.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function ${programId}_page_message() {
120120
<gs:label text="${action.getText('CORE_PROG001D0014E_iframe1')}" id="CORE_PROG001D0014E_iframe1" requiredFlag="Y"></gs:label>
121121
<gs:inputfieldNoticeMsgLabel id="CORE_PROG001D0014E_expressionNoticeMsgLabelOnly"></gs:inputfieldNoticeMsgLabel>
122122
<br/>
123-
<iframe name="CORE_PROG001D0014E_iframe1" id="CORE_PROG001D0014E_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>/core.commonCodeEditorAction.action?oid=${exprOid}'></iframe>
123+
<iframe name="CORE_PROG001D0014E_iframe1" id="CORE_PROG001D0014E_iframe1" style='width:100%;height:300px;border:0px' border='0' scrolling='no' src='<%=basePath%>core.commonCodeEditorAction.action?oid=${exprOid}'></iframe>
124124

125125
</div>
126126
</div>

0 commit comments

Comments
 (0)