From 244516bb26a5c2d5dce8e244363a015c07286287 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 1 Mar 2020 18:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=20jquery?=
 =?UTF-8?q?=203.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/fullcalendar/2.6/index.html     | 3 ++-
 .../static/ueditor/1.4/dialogs/attachment/attachment.html     | 4 +++-
 .../resources/static/ueditor/1.4/dialogs/charts/charts.html   | 4 +++-
 .../resources/static/ueditor/1.4/dialogs/image/image.html     | 4 +++-
 .../resources/static/ueditor/1.4/dialogs/video/video.html     | 4 +++-
 modules/core/src/main/resources/views/include/head.html       | 4 ++--
 .../resources/views/modules/sys/account/registerUser.html     | 2 +-
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/modules/core/src/main/resources/static/fullcalendar/2.6/index.html b/modules/core/src/main/resources/static/fullcalendar/2.6/index.html
index 9af8a089..40c97e10 100644
--- a/modules/core/src/main/resources/static/fullcalendar/2.6/index.html
+++ b/modules/core/src/main/resources/static/fullcalendar/2.6/index.html
@@ -79,7 +79,8 @@
 			</div>
 		</div>
 	</div>
-<script src="../../jquery/jquery-1.12.4.min.js"></script>
+<script src="../../jquery/jquery-3.4.1.min.js"></script>
+<script src="../../jquery/jquery-migrate-3.1.0.min.js"></script>
 <script src="../../jquery/jquery-ui-draggable-1.12.1.min.js"></script>
 <script src="lib/moment.min.js"></script>
 <script src="fullcalendar.js"></script>
diff --git a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/attachment/attachment.html b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/attachment/attachment.html
index 1a52bb93..bda94cfa 100644
--- a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/attachment/attachment.html
+++ b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/attachment/attachment.html
@@ -6,7 +6,9 @@
     <script type="text/javascript" src="../internal.js"></script>
 
     <!-- jquery -->
-    <script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script>
+<!--     <script src="../../third-party/jquery-1.10.2.min.js"></script> -->
+    <script src="../../../../jquery/jquery-3.4.1.min.js"></script>
+    <script src="../../../../jquery/jquery-migrate-3.1.0.min.js"></script>
 
     <!-- webuploader -->
     <script src="../../third-party/webuploader/webuploader.min.js"></script>
diff --git a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/charts/charts.html b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/charts/charts.html
index 735274fd..7d6cd683 100644
--- a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/charts/charts.html
+++ b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/charts/charts.html
@@ -81,7 +81,9 @@
                 </div>
             </div>
         </div>
-        <script src="../../third-party/jquery-1.10.2.min.js"></script>
+<!--         <script src="../../third-party/jquery-1.10.2.min.js"></script> -->
+	    <script src="../../../../jquery/jquery-3.4.1.min.js"></script>
+	    <script src="../../../../jquery/jquery-migrate-3.1.0.min.js"></script>
         <script src="../../third-party/highcharts/highcharts.js"></script>
         <script src="chart.config.js"></script>
         <script src="charts.js"></script>
diff --git a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/image/image.html b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/image/image.html
index ed510a01..d9027e36 100644
--- a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/image/image.html
+++ b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/image/image.html
@@ -6,7 +6,9 @@
     <script type="text/javascript" src="../internal.js"></script>
 
     <!-- jquery -->
-    <script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script>
+<!--     <script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script> -->
+    <script type="text/javascript" src="../../../../jquery/jquery-3.4.1.min.js"></script>
+    <script type="text/javascript" src="../../../../jquery/jquery-migrate-3.1.0.min.js"></script>
 
     <!-- webuploader -->
     <script src="../../third-party/webuploader/webuploader.min.js"></script>
diff --git a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/video/video.html b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/video/video.html
index 797ca873..99a71d47 100644
--- a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/video/video.html
+++ b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/video/video.html
@@ -75,7 +75,9 @@
 </div>
 
 <!-- jquery -->
-<script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script>
+<!--     <script src="../../third-party/jquery-1.10.2.min.js"></script> -->
+    <script src="../../../../jquery/jquery-3.4.1.min.js"></script>
+    <script src="../../../../jquery/jquery-migrate-3.1.0.min.js"></script>
 
 <!-- webuploader -->
 <script type="text/javascript" src="../../third-party/webuploader/webuploader.min.js"></script>
diff --git a/modules/core/src/main/resources/views/include/head.html b/modules/core/src/main/resources/views/include/head.html
index b7ae035e..726e8295 100644
--- a/modules/core/src/main/resources/views/include/head.html
+++ b/modules/core/src/main/resources/views/include/head.html
@@ -6,8 +6,8 @@
 <title>${(isNotBlank(title!) ? title! + ' - ' : '') + @Global.getConfig('productName')}</title>
 <link rel="shortcut icon" href="${ctxStatic}/favicon.png" type="image/png">
 <script src="${ctxPath}/global.min.js?ctx=${ctx}"></script>
-<script src="${ctxStatic}/jquery/jquery-1.12.4.min.js"></script>
-<!-- <script src="${ctxStatic}/jquery/jquery-migrate-1.4.1.min.js"></script> -->
+<script src="${ctxStatic}/jquery/jquery-3.4.1.min.js"></script>
+<script src="${ctxStatic}/jquery/jquery-migrate-3.1.0.min.js"></script>
 <!--[if lt IE 9]><script src="${ctxStatic}/common/h5fix.min.js"></script><![endif]-->
 <% if(parameter.__layer! == 'true'){ %>
 <style>.main-content>.box-main>.box-header{display:none;}</style>
diff --git a/modules/core/src/main/resources/views/modules/sys/account/registerUser.html b/modules/core/src/main/resources/views/modules/sys/account/registerUser.html
index 2d5f4f16..3f476edd 100644
--- a/modules/core/src/main/resources/views/modules/sys/account/registerUser.html
+++ b/modules/core/src/main/resources/views/modules/sys/account/registerUser.html
@@ -12,7 +12,7 @@
 		<form id="registerForm" action="${ctxPath}/account/saveRegByValidCode" method="post">
 			<div class="form-group has-feedback">
 				<select id="reg_validType" name="op" class="form-control">
-					<option value="email">使用电子邮箱找注册账号</option>
+					<option value="email">使用电子邮箱注册账号</option>
 					<option value="mobile">使用手机号码注册账号</option>
 				</select>
 				<script type="text/javascript">