修正别字

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -102,7 +102,7 @@ public class SysIndexController extends BaseController
         SysUser user = getSysUser();
         if (StringUtils.isNull(user))
         {
-            return AjaxResult.error("服务器超时，请重新登陆");
+            return AjaxResult.error("服务器超时，请重新登录");
         }
         if (passwordService.matches(user, password))
         {

ruoyi-admin/src/main/resources/static/ruoyi/index.js

@@ -309,7 +309,7 @@ $(function() {
             var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" seamless></iframe>';
             $('.mainContent').find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1);
 
-            $.modal.loading("数据加载中，请稍后...");
+            $.modal.loading("数据加载中，请稍候...");
 
             $('.mainContent iframe:visible').on('load', function() {
             	$.modal.closeLoading();
@@ -630,7 +630,7 @@ $(function() {
                     setActiveTab(this);
                     var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]');
                     var url = target.attr('src');
-                    $.modal.loading("数据加载中，请稍后...");
+                    $.modal.loading("数据加载中，请稍候...");
                     target.attr('src', url).on('load', function() {
                     	$.modal.closeLoading();
                     });
@@ -645,5 +645,5 @@ $(function() {
                 }
             },
         }
-    })
+    });
 });

ruoyi-admin/src/main/resources/static/ruoyi/js/common.js

@@ -289,7 +289,7 @@ function createMenuItem(dataUrl, menuName, isRefresh) {
         var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" data-panel="' + panelUrl + '" seamless></iframe>';
         $('.mainContent', topWindow).find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1);
         
-        window.parent.$.modal.loading("数据加载中，请稍后...");
+        window.parent.$.modal.loading("数据加载中，请稍候...");
         $('.mainContent iframe:visible', topWindow).on('load', function() {
             window.parent.$.modal.closeLoading();
         });

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -73,7 +73,7 @@ var table = {
                     fixedNumber: 0,
                     fixedRightNumber: 0,
                     queryParams: $.table.queryParams,
-                    rowStyle: undefined,
+                    rowStyle: undefined
                 };
                 var options = $.extend(defaults, options);
                 table.options = options;
