diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
index 107f9a5a..836306fe 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
@@ -606,11 +606,13 @@ public class ResourceController {
" \n" +
" \n" +
String.format(" %s\n", applyGuid) +
- String.format(" %s", sysUser.getGuid()) +
+ String.format(" %s\n", sysUser.getGuid()) +
// String.format(" %s\n", deptGuid) +
+// " e8d2fb43-f512-4918-ab47-1141b925af10\n" +
" \n" +
" \n" +
"";
+ logger.info(parame);
HttpHeaders requestHeaders = new HttpHeaders();
requestHeaders.set("SOAPAction", "http://tempuri.org/ZyShowrecord");
requestHeaders.setContentType(new MediaType("text", "xml", Charset.forName("utf-8")));
@@ -619,9 +621,10 @@ public class ResourceController {
String body = restTemplate.postForEntity(url, requestEntity, String.class).getBody();
String startTag = "";
String endTag = "";
+ logger.info(body);
String json = body.substring(body.indexOf(startTag) + startTag.length(), body.indexOf(endTag));
- HashMap result = JSON.parseObject(json, HashMap.class);
-
+ logger.info(json);
+ List result = JSON.parseObject(json, ArrayList.class);
return new Result().ok(result);
} catch (Exception e) {
e.printStackTrace();
diff --git a/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java b/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
index 3ff49784..8cc9f98e 100644
--- a/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
+++ b/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
@@ -99,6 +99,9 @@ public class ShiroConfig {
filterMap.put("/metrics/**", "anon");
filterMap.put("/gateway-monitor/**", "anon");
filterMap.put("/enke/**", "anon");
+
+// filterMap.put("/resource/ZywMessage/yaweiApproveDetails", "anon");
+
filterMap.put("/**", "oauth2");
shiroFilter.setFilterChainDefinitionMap(filterMap);