Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -386,8 +386,8 @@ public class SecurityController {
 					return "successCallback({success:'0'})";
 				}*/
 				user.setIp(AgentUtils.getIp(request));
-				request.getSession().setAttribute("  user", user);
-				SystemSession.setUser(user);
+				request.getSession().setAttribute("user", user);
+                SystemSession.setUser(user);
 				log(request, user);
 			}
 

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1772,9 +1772,8 @@ define([ 'app/app' ], function(app) {
   /**
    * 左侧导航栏控制器
    */
-	app.controller('leftNavCtrl', ["$scope", "toaster", function($scope, toaster){
+	app.controller('leftNavCtrl', ["$scope", "toaster", "$modal", "$rootScope", function($scope, toaster, $modal, $rootScope){
         //安全设置提醒框
-
         $scope.openHomeCenterModel = function() {
             var modalInstance = $modal.open({
                 animation: true,