zyx 2 năm trước cách đây
mục cha
commit
97365d22ac

+ 6 - 3
src/main/java/com/sxtvs/open/api/odata/controller/OauthController.java

@@ -7,6 +7,7 @@ import com.sxtvs.open.core.conf.OauthConfig;
 import com.sxtvs.open.core.sls.AliyunLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
@@ -110,11 +111,13 @@ public class OauthController {
         return view;
     }
 
-    @RequestMapping("weixin/wx7040933fd0e4b0e8/callback")
+    @RequestMapping("weixin/{appid}/callback")
     public String callback(
             @RequestParam("auth_code") String authCode,
-            @RequestParam("expires_in") Integer expiresIn) {
-        logger.info("key", "oauth/wx7040933fd0e4b0e8/code", "data", Map.of("authCode", authCode, "expiresIn", expiresIn));
+            @RequestParam("expires_in") Integer expiresIn,
+            @PathVariable("appid") String appid) {
+        logger.info("key", "oauth/{appid}/callback", "data",
+                Map.of("authCode", authCode, "expiresIn", expiresIn, "appid", appid));
         return "redirect:https://www.baidu.com";
     }
 }

+ 2 - 2
src/main/java/com/sxtvs/open/api/odata/wxutil/WxXmlUtil.java

@@ -36,13 +36,13 @@ public class WxXmlUtil {
         var body = """
                 <xml>
                     <AppId><![CDATA[wx7040933fd0e4b0e8]]></AppId>
-                    <Encrypt><![CDATA[B9wrP7402ENqH7INtlIJXpCKiNiTVe4Cmdmp+WAQdDuXbnY+jDY8vktnnfmmcB/lSK12PkrU8xu9ZLE5142LanDmZSjYG37t0084ql+M4ynwxdYEBtxz/v8tGkdgllW3EISya0hyxNYd9WD6fDCZ7u+HgD+d7Y/JEVq3w6NOmBw7aKUx/C7DsMuhuq+fP0R74B/zmNdYG7XepGL5IsrlkwvgkOs1n2/TAeWaifcoxXEm7lodwr4k4TR2rdmBbjd9pNCN3QdaVRKSUHWxPUX5V+RQXA1hMG9uXoLx6lOYJP34c+Ri1BXUChTe328lOFpev9AdYu+KywxyUfnsa3mZe4HX9aJfrJEGqORPxnIf8Y++EMmo5abEOPd8bNK51OwOPvokCPfB/C2ZKRDCPLjJvHjiqYsWO9qTJeC+uZcyjzdYpzA9rbG9K2AJTpOGmhxBjyASzgfpXZtkw0b+WTkI0rpr+MilyGjC/tn6iDaOd8o6XbnYp6m7SozRZHBzzwoX5gaW3cv1fs81s2pkJbYnSVz0FE7GtOKesDVN6uUSFSXBJjLea8HcGtHsKywsvoXysW7SvB5Kx1bFmzMng85HTMH0kQ7lZWZbpT8pmH1tES3bi6TapC4LeepA6ydVs5EVdg1pDWvV4yRJK/q6opt5JtP5iARkl1IlY8Tncpvwi69COU1LV8i0qJvRmBzcFOGU8z5yMigo1o/YgbtXvVtiDCkFOlj3P2PFuvthYt+1GZpb4ngFjMY0ylOh2uvFUL0Aon1nvRyCGUo2n1jPyViMPO57CUY1IS0Ozitaulf/dHmIuSjEngRryVqldj1zPUMMTCxKmBcwahJCcSMbaLP4Fw==]]></Encrypt>
+                    <Encrypt><![CDATA[/0aGlM2N62liKHaeD5Hu5lDX1D+esWs1efCqNBy0N4zrVfzmvNZ7UiSSCQMLkM/bnEVF2EaHMGoQfHsK4b878CVTO8vDmSpe7Sv44iIU9lB/RbZ0CMEnv+2JHz+ZVb7UezaiuNMH1DFtqjOeuaNHuuwtCq5oGf1Wvv5OR78Q/5gT+W0zfCAOQpCP4b3WeWUpw3QBfJ+btkdwY7fC8RKuBmQPdFYjPd0ce/BbX2GUAzIDJbR+96OaHswn5lqbZKdrWtmZehaj7Fja/hpirDayPuatR3JwdW5rl22vBOL7Hk/dISUKF6vovdlC4zW660zpj0uOsiDM9faUaXhIgKyCUiA50gG/b8zq70WQCA4OWW440GOGOvTl6iKf7rpkxTojcfbDKwwtd2U9uuKXQ4/AinIy7lDT+OVpRRCEl15Oq+f51/6H8ely+1mHnPgbrdEEEvxY0LockN2uSaON1ppSkw==]]></Encrypt>
                 </xml>
                 """;
 
         String xml = WxCrypt.decrypt(WxXmlUtil.getEncrypt(body));
         String componentVerifyTicket = WxXmlUtil.getComponentVerifyTicket(xml);
-        System.out.println();
+        System.out.println(componentVerifyTicket);
     }
 
 }

+ 3 - 3
src/main/java/com/sxtvs/open/core/sls/AliyunLogger.java

@@ -108,9 +108,7 @@ public class AliyunLogger {
             err.printStackTrace(new PrintWriter(sw, true));
             return sw.getBuffer().toString();
         }
-        if (obj instanceof Map<?, ?> map) {
-            return objectMapper.writeValueAsString(map);
-        }
+
         return obj.toString();
     }
 
@@ -129,6 +127,8 @@ public class AliyunLogger {
         aliyunLogger.info("msg", "123");
         aliyunLogger.info("msg", 1);
         aliyunLogger.info("msg", new RuntimeException("what"));
+        aliyunLogger.info("key", "oauth/{appid}/callback", "data",
+                Map.of("authCode", "1", "expiresIn", 2, "appid", 3.3));
 
         aliyunLogger.close();
     }