Commit 507bfb60 authored by 姜登's avatar 姜登

gjj

parent d9cc2ddb
Pipeline #5915 passed with stage
in 2 seconds
...@@ -67,16 +67,7 @@ class OrderController extends Controller { ...@@ -67,16 +67,7 @@ class OrderController extends Controller {
} }
} catch (err) { } catch (err) {
ctx.logger.error('partnerShow', err); ctx.logger.error('partnerShow', err);
ctx.status = 200; ctx.error(err);
if (err.code === 'invalid_param') {
ctx.body = { code: -1, msg: '请求参数有误' };
return;
}
if (/[a-zA-Z]+/.test(err.message)) {
ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
return;
}
ctx.body = { code: err.code || -1, msg: err.message || '' };
} }
} }
...@@ -107,16 +98,7 @@ class OrderController extends Controller { ...@@ -107,16 +98,7 @@ class OrderController extends Controller {
}; };
} catch (err) { } catch (err) {
ctx.logger.error('fetchOrderId', err); ctx.logger.error('fetchOrderId', err);
ctx.status = 200; ctx.error(err);
if (err.code === 'invalid_param') {
ctx.body = { code: -1, msg: '请求参数有误' };
return;
}
if (/[a-zA-Z]+/.test(err.message)) {
ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
return;
}
ctx.body = { code: err.code || -1, msg: err.message || '' };
} }
} }
} }
......
...@@ -13,16 +13,7 @@ class ScriptController extends Controller { ...@@ -13,16 +13,7 @@ class ScriptController extends Controller {
return; return;
} catch (err) { } catch (err) {
ctx.logger.error('fetchOrderId', err); ctx.logger.error('fetchOrderId', err);
ctx.status = 200; ctx.error(err);
if (err.code === 'invalid_param') {
ctx.body = { code: -1, msg: '请求参数有误' };
return;
}
if (/[a-zA-Z]+/.test(err.message)) {
ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
return;
}
ctx.body = { code: err.code || -1, msg: err.message || '' };
} }
} }
} }
......
...@@ -95,16 +95,7 @@ class TaskController extends Controller { ...@@ -95,16 +95,7 @@ class TaskController extends Controller {
}; };
} catch (err) { } catch (err) {
ctx.logger.error('submit', err); ctx.logger.error('submit', err);
ctx.status = 200; ctx.error(err);
if (err.code === 'invalid_param') {
ctx.body = { code: -1, msg: err.errors[0].message };
return;
}
if (/[a-zA-Z]+/.test(err.message)) {
ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
return;
}
ctx.body = { code: err.code || -1, msg: err.message || '' };
} }
} }
...@@ -133,16 +124,7 @@ class TaskController extends Controller { ...@@ -133,16 +124,7 @@ class TaskController extends Controller {
}; };
} catch (err) { } catch (err) {
ctx.logger.error('submit', err); ctx.logger.error('submit', err);
ctx.status = 200; ctx.error(err);
if (err.code === 'invalid_param') {
ctx.body = { code: -1, msg: '请求参数有误' };
return;
}
if (/[a-zA-Z]+/.test(err.message)) {
ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
return;
}
ctx.body = { code: err.code || -1, msg: err.message || '' };
} }
} }
......
...@@ -30,12 +30,7 @@ class TokenController extends Controller { ...@@ -30,12 +30,7 @@ class TokenController extends Controller {
}; };
} catch (err) { } catch (err) {
ctx.logger.error('partnerCreate', err); ctx.logger.error('partnerCreate', err);
ctx.status = 200; ctx.error(err);
if (err.code === 'invalid_param') {
ctx.body = { code: -1, msg: '请求参数有误' };
return;
}
ctx.body = { code: err.code || -1, msg: err.message || '' };
} }
} }
} }
......
...@@ -26,4 +26,17 @@ module.exports = { ...@@ -26,4 +26,17 @@ module.exports = {
}; };
}, },
error(err = '') {
this.status = 200;
if (err.code === 'invalid_param') {
this.body = { code: -1, msg: '请求参数有误' };
return;
}
if (/[a-zA-Z]+/.test(err.message)) {
this.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
return;
}
this.body = { code: err.code || -1, msg: err.message || '' };
},
}; };
...@@ -16,7 +16,6 @@ module.exports = () => { ...@@ -16,7 +16,6 @@ module.exports = () => {
}; };
config.taskAPI = { config.taskAPI = {
host: 'http://tm.51gjj.com:4831', host: 'http://tm.51gjj.com:4831',
fetchHubsUrl: '',
createTaskUrl: '/gjjServices/createGjjTask', createTaskUrl: '/gjjServices/createGjjTask',
fetchCodeUrl: '/gjjServices/queryGjjCode', fetchCodeUrl: '/gjjServices/queryGjjCode',
submitTaskUrl: '/gjjServices/queryGjj', submitTaskUrl: '/gjjServices/queryGjj',
...@@ -63,7 +62,6 @@ module.exports = () => { ...@@ -63,7 +62,6 @@ module.exports = () => {
fetchTokenUrl: '/Access/GetToken', fetchTokenUrl: '/Access/GetToken',
fetchOrderIdUrl: '/Order/GetOrderSn', fetchOrderIdUrl: '/Order/GetOrderSn',
signatureUrl: '/Access/SignValidityCheck', signatureUrl: '/Access/SignValidityCheck',
fetchParnterUrl: '',
signatureType: 'gjj', signatureType: 'gjj',
customerUrl: '/customer/query', customerUrl: '/customer/query',
}; };
...@@ -88,17 +86,6 @@ module.exports = () => { ...@@ -88,17 +86,6 @@ module.exports = () => {
username: 'hexin', username: 'hexin',
password: 'gYUHszn9#q', password: 'gYUHszn9#q',
port: 3306, port: 3306,
}, {
// 东八时区
timezone: '+08:00',
delegate: 'cusPro',
baseDir: 'model',
dialect: 'mysql',
host: 'rm-bp1272001633qc0x9o.mysql.rds.aliyuncs.com',
database: 'java_open_platform',
username: 'hexin',
password: 'gYUHszn9#q',
port: 3306,
}], }],
}; };
......
...@@ -19,7 +19,6 @@ module.exports = () => { ...@@ -19,7 +19,6 @@ module.exports = () => {
}; };
config.taskAPI = { config.taskAPI = {
host: process.env.TASKAPI_HOST || 'http://tm.51gjj.com:4821', host: process.env.TASKAPI_HOST || 'http://tm.51gjj.com:4821',
fetchHubsUrl: '',
createTaskUrl: '/gjjServices/createGjjTask', createTaskUrl: '/gjjServices/createGjjTask',
fetchCodeUrl: '/gjjServices/queryGjjCode', fetchCodeUrl: '/gjjServices/queryGjjCode',
submitTaskUrl: '/gjjServices/queryGjj', submitTaskUrl: '/gjjServices/queryGjj',
...@@ -92,17 +91,6 @@ module.exports = () => { ...@@ -92,17 +91,6 @@ module.exports = () => {
username: process.env.MYSQL_USER || 'hexin', username: process.env.MYSQL_USER || 'hexin',
password: process.env.MYSQL_PWD || 'gYUHszn9#q', password: process.env.MYSQL_PWD || 'gYUHszn9#q',
port: process.env.MYSQL_PORT || 3306, port: process.env.MYSQL_PORT || 3306,
}, {
// 东八时区
timezone: '+08:00',
delegate: 'cusPro',
baseDir: 'model',
dialect: 'mysql',
host: process.env.MYSQL_PACHONG_HOST || 'rm-bp1272001633qc0x9o.mysql.rds.aliyuncs.com',
database: process.env.MYSQL_JAVA_DB_NAME || 'java_open_platform',
username: process.env.MYSQL_USER || 'hexin',
password: process.env.MYSQL_PWD || 'gYUHszn9#q',
port: process.env.MYSQL_PORT || 3306,
}], }],
}; };
......
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