【SDK】【修复】【针对MRFS的二次EnCode的编码问题进行JAVA服务端的优化】

潘卓然Y7000P · 潘卓然Y7000P · commit c6e830017e54 · 2020-09-25T15:55:47.000+08:00
diff --git a/src/config/opensource/cesium-plugin-debug-config.js b/src/config/opensource/cesium-plugin-debug-config.js
@@ -4,7 +4,7 @@ const BuildInfo = require('./version/version.js')
 // const CopywebpackPlugin = require('copy-webpack-plugin');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 
-var packageName = "webclient-cesium-plugins";
+var packageName = "webclient-cesium-plugin";
 var banner = `
     datastore-cesium.(www.smaryun.com)
     Copyright© 2000-2018 MapGis
diff --git a/src/config/opensource/cesium-plugin-release-config.js b/src/config/opensource/cesium-plugin-release-config.js
@@ -3,7 +3,7 @@ var path = require('path');
 const BuildInfo = require('./version/version.js')
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 
-var packageName = "webclient-cesium-plugins.min";
+var packageName = "webclient-cesium-plugin.min";
 var banner = `
     datastore-cesium.(www.smaryun.com)
     Copyright© 2000-2018 MapGis
diff --git a/src/service/MRFS/QueryServiceBase.js b/src/service/MRFS/QueryServiceBase.js
@@ -130,8 +130,11 @@ class QueryServiceBase extends ServiceBase {
         }
         if (way.toUpperCase() === 'GET') {
             fullRestUrl += '?' + this.queryParam.getParameterURL();
-            // 必须encodeURI,避免url中出现特殊字符导致请求出错
-            fullRestUrl = encodeURI(fullRestUrl);
+            // @date 20181022 邬俊惠 必须encodeURI,避免url中出现特殊字符导致请求出错
+            // @date 20200925 潘卓然 这里由于原来的 fullRestUrl = this.getFullUrl(); 是encode的，
+            // 导致上面的this.queryParam.getParameterURL()这部分没有编码，因此原来是在后面加了下面一行来确保编码
+            // 但是由于.NET能够处理2次encode的问题，JAVA不能处理所以统一换成了1次encode，后面不需要放开这段代码
+            // fullRestUrl = encodeURI(fullRestUrl);
         } else {
             dataObject = this.queryParam.getParameterObject();
         }

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,11 @@ class QueryServiceBase extends ServiceBase {`
`130`	`130`	`}`
`131`	`131`	`if (way.toUpperCase() === 'GET') {`
`132`	`132`	`fullRestUrl += '?' + this.queryParam.getParameterURL();`
`133`		`- // 必须encodeURI,避免url中出现特殊字符导致请求出错`
`134`		`- fullRestUrl = encodeURI(fullRestUrl);`
	`133`	`+ // @date 20181022 邬俊惠必须encodeURI,避免url中出现特殊字符导致请求出错`
	`134`	`+ // @date 20200925 潘卓然这里由于原来的 fullRestUrl = this.getFullUrl(); 是encode的，`
	`135`	`+ // 导致上面的this.queryParam.getParameterURL()这部分没有编码，因此原来是在后面加了下面一行来确保编码`
	`136`	`+ // 但是由于.NET能够处理2次encode的问题，JAVA不能处理所以统一换成了1次encode，后面不需要放开这段代码`
	`137`	`+ // fullRestUrl = encodeURI(fullRestUrl);`
`135`	`138`	`} else {`
`136`	`139`	`dataObject = this.queryParam.getParameterObject();`
`137`	`140`	`}`