Skip to content

T
traffic-front
Commit f165629c authored by neo's avatar neo
Browse files
Options

[DEV] from key word is not allowded ,so close but should be open future

parent d9dd5d31
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
atms-web/src/main/webapp/app/framework/utils/webservice.js
View file @ f165629c
...@@ -168,12 +168,12 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService', ...@@ -168,12 +168,12 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
} }
cfg.isWebApiRequest = true; cfg.isWebApiRequest = true;
if (config && config.dbName) { if (config && config.dbName) {//TODO:from is not allowed ,future should open (neo)
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' }; // cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
} }
else { else {
if (vatSessionService.project && vatSessionService.project.dbName) { if (vatSessionService.project && vatSessionService.project.dbName) {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' }; // cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
} }
} }
return cfg; return cfg;
...@@ -189,10 +189,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService', ...@@ -189,10 +189,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
cfg.isWebApiRequest = true; cfg.isWebApiRequest = true;
if (config && config.dbName) { if (config && config.dbName) {
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' }; // cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
} }
else { else {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' }; // cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
} }
//$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com'; //$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
//cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com'; //cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';
......
atms-web/src/main/webapp/bundles/framework.js
View file @ f165629c
...@@ -4600,12 +4600,12 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService', ...@@ -4600,12 +4600,12 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
} }
cfg.isWebApiRequest = true; cfg.isWebApiRequest = true;
if (config && config.dbName) { if (config && config.dbName) {//TODO:from is not allowed ,future should open (neo)
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' }; // cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
} }
else { else {
if (vatSessionService.project && vatSessionService.project.dbName) { if (vatSessionService.project && vatSessionService.project.dbName) {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' }; // cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
} }
} }
return cfg; return cfg;
...@@ -4621,10 +4621,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService', ...@@ -4621,10 +4621,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
cfg.isWebApiRequest = true; cfg.isWebApiRequest = true;
if (config && config.dbName) { if (config && config.dbName) {
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' }; // cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
} }
else { else {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' }; // cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
} }
//$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com'; //$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
//cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com'; //cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment