Merge branch 'master' of ssh://gitlab.mytoken.org:10022/zhuangke/ts-api-demo

src/utils/coreSystemUtils.ts

@@ -11,11 +11,11 @@ let { logger } = require('@madex/ex-js-public');
 export const getCoinFromCore = async(symbol)=> {
     const url = `${webadmin_endpoint}/asset/by_symbol?symbol=${symbol}`
     let { data } = await axios.get(url);
-    if (data.error) {
-        logger.error("getCoinFromCore",data);
+    if (data.state!=0) {
+        logger.error("getCoinFromCore",data.msg);
         return null
     }
-    return data[0];
+    return data.result[0];
 }
 
 // {
@@ -29,11 +29,11 @@ export const getCoinFromCore = async(symbol)=> {
 export const getPairFromCore = async(symbol,market="spot")=> {
     const url = `${webadmin_endpoint}/pair/by_symbol?symbol=${symbol}&market=${market}`
     let { data } = await axios.get(url);
-    if (data.error) {
-        logger.error("getPairFromCore",data);
+    if (data.state!=0) {
+        logger.error("getPairFromCore",data.msg);
         return null
     }
-    return data[0]
+    return data.result[0]
 }
 
 // res：
@@ -41,11 +41,14 @@ export const getPairFromCore = async(symbol,market="spot")=> {
 export const getUserAccountFromCore = async(userId,withName = true)=> {
     const url = `${webadmin_endpoint}/account/list?user_id=${userId}`
     let { data } = await axios.get(url);
-    if (data.error) {
-        logger.error("getPairFromCore",data);
+
+    if (data.state!=0) {
+        logger.error("getPairFromCore",data.msg);
         return null
     }
-    let asset_id = _.map(data,'asset');
+    let assets=  data.result
+
+    let asset_id = _.map(assets,'asset');
     if (withName) {
         let names = await coinType.prototype.findAll({
             attributes:['general_name','asset_id'],
@@ -56,15 +59,14 @@ export const getUserAccountFromCore = async(userId,withName = true)=> {
             raw:true
         })
         let m = _.keyBy(names,'asset_id');
-        for (const item of data) {
+        for (const item of assets) {
             if (m[item.asset]) {
                 item.name = m[item.asset].general_name
             }
         }
     }
-    // console.log(data)
 
-    return data;
+    return assets;
 }
 
 // user_id
@@ -81,12 +83,11 @@ export const getUserOrdersFromCore = async(params)=> {
     // let params = new URLSearchParams();
     const url = `${webadmin_endpoint}/order/list`
     let { data } = await axios.get(url,{params});
-    if (data.error) {
-        logger.error("getPairFromCore",data);
+    if (data.state!=0) {
+        logger.error("getPairFromCore",data.msg);
         return null
     }
-    console.log(data)
-    return data
+    return data.result
 }
 
 // user_id
@@ -101,12 +102,11 @@ export const getUserFillsFromCore = async(params)=> {
     // let params = new URLSearchParams();
     const url = `${webadmin_endpoint}/fill/list`
     let { data } = await axios.get(url,{params});
-    if (data.error) {
-        logger.error("getPairFromCore",data);
+    if (data.state!=0) {
+        logger.error("getUserFillsFromCore",data.msg);
         return null
     }
-    console.log(data)
-    return data
+    return data.result
 }
 
 
@@ -119,9 +119,9 @@ export const addCoin2Core = async(symbol,id)=> {
         "id":id,
     }
     let { data } = await axios.post(url,body);
-    if (data.error) {
-        logger.error(data);
-        return false;
+    if (data.state!=0) {
+        logger.error("getUserFillsFromCore",data.msg);
+        return false
     }
     return true;
 }
@@ -129,9 +129,9 @@ export const addCoin2Core = async(symbol,id)=> {
 export const addPairToCore = async(body)=> {
     const url = `${webadmin_endpoint}/pair/add_product`
     let { data } = await axios.post(url,body);
-    if (data.error) {
-        logger.error(data);
-        return false;
+    if (data.state!=0) {
+        logger.error("getUserFillsFromCore",data.msg);
+        return false
     }
     return true;
 }