Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -152,6 +152,9 @@ public class EsService {
         //判断表达式
         if (queryRequest instanceof StringRequest) {
             searchCondition = ((StringRequest) queryRequest).getSearchQuery();
+            if(searchCondition!=null){
+                searchCondition="";
+            }
         } else if (queryRequest instanceof MapRequest) {
             Map<String, Object> map = ((MapRequest) queryRequest).getSearchQuery();
             StringBuilder stringBuilder = new StringBuilder();

src/main/java/cn/cslg/pas/service/test/EncryptionFunctionDTO.java

@@ -22,5 +22,7 @@ public class EncryptionFunctionDTO {
      */
     private Long currentTimeMillis;
 
+    private String version;
+
     private List<String> permissions;
 }

src/main/java/cn/cslg/pas/service/test/PermissionService2.java

@@ -75,6 +75,7 @@ public class PermissionService2 {
         String appSecret = appKey + currentTimeMillis / 1000;
         String md5Sign = SecureUtil.md5(appSecret);
         encryptionFunctionDTO.setSign(md5Sign);
+        encryptionFunctionDTO.setVersion("1");
         String param = new Gson().toJson(encryptionFunctionDTO);
 
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);