diff --git a/src/main/java/com/smallchill/core/base/controller/BladeController.java b/src/main/java/com/smallchill/core/base/controller/BladeController.java index cb3b8d03..b2298ed2 100644 --- a/src/main/java/com/smallchill/core/base/controller/BladeController.java +++ b/src/main/java/com/smallchill/core/base/controller/BladeController.java @@ -69,11 +69,16 @@ public class BladeController implements ConstCurd, ConstCache, ConstCacheKey { return new WafRequestWrapper(this.request); } - public boolean isAjax(){ + public boolean isAjax() { String header = getRequest().getHeader("X-Requested-With"); boolean isAjax = "XMLHttpRequest".equalsIgnoreCase(header); return isAjax; } + + public boolean isPost() { + String method = getRequest().getMethod(); + return StrKit.equalsIgnoreCase("POST", method); + } public String getParameter(String name) { return getRequest().getParameter(name); @@ -368,7 +373,7 @@ public class BladeController implements ConstCurd, ConstCache, ConstCacheKey { url = Const.LOGIN_REALPATH;// session过期抛出的异常 msg = ConstShiro.NO_USER; } - if (isAjax()) { + if (isAjax() || isPost()) { result.addFail(msg); resultModel = result; } else { diff --git a/src/main/java/com/smallchill/core/beetl/tag/FootTag.java b/src/main/java/com/smallchill/core/beetl/tag/FootTag.java index 0d5940bf..0016a552 100644 --- a/src/main/java/com/smallchill/core/beetl/tag/FootTag.java +++ b/src/main/java/com/smallchill/core/beetl/tag/FootTag.java @@ -28,7 +28,7 @@ public class FootTag extends Tag { sb.append("
"); sb.append("
"); - sb.append("
"); + sb.append("
"); sb.append(" 技术支持 :"); sb.append(" " + company + ""); sb.append(" "); diff --git a/src/main/java/com/smallchill/core/plugins/dao/MdManager.java b/src/main/java/com/smallchill/core/plugins/dao/MdManager.java index 24e69b9c..bf606630 100644 --- a/src/main/java/com/smallchill/core/plugins/dao/MdManager.java +++ b/src/main/java/com/smallchill/core/plugins/dao/MdManager.java @@ -250,6 +250,7 @@ public class MdManager { PageQuery query = new PageQuery(); query.setPageNumber(pageNum); query.setPageSize(pageSize); + query.setParas(paras); if(StrKit.notBlank(orderBy)){ query.setOrderBy(orderBy); } diff --git a/src/main/webapp/static/map/MapTool.js b/src/main/webapp/static/map/MapTool.js index 6a60e47c..35ae4c1f 100644 --- a/src/main/webapp/static/map/MapTool.js +++ b/src/main/webapp/static/map/MapTool.js @@ -7,8 +7,8 @@ function initMap() { function setCenterZoom(markerArr) { map = new BMap.Map('map'); window.map = map; //将map变量存储在全局 - var p0 = markerArr[0].point.split("|")[0];//获得第一个点的经纬度 - var p1 = markerArr[0].point.split("|")[1]; + var p0 = markerArr[0].point.split(",")[0];//获得第一个点的经纬度 + var p1 = markerArr[0].point.split(",")[1]; var poi = new BMap.Point(p0, p1);//设置地图中心点 map.centerAndZoom(poi, 17);//设置地图的缩放层级 map.enableScrollWheelZoom(); @@ -28,13 +28,13 @@ function addMarker(markerArr) { for (var i = 0; i < markerArr.length; i++) { var json = markerArr[i]; - var p0 = json.point.split("|")[0]; - var p1 = json.point.split("|")[1]; + var p0 = json.point.split(",")[0]; + var p1 = json.point.split(",")[1]; var point = new BMap.Point(p0, p1); var iconImg = createIcon(json.icon); var marker = new BMap.Marker(point, { icon: iconImg }); - //var label = new BMap.Label(json.content.split("|")[0], { offset: new BMap.Size(15, -20) }); + //var label = new BMap.Label(json.content.split(",")[0], { offset: new BMap.Size(15, -20) }); //var result = BMapLib.GeoUtils.isPointInRect(marker.point, map.getBounds()); //if (result == true) { @@ -83,7 +83,7 @@ function createIcon1(json) { var arrow = this._arrow = document.createElement("div"); - arrow.style.background = "url(plugins/map/label.png) no-repeat"; + arrow.style.background = "url(../../static/map/label.png) no-repeat"; arrow.style.position = "absolute"; arrow.style.width = "11px"; arrow.style.height = "9px"; @@ -133,7 +133,7 @@ function createIcon1(json) { } function ComplexCustomOverlay(json) { - this._point = new BMap.Point(json.point.split("|")[0], json.point.split("|")[1]); + this._point = new BMap.Point(json.point.split(",")[0], json.point.split(",")[1]); this._IconStatus = json.IconStatus; this._json = json; this._IconInfo = json.IconInfo; @@ -145,8 +145,8 @@ function AddPolyline(markerArr, strokeColor) { var polylinePointsArray = []; for (var i = 0; i < markerArr.length; i++) { var P = markerArr[i].point; - var p0 = P.split("|")[0]; - var p1 = P.split("|")[1]; + var p0 = P.split(",")[0]; + var p1 = P.split(",")[1]; polylinePointsArray[i] = new BMap.Point(p0, p1); } polyline = new BMap.Polyline(polylinePointsArray, { strokeColor: strokeColor, strokeWeight: 3, strokeOpacity: 0.5 }); diff --git a/src/main/webapp/static/map/map.html b/src/main/webapp/static/map/map.html index a4757b72..91ed4fc5 100644 --- a/src/main/webapp/static/map/map.html +++ b/src/main/webapp/static/map/map.html @@ -33,7 +33,7 @@