Merge remote-tracking branch 'origin/master'

4 years ago · 775293a324
4 changed files with 4 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c6b623ab09e19452fc6e45eddb2a506f197fb46b
+Subproject commit 8b5e9e2de20cf11d0615527bd0b66a9685e0f690
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b2a4ab3cff9f848c77e7ec6b428321639270f734
+Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a
--- a/epdc-cloud-gateway/src/main/resources/application.yml
+++ b/epdc-cloud-gateway/src/main/resources/application.yml
@ -252,6 +252,7 @@ renren:
  urls:
    - /auth/captcha
    - /auth/login
    - /auth/login/center
    - /*/swagger-resources/**
    - /*/swagger-ui.html
    - /*/webjars/**
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit db9213163f8005cba05ad21334bebb72484174b7
+Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d
	`@ -1 +1 @@`
		`Subproject commit c6b623ab09e19452fc6e45eddb2a506f197fb46b`			`Subproject commit 8b5e9e2de20cf11d0615527bd0b66a9685e0f690`
	`@ -1 +1 @@`
		`Subproject commit b2a4ab3cff9f848c77e7ec6b428321639270f734`			`Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a`
	`@ -1 +1 @@`
		`Subproject commit db9213163f8005cba05ad21334bebb72484174b7`			`Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d`