From 6bfe50906ef3ec0ea74bebe53634c0d450f7d1e5 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 6 Jun 2019 17:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E5=8F=8A?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/src/main/resources/config/jeesite-core.yml | 2 +- .../src/main/resources/i18n/core/common/i18n_zh_CN.properties | 2 +- .../src/main/resources/static/common/i18n/jeesite_zh_CN.js | 4 ++-- .../src/main/resources/static/ueditor/1.4/lang/ja_JP/ja_JP.js | 2 +- .../src/main/resources/static/ueditor/1.4/lang/zh_CN/zh_CN.js | 2 +- web/db/mysql/create_user.sql | 2 +- web/src/main/resources/config/application.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index b75d3bd3..3a3bfec9 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -73,7 +73,7 @@ spring: # 缓存及会话共享（专业版） isClusterMode: false # 清理全部缓存按钮所清理的缓存列表 - clearNames: sysCache,corpCache,userCache,cmsCache + clearNames: sysCache,corpCache,userCache,cmsCache,msgPcPoolCache # 打印横幅 main: diff --git a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties index 31e46b3b..c87932da 100644 --- a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties +++ b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties @@ -5,7 +5,7 @@ sys.login.notLongIn=未登录或登录超时。请重新登录，谢谢！ sys.login.success=登录成功！ sys.login.getInfo=获取信息成功！ sys.login.failure=账号或密码错误，请重试。 -sys.login.error=对不起，系统遇见了点问题，请稍后再试！ +sys.login.error=对不起，系统遇见了点问题，请稍候再试！ sys.logout.success=退出成功！ # =========== 账号登录相关 =========== diff --git a/modules/core/src/main/resources/static/common/i18n/jeesite_zh_CN.js b/modules/core/src/main/resources/static/common/i18n/jeesite_zh_CN.js index bb3b9ca4..cc8ea13d 100644 --- a/modules/core/src/main/resources/static/common/i18n/jeesite_zh_CN.js +++ b/modules/core/src/main/resources/static/common/i18n/jeesite_zh_CN.js @@ -9,8 +9,8 @@ window.js = window.js || {}; js.i18n = $.extend({}, js.i18n, { 'tabpanel.newTabPage':'新页签', - 'loading.message':'正在加载，请稍后...', - 'loading.submitMessage':'正在提交，请稍后...', + 'loading.message':'正在加载，请稍候...', + 'loading.submitMessage':'正在提交，请稍候...', 'showMessage.error':'失败,错误,未完成', 'showMessage.success':'成功,完成', 'showMessage.warning':'不能,不允许,必须,已存在,不需要,不正确' diff --git a/modules/core/src/main/resources/static/ueditor/1.4/lang/ja_JP/ja_JP.js b/modules/core/src/main/resources/static/ueditor/1.4/lang/ja_JP/ja_JP.js index 9c715751..81f8b57a 100644 --- a/modules/core/src/main/resources/static/ueditor/1.4/lang/ja_JP/ja_JP.js +++ b/modules/core/src/main/resources/static/ueditor/1.4/lang/ja_JP/ja_JP.js @@ -307,7 +307,7 @@ UE.I18N['ja_JP'] = { 'imageUrlError':"不允许的图片格式或者图片域！", 'imageLoadError':"图片加载失败！请检查链接地址或网络状态！", 'searchRemind':"请输入搜索关键词", - 'searchLoading':"图片加载中，请稍后……", + 'searchLoading':"图片加载中，请稍候……", 'searchRetry':" :( ，抱歉，没有找到图片！请重试一次！" }, 'attachment':{ diff --git a/modules/core/src/main/resources/static/ueditor/1.4/lang/zh_CN/zh_CN.js b/modules/core/src/main/resources/static/ueditor/1.4/lang/zh_CN/zh_CN.js index eaa8bd06..29d9327b 100644 --- a/modules/core/src/main/resources/static/ueditor/1.4/lang/zh_CN/zh_CN.js +++ b/modules/core/src/main/resources/static/ueditor/1.4/lang/zh_CN/zh_CN.js @@ -307,7 +307,7 @@ UE.I18N['zh_CN'] = { 'imageUrlError':"不允许的图片格式或者图片域！", 'imageLoadError':"图片加载失败！请检查链接地址或网络状态！", 'searchRemind':"请输入搜索关键词", - 'searchLoading':"图片加载中，请稍后……", + 'searchLoading':"图片加载中，请稍候……", 'searchRetry':" :( ，抱歉，没有找到图片！请重试一次！" }, 'attachment':{ diff --git a/web/db/mysql/create_user.sql b/web/db/mysql/create_user.sql index 077f880a..0c947cbf 100644 --- a/web/db/mysql/create_user.sql +++ b/web/db/mysql/create_user.sql @@ -6,7 +6,7 @@ set global read_only=0; create user 'jeesite'@'%' identified by 'jeesite'; -create database jeesite DEFAULT CHARSET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'; +create database jeesite DEFAULT CHARSET 'utf8' COLLATE 'utf8_unicode_ci'; grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite'; diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 511c5a1e..0c5bcde6 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -177,7 +177,7 @@ spring: # # 缓存及会话共享（专业版） # isClusterMode: false # # 清理全部缓存按钮所清理的缓存列表 -# clearNames: sysCache,corpCache,userCache,cmsCache +# clearNames: sysCache,corpCache,userCache,cmsCache,msgPcPoolCache # 日志配置 logging: