b2b请求

src/main/webapp/resources/js/common/b2bServices.js

@@ -1,4 +1,4 @@
-define([ 'angular', 'common/utils', 'big'], function(angular, utils) {
+define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular, utils) {
     'use strict';
     angular.module('common.b2bServices', [ 'common.utils', 'ngResource' ])
         .factory('SearchFilter', function() {
@@ -93,6 +93,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils) {
         }])
         .factory('VendorService', ['$http', '$resource', 'BaseService', function($http, $resource, BaseService) {
             var rootPath = BaseService.getRootPath();
+            var b2bPath = BaseService.getB2bUrl();
             return {
                 getCount: function(success) {
                     var request = $http.get(rootPath + '/vendor/count');
@@ -100,181 +101,183 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils) {
                         success.call(null, data);
                     });
                 },
-                customer: $resource('http://192.168.253.12:9000/b2b-test/vendor/customer/info/search', {}),
-                vendor: $resource('http://192.168.253.12:9000/b2b-test/vendor/info/search', {}),
-                userInfo: $resource('http://192.168.253.12:9000/b2b-test/vendor/userInfo/:uu', {}),
-                user: $resource('http://192.168.253.12:9000/b2b-test/vendor/user', {}),
-                exportXls: $resource('http://192.168.253.12:9000/b2b-test/vendor/customer/xls/permission', {})
+                customer: $resource(b2bPath + '/vendor/customer/info/search', {}),
+                vendor: $resource(b2bPath + '/vendor/info/search', {}),
+                userInfo: $resource(b2bPath + '/vendor/userInfo/:uu', {}),
+                user: $resource(b2bPath + '/vendor/user', {}),
+                exportXls: $resource(b2bPath + '/vendor/customer/xls/permission', {})
             };
         }])
-        .factory('Vendor', ['$resource', function($resource){
-            return $resource('http://192.168.253.12:9000/b2b-test/purc/vendor/:id', {}, {
+        .factory('Vendor', ['$resource', 'BaseService', function($resource, BaseService){
+            var b2bPath = BaseService.getB2bUrl();
+            return $resource(b2bPath + '/purc/vendor/:id', {}, {
                 getServe: {
                     // 调取使用uas系统的供应商信息
-                    url: 'http://192.168.253.12:9000/b2b-test/purc/vendor/serve',
+                    url: b2bPath + '/purc/vendor/serve',
                     isArray: true
                 },
                 getVendor: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/info/search'
+                    url: b2bPath + '/vendor/info/search'
                 },
                 getServicer: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/servicer'
+                    url: b2bPath + '/vendor/servicer'
                 },
                 getVendorDetail: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/:id/info',
+                    url: b2bPath + '/vendor/:id/info',
                     method: 'GET'
                 },
                 getCustomerDetail: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/customer/:id/info',
+                    url: b2bPath + '/vendor/customer/:id/info',
                     method: 'GET'
                 },
                 saveContact: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/savecontact',
+                    url: b2bPath + '/vendor/savecontact',
                     method: 'POST'
                 },
                 contacts: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/contacts/:venduu',
+                    url: b2bPath + '/vendor/contacts/:venduu',
                     method: 'GET',
                     isArray: true
                 },
                 deleteContact: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/deleteContact/:id',
+                    url: b2bPath + '/vendor/deleteContact/:id',
                     method: 'DELETE'
                 },
                 getSimilarVendors: {
-                    url: 'http://192.168.253.12:9000/b2b-test/search/similarVendors',
+                    url: b2bPath + '/search/similarVendors',
                     method: 'GET',
                     isArray: true
                 },
                 getSimilarCustomers: {
-                    url: 'http://192.168.253.12:9000/b2b-test/search/similarCustomers',
+                    url: b2bPath + '/search/similarCustomers',
                     method: 'GET',
                     isArray: true
                 },
                 saveCustContact: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/saveCustomerContact',
+                    url: b2bPath + '/vendor/saveCustomerContact',
                     method: 'POST'
                 },
                 custContacts: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/custContacts/:enuu',
+                    url: b2bPath + '/vendor/custContacts/:enuu',
                     method: 'GET',
                     isArray: true
                 },
                 getSimilarEnterprise: {
-                    url: 'http://192.168.253.12:9000/b2b-test/search/similarEnterprise',
+                    url: b2bPath + '/search/similarEnterprise',
                     method: 'GET',
                     isArray: true
                 },
                 vendorInfo: {
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/vendorInfo',
+                    url: b2bPath + '/vendor/vendorInfo',
                     method: 'GET'
                 },
                 enterpriseInfo: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/enterprise/info/:bussinessCode',
+                    url: b2bPath + '/account/enterprise/info/:bussinessCode',
                     method: 'GET'
                 },
                 setRead:{
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/customer/setRead',
+                    url: b2bPath + '/vendor/customer/setRead',
                     method: 'POST'
                 },
                 setVendorRead:{
-                    url: 'http://192.168.253.12:9000/b2b-test/vendor/vendor/setRead',
+                    url: b2bPath + '/vendor/vendor/setRead',
                     method: 'POST'
                 }
             });
         }])
-        .factory('AccountUser', ['$resource', function($resource) {
-            return $resource('http://192.168.253.12:9000/b2b-test/account/user/:uu', {}, {
+        .factory('AccountUser', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bPath = BaseService.getB2bUrl();
+            return $resource('/account/user/:uu', {}, {
                 getAll: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user',
+                    url: b2bPath + '/account/user',
                     method: 'GET'
                 },
                 findUsers: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/customer/:uu',
+                    url: b2bPath + '/account/user/customer/:uu',
                     method: 'POST',
                     isArray: true
                 },
                 addUserToVendor: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/bindUserToVendor/:uu',
+                    url: b2bPath + '/account/user/bindUserToVendor/:uu',
                     method: 'POST'
                 },
                 transferUserToVendor: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/transferUserToVendor/:uu',
+                    url: b2bPath + '/account/user/transferUserToVendor/:uu',
                     method: 'POST'
                 },
                 transferMyDistribute: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/transferMyDistribute',
+                    url: b2bPath + '/account/user/transferMyDistribute',
                     method: 'POST'
                 },
                 findDistribute: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/findDistribute',
+                    url: b2bPath + '/account/user/findDistribute',
                     method: 'GET',
                     isArray: true
                 },
                 getDistribute: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/getDistribute/:custUU',
+                    url: b2bPath + '/account/user/getDistribute/:custUU',
                     method: 'GET'
                 },
                 getEnTransfer: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/getEnTransfer/:custUU',
+                    url: b2bPath + '/account/user/getEnTransfer/:custUU',
                     method: 'GET'
                 },
                 findVendor: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/findVendor/:uu',
+                    url: b2bPath + '/account/user/findVendor/:uu',
                     method: 'GET',
                     isArray: true
                 },
                 findChooseVendor: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/removeVendor/:uu',
+                    url: b2bPath + '/account/user/removeVendor/:uu',
                     method: 'GET',
                     isArray: true
                 },
                 removeChooseVendor: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/removeVendor/:uu',
+                    url: b2bPath + '/account/user/removeVendor/:uu',
                     method: 'POST',
                     isArray: true
                 },
                 addVendor: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/addVendor/:uu',
+                    url: b2bPath + '/account/user/addVendor/:uu',
                     method: 'POST'
                 },
                 update: {
                     method: 'PUT'
                 },
                 updateRole: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/update/role',
+                    url: b2bPath + '/account/user/update/role',
                     method: 'POST'
                 },
                 checkPassword: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/checkPassword',
+                    url: b2bPath + '/account/user/checkPassword',
                     method: 'GET'
                 },
                 updatePassword: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/updatePassword',
+                    url: b2bPath + '/account/user/updatePassword',
                     method: 'POST'
                 },
                 telEnable: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/telEnable',
+                    url: b2bPath + '/account/user/telEnable',
                     method: 'GET'
                 },
                 emailEnable: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/emailEnable',
+                    url: b2bPath + '/account/user/emailEnable',
                     method: 'GET'
                 },
                 findUsersByKeyword: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/info',
+                    url: b2bPath + '/account/user/info',
                     method: 'GET',
                     isArray: true
                 },
                 getUpdatePasswordUrl: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/getUrl',
+                    url: b2bPath + '/account/user/getUrl',
                     params: {
                         "_operate": "updatePassword"
                     },
                     method: 'GET'
                 },
                 getCloudCenterUrl: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/user/getUrl',
+                    url: b2bPath + '/account/user/getUrl',
                     params: {
                         "_operate": "cloudcenter"
                     },
@@ -282,19 +285,20 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils) {
                 }
             });
         }])
-        .factory('CurrentRole', ['$resource', function($resource) {
-            return $resource('http://192.168.253.12:9000/b2b-test/account/role', {}, {
+        .factory('CurrentRole', ['$resource', 'BaseService', function($resource, BaseService) {
+            var b2bPath = BaseService.getB2bUrl();
+            return $resource('/account/role', {}, {
                 //当前企业对应的角色是否是销售经理或管理员
                 roles: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/role/currentRole',
+                    url: b2bPath + '/account/role/currentRole',
                     method: 'GET'
                 },
                 isManager: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/role/isManager',
+                    url: b2bPath + '/account/role/isManager',
                     method: 'GET'
                 },
                 isUser: {
-                    url: 'http://192.168.253.12:9000/b2b-test/account/role/isUser',
+                    url: b2bPath + '/account/role/isUser',
                     method: 'GET'
                 }
             })

src/main/webapp/resources/js/common/services.js

@@ -136,6 +136,9 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 				}else {
 					return currentPathname.replace(currentModule, nextModule);
 				}
+			},
+			getB2bUrl: function () {
+				return 'http://10.1.51.124:8090/platform-b2b';
 			}
 		};
 	}]).factory('AuthenticationService', ['$http', 'SessionService', 'BaseService', 'SerializerUtil', function($http, SessionService, BaseService, SerializerUtil) {