Merge remote-tracking branch 'origin/feature-201843-wangcz' into feature-201843-wangcz

src/main/resources/dev/sys.properties

@@ -53,7 +53,7 @@ inquiryServiceUrl=http://188.131.128.107:24000
 inquiryServiceInnerUrl=http://188.131.128.107:24000
 
 #public message  service url
-messageServiceUrl=http://188.131.128.107:24001/message/
+messageServiceUrl=http://188.131.128.107:24001/
 
 #b2b
 b2b=http://tb2b.usoftchina.com

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -194,7 +194,7 @@ define([ 'app/app' ], function(app) {
             User.isDevOrProd(null, function (data) {
                 var ssoUrl = data.data == 'success' ? 'https://sso.usoftchina.com' : 'http://188.131.128.107:24004',
                 // uasUrl = data.data == 'success' ? 'http://uas.ubtob.com' : 'http://192.168.253.12:9000/b2b-test',
-                commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftchina.com' : 'http://188.131.128.107:24000';
+                commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftchina.com' : 'https://tinquiry-api.usoftchina.com';
                 defer.resolve([
                     getSeekInfo(commonUrl),
                     getAddEnUserCount(ssoUrl),

src/main/webapp/resources/js/common/query/seekPurchase.js

@@ -11,11 +11,11 @@ define([ 'ngResource' ], function() {
                 method: 'GET'
             },
             getSeekPushGoodsPageInfo: {
-                url: 'http://188.131.128.107:24000/inquiry/public',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/public',
                 method: 'GET',
             },
             saveOneSeekPurchase: {
-                url: 'http://188.131.128.107:24000/inquiry/buyer/save',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/buyer/save',
                 method: 'POST'
             },
             saveOneSeekPurchaseProd: {
@@ -23,7 +23,7 @@ define([ 'ngResource' ], function() {
                 method: 'POST'
             },
             saveOffer: {
-                url: 'http://188.131.128.107:24000/inquiry/sale/item/saveQuote',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/sale/item/saveQuote',
                 method: 'POST'
             },
             saveOfferProd: {
@@ -31,11 +31,11 @@ define([ 'ngResource' ], function() {
                 method: 'POST'
             },
             getUserSeekPageInfo: {
-                url: 'http://188.131.128.107:24000/inquiry/buyer/list',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/buyer/list',
                 method: 'GET'
             },
             getUserSeekPageInfoByStatus: {
-                url: 'http://188.131.128.107:24000/inquiry/buyer/quotations',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/buyer/quotations',
                 method: 'GET'
             },
             getMallGoodsList: {
@@ -44,23 +44,23 @@ define([ 'ngResource' ], function() {
                 isArray: true
             },
             getSeekPurchaseOfferPageInfo: {
-                url: 'http://188.131.128.107:24000/inquiry/buyer/product/detail',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/buyer/product/detail',
                 method: 'GET'
             },
             getMyOfferPageInfo: {
-                url: 'http://188.131.128.107:24000/inquiry/public/quotation/list',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/public/quotation/list',
                 method: 'GET'
             },
             updateSeekPurchaseStatus: {
-                url: 'http://188.131.128.107:24000/inquiry/buyer/decide',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/buyer/decide',
                 method: 'POST'
             },
             getSeekPurchaseBomListPage: {
-                url: 'http://188.131.128.107:24000/inquiry/buyer/inquiryList',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/buyer/inquiryList',
                 method: 'GET'
             },
             findOneBom: {
-                url: 'http://188.131.128.107:24000/inquiry/public/findInquiryById',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/public/findInquiryById',
                 method: 'GET'
             },
             saveBomName: {
@@ -68,7 +68,7 @@ define([ 'ngResource' ], function() {
                 method: 'PUT'
             },
             getBomDetail: {
-                url: 'http://188.131.128.107:24000/inquiry/sale/publicInquiry/detail',
+                url: 'https://tinquiry-api.usoftchina.com/inquiry/sale/publicInquiry/detail',
                 method: 'GET'
             },
             // 获取BOM清单