@@ -373,7 +373,7 @@ var table = {
                     var dataParam = $("#" + currentId).serializeArray();
                     dataParam.push({ "name": "orderByColumn", "value": params.sortName });
                     dataParam.push({ "name": "isAsc", "value": params.sortOrder });
-                    $.modal.loading("正在导出数据，请稍后...");
+                    $.modal.loading("正在导出数据，请稍候...");
                     $.post(table.options.exportUrl, dataParam, function(result) {
                         if (result.code == web_status.SUCCESS) {
                             window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
@@ -1004,7 +1004,7 @@ var table = {
                     dataType: dataType,
                     data: data,
                     beforeSend: function () {
-                        $.modal.loading("正在处理中，请稍后...");
+                        $.modal.loading("正在处理中，请稍候...");
                     },
                     success: function(result) {
                         if (typeof callback == "function") {
@@ -1179,7 +1179,7 @@ var table = {
                     dataType: "json",
                     data: data,
                     beforeSend: function () {
-                        $.modal.loading("正在处理中，请稍后...");
+                        $.modal.loading("正在处理中，请稍候...");
                         $.modal.disable();
                     },
                     success: function(result) {
@@ -1199,7 +1199,7 @@ var table = {
                     dataType: "json",
                     data: data,
                     beforeSend: function () {
-                        $.modal.loading("正在处理中，请稍后...");
+                        $.modal.loading("正在处理中，请稍候...");
                     },
                     success: function(result) {
                         if (typeof callback == "function") {
@@ -1225,7 +1225,7 @@ var table = {
                     dataType: "json",
                     data: data,
                     beforeSend: function () {
-                        $.modal.loading("正在处理中，请稍后...");
+                        $.modal.loading("正在处理中，请稍候...");
                     },
                     success: function(result) {
                         if (typeof callback == "function") {

ruoyi-admin/src/main/resources/templates/demo/modal/layer.html

@@ -147,7 +147,7 @@
 	    })
 	    
 	    $("#button-msgReload").click(function(){
-	        $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS);
+	        $.modal.msgReload("保存成功,正在刷新数据请稍候……", modal_status.SUCCESS);
 	    })
 	    
 	    $("#button-open-1").click(function(){

ruoyi-admin/src/main/resources/templates/demo/operate/other.html

@@ -59,7 +59,7 @@
 	            type: "post",
 	            success: function(result) {
 	            	if (result.code == web_status.SUCCESS) {
-	            		layer.msg("保存成功,正在刷新数据请稍后……", {
+	            		layer.msg("保存成功,正在刷新数据请稍候……", {
 		            	    icon: 1,
 		            	    time: 500,
 		            	    shade: [0.1, '#8F8F8F']

ruoyi-admin/src/main/resources/templates/demo/table/dynamicColumns.html

@@ -42,7 +42,7 @@
         function ajaxColumns() {
         	var url = prefix + "/ajaxColumns";
         	var dataParam = $.common.formToJSON("table-form");
-            $.modal.loading("正在查询中，请稍后...");
+            $.modal.loading("正在查询中，请稍候...");
             $.post(url, dataParam, function(result) {
                 if (result.code == web_status.SUCCESS) {
                 	setColumns(result.data);

ruoyi-admin/src/main/resources/templates/lock.html

@@ -29,9 +29,9 @@
         </form>
     </div>
     
-    <div class="help-block text-center" style="margin-top: 50px;">系统锁屏,请输入密码登陆!</div>
+    <div class="help-block text-center" style="margin-top: 50px;">系统锁屏,请输入密码登录!</div>
     <div class="text-center">
-        <a th:href="@{logout}">退出重新登陆</a>
+        <a th:href="@{logout}">退出重新登录</a>
     </div>
 </div>
 <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>

ruoyi-admin/src/main/resources/templates/login.html

@@ -59,7 +59,7 @@
                     <div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">
 				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
 				    </div>
-                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
+                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍候...">登录</button>
                 </form>
             </div>
         </div>

ruoyi-admin/src/main/resources/templates/register.html

@@ -58,7 +58,7 @@
 				        <input type="checkbox" id="acceptTerm" name="acceptTerm"> <label for="acceptTerm">我已阅读并同意</label>
 				        <a href="https://gitee.com/y_project/RuoYi/blob/master/README.md" target="_blank">使用条款</a>
 				    </div>
-                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证注册，请稍后...">注册</button>
+                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证注册，请稍候...">注册</button>
                 </form>
             </div>
         </div>

ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html

@@ -198,7 +198,7 @@ $(window).on('load', function() {
 
 	$('.btn-custom').on('click',function (e) {
 		if (!croppable) {
-			$.modal.alertWarning("裁剪框加载中,请稍后...");
+			$.modal.alertWarning("裁剪框加载中,请稍候...");
 			return;
 		}
 		var data = {
@@ -214,7 +214,7 @@ $(window).on('load', function() {
 
 function submitHandler() {
     if (!croppable) {
-        $.modal.alertWarning("裁剪框加载中,请稍后...");
+        $.modal.alertWarning("裁剪框加载中,请稍候...");
         return
     }
     cropper.getCroppedCanvas().toBlob(function(img) {

ruoyi-generator/src/main/resources/templates/tool/gen/gen.html

@@ -141,7 +141,7 @@
 		// 预览代码
 		function preview(tableId) {
 			var preViewUrl = prefix + "/preview/" + tableId;
-			$.modal.loading("正在加载数据，请稍后...");
+			$.modal.loading("正在加载数据，请稍候...");
 			$.get(preViewUrl, function(result) {
 				if (result.code == web_status.SUCCESS) {
 					 var items = [];
@@ -175,7 +175,7 @@
 		    $.modal.confirm("确定要生成" + tableName + "表代码吗？", function() {
 		    	if(genType === "0") {
 			    	location.href = prefix + "/download/" + tableName;
-			        layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 });
+			        layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 });
 				} else if(genType === "1") {
 					$.operate.get(prefix + "/genCode/" + tableName);
 				}
@@ -198,7 +198,7 @@
 		    }
 		    $.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() {
 		    	location.href = prefix + "/batchGenCode?tables=" + rows;
-		        layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 });
+		        layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 });
 		    });
 		}