From 5f06f3ed3b5cc271ae344afc8f0bfd0dc3481a86 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 14 Nov 2018 18:29:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/ruoyi/css/ry-ui.css |  2 +-
 .../templates/system/dict/data/data.html      |  2 +-
 .../resources/templates/system/menu/menu.html |  2 +-
 .../templates/system/user/profile/avatar.html | 43 ++++++++++---------
 .../framework/web/base/BaseController.java    |  1 -
 5 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index fec1de99..5baaeb5c 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -167,7 +167,7 @@ label.error {
 	padding: 0;
 	width: 18px;
 	height: 18px;
-	background: url(/img/blue.png) no-repeat;
+	background: url(../../img/blue.png) no-repeat;
 	border: none;
 	cursor: pointer
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html b/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
index d118ffdc..1001ca5b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
@@ -35,7 +35,7 @@
 			</div>
 			
 	       <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
-	            <a class="btn btn-primary" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'" shiro:hasPermission="system:dict:add">
+	            <a class="btn btn-success" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'" shiro:hasPermission="system:dict:add">
 	                <i class="fa fa-plus"></i> 新增
 	            </a>
 	            <a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()" shiro:hasPermission="system:dict:edit">
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
index b370d431..57ed456e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
+++ b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
@@ -59,7 +59,7 @@
 		        parentCode: "parentId",
 		        uniqueId: "menuId",
 		        expandAll: false,
-		        expandFirst: false,
+		        expandFirst: true,
 		        url: prefix + "/list",
 		        createUrl: prefix + "/add/{id}",
 		        updateUrl: prefix + "/edit/{id}",
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html
index a795e54e..cb5918a9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html
@@ -18,13 +18,13 @@
 	   <input type="button" id="btnCrop" class="Btnsty_peyton" value="裁切" /> 
 	   <input type="button" id="btnZoomIn" class="Btnsty_peyton" value="+" /> 
 	   <input type="button" id="btnZoomOut" class="Btnsty_peyton" value="-" /> 
-	   <input type="button" id="blobSubmit" class="Btnsty_peyton" value="提交" /> 
 	   </div> 
 	   <div class="cropped"></div> 
     </div>
 <div th:include="include::footer"></div>
 <script th:src="@{/ajax/libs/cropbox/cropbox.js}"></script>
 <script type="text/javascript">
+var cropper;
 $(window).load(function() {
 	var avatar = '[[${user.avatar}]]';
     var options = {
@@ -32,9 +32,8 @@ $(window).load(function() {
         spinner: '.spinner',
         imgSrc: $.common.isEmpty(avatar) ? ctx + 'img/profile.jpg' : ctx + 'profile/avatar/' + avatar
     }
-    var cropper = $('.imageBox').cropbox(options);
-    $('#avatar').on('change',
-    function() {
+    cropper = $('.imageBox').cropbox(options);
+    $('#avatar').on('change', function() {
         var reader = new FileReader();
         reader.onload = function(e) {
             options.imgSrc = e.target.result;
@@ -47,22 +46,7 @@ $(window).load(function() {
         }
         reader.readAsDataURL(this.files[0]);
     })
-    $('#blobSubmit').on('click', function(){
-        var img = cropper.getBlob();
-        var formdata = new FormData();
-        formdata.append("avatarfile", img);
-        formdata.append("userId", $("#userId").val());
-        $.ajax({
-            url: ctx + "system/user/profile/updateAvatar",
-            data: formdata,
-            type: "post",
-            processData: false,
-            contentType: false,
-            success: function(result) {
-            	$.operate.saveSuccess(result);
-            }
-        })
-    })
+    
 	$('#btnCrop').on('click', function(){
 		var img = cropper.getDataURL();
 		$('.cropped').html('');
@@ -70,13 +54,32 @@ $(window).load(function() {
 		$('.cropped').append('<img src="'+img+'" align="absmiddle" style="width:128px;margin-top:4px;border-radius:128px;box-shadow:0px 0px 12px #7E7E7E;"><p>128px*128px</p>');
 		$('.cropped').append('<img src="'+img+'" align="absmiddle" style="width:180px;margin-top:4px;border-radius:180px;box-shadow:0px 0px 12px #7E7E7E;"><p>180px*180px</p>');
 	})
+	
 	$('#btnZoomIn').on('click', function(){
 		cropper.zoomIn();
 	})
+	
 	$('#btnZoomOut').on('click', function(){
 		cropper.zoomOut();
 	})
 });
+
+function submitHandler() {
+    var img = cropper.getBlob();
+    var formdata = new FormData();
+    formdata.append("avatarfile", img);
+    formdata.append("userId", $("#userId").val());
+    $.ajax({
+        url: ctx + "system/user/profile/updateAvatar",
+        data: formdata,
+        type: "post",
+        processData: false,
+        contentType: false,
+        success: function(result) {
+        	$.operate.saveSuccess(result);
+        }
+    })
+}
 </script>
 </body>
 </html>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/BaseController.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/BaseController.java
index 70d571a3..09dc8343 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/BaseController.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/BaseController.java
@@ -12,7 +12,6 @@ import com.ruoyi.framework.web.page.TableSupport;
 import com.ruoyi.system.domain.SysUser;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
-
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;