Browse Source

去掉gateway hack

yufeng0528 4 years ago
parent
commit
c4f51f4cfb

+ 0 - 7
spring5-auth/spring5-auth-client/src/main/java/com/yaozhitech/spring5/intercept/ServiceAuthRestInterceptor.java

@@ -49,15 +49,8 @@ public class ServiceAuthRestInterceptor extends HandlerInterceptorAdapter {
49 49
           return super.preHandle(request, response, handler);
50 50
       }
51 51
 
52
-		String token = request.getHeader("x-auth-token");
53
-		logger.info(token);
54
-		
55 52
 		String client = request.getHeader("x-auth-client");
56 53
 		
57
-		if (token.equals("gateway")) {
58
-			return super.preHandle(request, response, handler);
59
-		}
60
-
61 54
 		try {
62 55
 			String uniqueName = JwtUtils.getUsername(client);
63 56
 			if (Boolean.TRUE.equals(clientAuthProvider.verify(applicationName, uniqueName.split("\\.")[0], uniqueName.split("\\.")[1]))) {

+ 2 - 1
spring5-gateway/src/main/resources/application.properties

@@ -31,4 +31,5 @@ jetcache.remote.default.poolConfig.minIdle: 5
31 31
 jetcache.remote.default.poolConfig.maxIdle: 20
32 32
 jetcache.remote.default.poolConfig.maxTotal: 50
33 33
 jetcache.remote.default.uri: redis://bbztx123456@120.55.124.69:6280
34
-    
34
+    
35
+auth.client.secret: *g2Enrh3wKYjf@M9

+ 2 - 5
spring5-order/src/main/java/com/yaozhitech/spring5/controller/OrderController.java

@@ -41,12 +41,9 @@ public class OrderController {
41 41
 	public ResponseEntity<String> token() {
42 42
 		String token = JwtUtils.sign(applicationName + "." + clientSecret, jwtSalt, 3600);
43 43
 		
44
-		String decodeToken = JwtUtils.getUsername(token);
45
-		log.info(decodeToken);
44
+		log.info(token);
46 45
 		
47
-		decodeToken = JwtUtils.verifyTokenAndGet("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NzY3NTgzMjUsImlhdCI6MTU3Njc1NDcyNSwidXNlcm5hbWUiOiJvcmRlci5xeDRNWFZSOVNKbTMxcTJDIn0.W_1wgNjhIfB-3D_v7qhqlpxzc2setbAtHo0Iich_GFc",
48
-				jwtSalt);
49
-		log.info(decodeToken);
46
+		token = JwtUtils.sign("mock" + "." + "TQo0s7$NrpN6yEA#", JwtUtils.generateSalt(), 3600);
50 47
 		
51 48
 		return ResponseEntity.ok(token);
52 49
 	}