From 73ac35221975be7f91ed3d5c448721b65f2fbf18 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 23 Apr 2019 20:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DjQuery=E5=8E=9F=E5=9E=8B?=
 =?UTF-8?q?=E6=B1=A1=E6=9F=93=E6=BC=8F=E6=B4=9E=20=20ThinkGem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/resources/static/jquery/jquery-1.12.4.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/src/main/resources/static/jquery/jquery-1.12.4.js b/common/src/main/resources/static/jquery/jquery-1.12.4.js
index 75230f20..bab0e1be 100644
--- a/common/src/main/resources/static/jquery/jquery-1.12.4.js
+++ b/common/src/main/resources/static/jquery/jquery-1.12.4.js
@@ -211,7 +211,8 @@ jQuery.extend = jQuery.fn.extend = function() {
 				copy = options[ name ];
 
 				// Prevent never-ending loop
-				if ( target === copy ) {
+//				if ( target === copy ) {
+				if (name === "__proto__" || target === copy) { // 修复jQuery原型污染漏洞  ThinkGem
 					continue;
 				}