Merge branch 'ver1.1' of http://192.168.0.204/yzg/yzg-util

yzg-util-base/src/main/java/com/yanzuoguang/util/helper/UrlHelper.java

@@ -198,14 +198,14 @@ public class UrlHelper {
      */
     public static String getFullUrl(String simpleUrl, String simpleBaseUrl, String defBaseUrl) {
         // 获取请求地址
-        String tbdUrl = StringHelper.getFirst(simpleBaseUrl, defBaseUrl);
+        String baseUrl = StringHelper.getFirst(simpleBaseUrl, defBaseUrl);
         // 获取全路径
-        String toSimpleFullUrl = getFUllUrl(tbdUrl, simpleUrl);
+        String toSimpleFullUrl = getFUllUrl(baseUrl, simpleUrl);
         // 最终地址处理
         String toSimpleUrl;
-        if (!StringHelper.compare(simpleBaseUrl, simpleUrl) && toSimpleFullUrl.startsWith(defBaseUrl)) {
+        if (!StringHelper.compare(simpleBaseUrl, defBaseUrl) && toSimpleFullUrl.startsWith(defBaseUrl)) {
             String rightUrl = StringHelper.trimStart(toSimpleFullUrl, defBaseUrl);
-            toSimpleUrl = getFUllUrl(tbdUrl, rightUrl);
+            toSimpleUrl = getFUllUrl(baseUrl, rightUrl);
         } else {
             toSimpleUrl = toSimpleFullUrl;
         }