From 547c128b2c4c6ce0ff643f161dbc59740f0b5f23 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 11 Nov 2022 13:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/resource/controller/ResourceController.java  | 9 ++++++---
 .../io/renren/modules/security/config/ShiroConfig.java   | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

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 {
                 "  <soap:Body>\n" +
                 "    <ZyShowrecord xmlns=\"http://tempuri.org/\">\n" +
                 String.format("      <guid>%s</guid>\n", applyGuid) +
-                String.format("      <userguid>%s</userguid>", sysUser.getGuid()) +
+                String.format("      <userguid>%s</userguid>\n", sysUser.getGuid()) +
 //                String.format("      <bmguid>%s</bmguid>\n", deptGuid) +
+//                "      <userguid>e8d2fb43-f512-4918-ab47-1141b925af10</userguid>\n" +
                 "    </ZyShowrecord>\n" +
                 "  </soap:Body>\n" +
                 "</soap:Envelope>";
+        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 = "<ZyShowrecordResult>";
             String endTag = "</ZyShowrecordResult>";
+            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);