add ch06

xindongbook · Jun 14, 2020 · 2f0e35d · 2f0e35d
1 parent 9f6ca71
commit 2f0e35d
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 215 deletions.
diff --git a/src/com/my/app/AppServlet.java b/src/com/my/app/AppServlet.java
diff --git a/src/com/my/oauth/OauthServlet.java b/src/com/my/oauth/OauthServlet.java
diff --git a/src/com/my/oauth/Servlet.java b/src/com/my/oauth/Servlet.java
diff --git a/src/com/oauth/ch03/AppIndexServlet.java b/src/com/oauth/ch03/AppIndexServlet.java
@@ -13,8 +13,8 @@
 
 /**
  * **
- * 使用此类来模拟第三方软件的首页
- * http://localhost:8080/AppIndexServlet-ch03
+ * 使用此类来模拟【第三方软件的首页】
+ * 浏览器输入 http://localhost:8080/AppIndexServlet-ch03
  */
 @WebServlet("/AppIndexServlet-ch03")
 public class AppIndexServlet extends HttpServlet {

diff --git a/src/com/oauth/ch03/AppServlet.java b/src/com/oauth/ch03/AppServlet.java
@@ -11,11 +11,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
+
+/**
+ * **
+ * 使用此类来模拟【第三方软件的Server端】
+ *
+ */
 @WebServlet("/AppServlet-ch03")
 public class AppServlet extends HttpServlet {
 
-
-
     String oauthURl="http://localhost:8081/OauthServlet-ch03";
     String protectedURl="http://localhost:8081/ProtectedServlet-ch03";
 

diff --git a/src/com/oauth/ch03/OauthServlet.java b/src/com/oauth/ch03/OauthServlet.java
@@ -13,6 +13,11 @@
 import java.util.Random;
 import java.util.UUID;
 
+/**
+ * **
+ * 使用此类来模拟【授权服务】
+ */
+
 @WebServlet("/OauthServlet-ch03")
 public class OauthServlet extends HttpServlet {
 

diff --git a/src/com/oauth/ch03/ProtectedServlet.java b/src/com/oauth/ch03/ProtectedServlet.java
@@ -11,13 +11,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
+
+/**
+ * **
+ * 使用此类来模拟【受保护资源服务】
+ */
 @WebServlet("/ProtectedServlet-ch03")
 public class ProtectedServlet extends HttpServlet {
 
-
-
-
-
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
         //省略验证代码

diff --git a/src/com/oauth/ch04/JWTTest.java b/src/com/oauth/ch04/JWTTest.java
@@ -68,7 +68,9 @@ public static void main(String[] args) {
         headerMap.put("alg", "HS256");
 
         Map<String, Object> payloadMap = new HashMap<>();
-        payloadMap.put("sub", "USERTEST");
+        payloadMap.put("iss", "http://localhost:8081/");
+        payloadMap.put("sub", "XIAOMINGTEST");
+        payloadMap.put("aud", "APPID_RABBIT");
         payloadMap.put("exp", 1584105790703L);
         payloadMap.put("iat", 1584105948372L);
 

diff --git a/src/com/oauth/ch02/AppIndexServlet.java → src/com/oauth/ch06/AppIndexServlet.java b/src/com/oauth/ch02/AppIndexServlet.java → src/com/oauth/ch06/AppIndexServlet.java
@@ -1,4 +1,4 @@
-package com.oauth.ch02;
+package com.oauth.ch06;
 
 import com.my.util.URLParamsUtil;
 

diff --git a/src/com/oauth/ch02/AppServlet.java → src/com/oauth/ch06/AppServlet.java b/src/com/oauth/ch02/AppServlet.java → src/com/oauth/ch06/AppServlet.java
@@ -1,4 +1,4 @@
-package com.oauth.ch02;
+package com.oauth.ch06;
 
 import com.my.util.HttpURLClient;
 

diff --git a/src/com/oauth/ch02/OauthServlet.java → src/com/oauth/ch06/OauthServlet.java b/src/com/oauth/ch02/OauthServlet.java → src/com/oauth/ch06/OauthServlet.java
@@ -1,4 +1,4 @@
-package com.oauth.ch02;
+package com.oauth.ch06;
 
 import com.my.util.URLParamsUtil;
 

diff --git a/src/com/oauth/ch09/OauthServlet.java b/src/com/oauth/ch09/OauthServlet.java
@@ -113,7 +113,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             tokenScopeMap.put(accessToken,codeScopeMap.get(code));//授权范围与访问令牌绑定
 
             //GENATE ID TOKEN
-            String id_token=genrateIdToken(appId,"XIAOMINGTEST");
+            String id_token=genrateIdToken(appId,"XIAOMINGTEST");//模拟用户小明登录
 
             response.getWriter().write(accessToken+"|"+id_token);
 
@@ -123,7 +123,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
 
     /**
-     * genrate id_token
+     * genrate
      * @param appId
      * @param user
      * @return