Merge remote-tracking branch 'origin/feature_release-tomysql' into feature_release-tomysql

src/main/resources/prod/message.properties

@@ -8,4 +8,4 @@ plaformB2cComponentUnproveTemplateId=6228240a-93ba-405f-851c-f874a6c99864
 plaformB2cSupplyChainTemplateId=b28337ba-f115-4f11-b457-15d558443160
 inviteVendorMailTemplateId=9028790a-9fc0-4759-a2df-8c26a7f3aa9a
 
-messagePublicServiceDevUrl=http://api-message.ubtob.com/message
+messagePublicServiceDevUrl=https://api-message.ubtob.com/

src/main/webapp/resources/js/usercenter/app.js

@@ -713,9 +713,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
     /**
      * 卖家中心头部
      */
-    app.controller('UserCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', '$http', function ($scope, $rootScope, BaseService, InternalMessage, $http) {
+    app.controller('UserCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', '$http', 'toaster', function ($scope, $rootScope, BaseService, InternalMessage, $http, toaster) {
         $scope.homeUrl = BaseService.getRootPath();
-        console.info($rootScope.userInfo);
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
             if (url == "http://218.17.158.219:24000/message") {
@@ -733,8 +732,9 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
                 url: url + '/messages/count',
                 params: param
             }).success(function (data) {
-                $rootScope.unReadMessCount = data.toRead;
-            }).error(function (response) {
+            	console.info(data.count);
+                $rootScope.unReadMessCount = data.count;
+            }).error(function (err) {
                 toaster.pop('error', err || '获取未读消息数量失败');
             });
         });

src/main/webapp/resources/js/vendor/app.js

@@ -954,9 +954,8 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	/**
 	 * 卖家中心头部
 	 */
-	app.controller('VendorCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', '$http',function ($scope, $rootScope, BaseService, InternalMessage, $http) {
+	app.controller('VendorCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', '$http', 'toaster', function ($scope, $rootScope, BaseService, InternalMessage, $http, toaster) {
 		$scope.homeUrl = BaseService.getRootPath();
-		console.info($rootScope.userInfo);
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
             if (url == "http://218.17.158.219:24000/message") {
@@ -974,8 +973,9 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
                 url: url + '/messages/count',
                 params: param
             }).success(function (data) {
-                $rootScope.unReadMessCount = data.toRead;
-            }).error(function (response) {
+            	console.info(data.count);
+                $rootScope.unReadMessCount = data.count;
+            }).error(function (err) {
                 toaster.pop('error', err || '获取未读消息数量失败');
             });
         });