|
@@ -15,13 +15,30 @@ Ext.define('Ext.overrides.data.Connection', {
|
|
|
defaultServerHeaders: null
|
|
defaultServerHeaders: null
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
+ /* 本地配置和服务器配置
|
|
|
|
|
+ "dev":{
|
|
|
|
|
+ "server": {
|
|
|
|
|
+ "basePath": "http://127.0.0.1:24002",
|
|
|
|
|
+ "urlPattern": "^\/api\/"
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ "prod":{
|
|
|
|
|
+ "server": {
|
|
|
|
|
+ "basePath": "http://10.1.81.2:24002",
|
|
|
|
|
+ "urlPattern": "^\/api\/"
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ */
|
|
|
privates: {
|
|
privates: {
|
|
|
setupServerOptions: function(options) {
|
|
setupServerOptions: function(options) {
|
|
|
- var serverOptions = Ext.manifest.server, originUrl = options.url;
|
|
|
|
|
- if (serverOptions && serverOptions.basePath && !this.urlRegexp.test(originUrl) &&
|
|
|
|
|
- (!serverOptions.urlPattern || new RegExp(serverOptions.urlPattern).test(originUrl))) {
|
|
|
|
|
|
|
+ //检验是开发环境还是线上地址
|
|
|
|
|
+ let prod = RegExp("10.1.81.2:*").test(window.location.href);
|
|
|
|
|
+ var basePath = prod?'http://10.1.81.2:24002':'http://127.0.0.1:24002',
|
|
|
|
|
+ originUrl = options.url,
|
|
|
|
|
+ urlPattern = "^\/api\/";
|
|
|
|
|
+ if ( new RegExp(urlPattern).test(originUrl) ) {
|
|
|
Ext.Object.merge(options, {
|
|
Ext.Object.merge(options, {
|
|
|
- url: serverOptions.basePath + originUrl.replace('/api',''),
|
|
|
|
|
|
|
+ url: basePath + originUrl.replace('/api',''),
|
|
|
headers: this.getDefaultServerHeaders() || {}
|
|
headers: this.getDefaultServerHeaders() || {}
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|