Skip to content

5
51business
Commit ba1e0152 authored by 李尚科's avatar 李尚科
Browse files
Options

fix conflict

parent 397d0e51
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
config/config.default.js
View file @ ba1e0152
...@@ -14,6 +14,7 @@ module.exports = appInfo => { ...@@ -14,6 +14,7 @@ module.exports = appInfo => {
// use for cookie sign key, should change to your own and keep security // use for cookie sign key, should change to your own and keep security
config.keys = appInfo.name + '_1554705194320_9697'; config.keys = appInfo.name + '_1554705194320_9697';
config.projectRootPath = '/51business/api';
config.projectRootPath = '/51business/api'; config.projectRootPath = '/51business/api';
......
config/config.local.js
View file @ ba1e0152
...@@ -6,6 +6,7 @@ module.exports = appInfo => { ...@@ -6,6 +6,7 @@ module.exports = appInfo => {
// use for cookie sign key, should change to your own and keep security // use for cookie sign key, should change to your own and keep security
config.keys = appInfo.name + '_1554705194320_9697'; config.keys = appInfo.name + '_1554705194320_9697';
config.projectRootPath = '/51business/api';
// 是否启用csrf安全 // 是否启用csrf安全
...@@ -77,6 +78,7 @@ module.exports = appInfo => { ...@@ -77,6 +78,7 @@ module.exports = appInfo => {
config.PHP_URL = 'https://kaifa.jianbing.com'; config.PHP_URL = 'https://kaifa.jianbing.com';
config.NODE_URL = 'https://dev-nginx.jianbing.com'; config.NODE_URL = 'https://dev-nginx.jianbing.com';
config.HOUSE_SERVICE_API = 'https://dev-nginx.jianbing.com/house-service';
return config; return config;
}; };
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