From 572b529cf35e79b369d8894d27fb3efec078c919 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 3 Sep 2021 18:25:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A=E8=A7=92?=
 =?UTF-8?q?=E3=80=90Star=E3=80=91=E6=94=B6=E8=97=8F=E6=9C=AC=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=20^=5F^?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  4 +--
 .../static/ueditor/1.4/ueditor.all.js         | 31 +++++++++++++------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index b3050c5e..1cfd7e9a 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 
 **发展至今 JeeSite 平台架构已经非常稳定，JeeSite 是一个专业的平台，是一个让你使用放心的平台。**
 
-### v4 架构特点、安全方面等等的优势：<http://jeesite.com/docs/feature/>
+### v4 架构特点、安全方面等等的优势：<https://jeesite.com/docs/feature/>
 
 ## 技术选型
 
@@ -58,7 +58,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 
 ## 更多介绍
 
-* 内置功能：<http://jeesite.com/docs/function/>
+* 内置功能：<https://jeesite.com/docs/function/>
 * 目录结构：<https://jeesite.com/docs/catalog/>
 * 架构特点：<https://jeesite.com/docs/feature/>
 * 开发规范：<https://jeesite.com/docs/standard/>
diff --git a/modules/core/src/main/resources/static/ueditor/1.4/ueditor.all.js b/modules/core/src/main/resources/static/ueditor/1.4/ueditor.all.js
index 954c5eae..d317abe7 100644
--- a/modules/core/src/main/resources/static/ueditor/1.4/ueditor.all.js
+++ b/modules/core/src/main/resources/static/ueditor/1.4/ueditor.all.js
@@ -6759,15 +6759,28 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
             langReadied(me);
 
         }else{
-            utils.loadFile(document, {
-                src: me.options.langPath + me.options.lang + "/" + me.options.lang + ".js",
-                tag: "script",
-                type: "text/javascript",
-                defer: "defer"
-            }, function () {
-                UE.plugin.load(me);
-                langReadied(me);
-            });
+			try {
+	            utils.loadFile(document, {
+	                src: me.options.langPath + me.options.lang + "/" + me.options.lang + ".js",
+	                tag: "script",
+	                type: "text/javascript",
+	                defer: "defer"
+	            }, function () {
+	                UE.plugin.load(me);
+	                langReadied(me);
+	            });
+			}catch(e){
+				// 未找到语言时，使用默认语言
+	            utils.loadFile(document, {
+	                src: me.options.langPath + "zh_CN/zh_CN.js",
+	                tag: "script",
+	                type: "text/javascript",
+	                defer: "defer"
+	            }, function () {
+	                UE.plugin.load(me);
+	                langReadied(me);
+	            });
+			}
         }
 
         UE.instants['ueditorInstant' + me.uid] = me;