feign 调用第三方服务中部分特殊符号未转义问题

public void apply(RequestTemplate template) {
? ? Map<String, Collection<String>> _queries = template.queries();
? ? if (!_queries.isEmpty()) {
? ? ? ? //由于在最新的 ?RFC 3986 ?规范，+号是不需要编码的，因此spring 实现的是这个规范，这里就需要参数中进行编码先，兼容旧规范。
? ? ? ? Map<String, Collection<String>> encodeQueries = new HashMap<String, Collection<String>>(_queries.size());
? ? ? ? Iterator<String> iterator = _queries.keySet().iterator();
? ? ? ? Collection<String> encodeValues = null;
? ? ? ? while (iterator.hasNext()) {
? ? ? ? ? ? encodeValues = new ArrayList<>();
? ? ? ? ? ? String key = iterator.next();
? ? ? ? ? ? Collection<String> values = _queries.get(key);
? ? ? ? ? ? for (String _str : values) {
? ? ? ? ? ? ? ? _str = _str.replaceAll("\\+", "%2B");
? ? ? ? ? ? ? ? encodeValues.add(_str);
? ? ? ? ? ? }
? ? ? ? ? ? encodeQueries.put(key, encodeValues);
? ? ? ? }
? ? ? ? template.queries(null);
? ? ? ? template.queries(encodeQueries);
? ? }
}

        <!-- https://mvnrepository.com/artifact/io.github.openfeign/feign-core -->
        <dependency>
            <groupId>io.github.openfeign</groupId>
            <artifactId>feign-core</artifactId>
            <version>10.4.0</version>
        </dependency>

package feign.template;
...
public class Template {
  protected String resolveExpression(Expression expression, Map<String, ?> variables) {
    String resolved = null;
    Object value = variables.get(expression.getName());
    // 1. 调用 SimpleExpression 的 expand() 方法
    return expression.expand(value, this.encode.isEncodingRequired());
  }
}
public final class Expressions {
  static class SimpleExpression extends Expression {
    private final FragmentType type;
    String encode(Object value) {
      // 2. 调用 UriUtils.encodeReserved() 方法，type 参数是 FragmentType.PATH_SEGMENT
      return UriUtils.encodeReserved(value.toString(), type, Util.UTF_8);
    }
    @Override
    String expand(Object variable, boolean encode) {
      StringBuilder expanded = new StringBuilder();
      expanded.append((encode) ? encode(variable) : variable);
      String result = expanded.toString();
      return result;
    }
  }
}

public class UriUtils {  
  public static String encodeReserved(String value, FragmentType type, Charset charset) {
    return encodeChunk(value, type, charset);
  }  
  private static String encodeChunk(String value, FragmentType type, Charset charset) {
    byte[] data = value.getBytes(charset);
    ByteArrayOutputStream encoded = new ByteArrayOutputStream();
    for (byte b : data) {
      if (type.isAllowed(b)) {
      // 3.1 如果不需要转义，则不进行转义操作
        encoded.write(b);
      } else {
        /* percent encode the byte */
        // 3.2 否则，进行编码
        pctEncode(b, encoded);
      }
    }
    return new String(encoded.toByteArray());
  }
  
  enum FragmentType {
    URI {
      @Override
      boolean isAllowed(int c) {
        return isUnreserved(c);
      }
    },
    PATH_SEGMENT {
      @Override
      boolean isAllowed(int c) {
        return this.isPchar(c) || (c == '/');
      }
    }
    abstract boolean isAllowed(int c);
    protected boolean isAlpha(int c) {
      return (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z');
    }
    protected boolean isDigit(int c) {
      return (c >= '0' && c <= '9');
    }
    protected boolean isSubDelimiter(int c) {
      return (c == '!') || (c == '$') || (c == '&') || (c == '\'') || (c == '(') || (c == ')')
          || (c == '*') || (c == '+') || (c == ',') || (c == ';') || (c == '=');
    }
    protected boolean isUnreserved(int c) {
      return this.isAlpha(c) || this.isDigit(c) || c == '-' || c == '.' || c == '_' || c == '~';
    }
    protected boolean isPchar(int c) {
      return this.isUnreserved(c) || this.isSubDelimiter(c) || c == ':' || c == '@';
    }
  }
}

package feign.template;
import feign.Util;
public class UriUtilsDemo {
? ? public static void main(String[] args) {
? ? ? ? String str = "aa&aa";
? ? ? ? // 输出：aa&aa
? ? ? ? System.out.println(UriUtils.encodeReserved(str, UriUtils.FragmentType.PATH_SEGMENT, Util.UTF_8));
? ? ? ? // 输出：aa%26aa
? ? ? ? System.out.println(UriUtils.encodeReserved(str, UriUtils.FragmentType.URI, Util.UTF_8));
? ? }
}