Browse Source

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx 3 years ago
parent
commit
36c3847703
1 changed files with 10 additions and 11 deletions
  1. 10 11
      service/hbyb_service.go

+ 10 - 11
service/hbyb_service.go View File

2
 
2
 
3
 import (
3
 import (
4
 	"bytes"
4
 	"bytes"
5
-	"encoding/hex"
6
 	"encoding/json"
5
 	"encoding/json"
7
 	"fmt"
6
 	"fmt"
8
 	"gdyb/models"
7
 	"gdyb/models"
68
 		fmt.Println("error:", err.Error())
67
 		fmt.Println("error:", err.Error())
69
 	}
68
 	}
70
 	fmt.Println(string(out))
69
 	fmt.Println(string(out))
71
-	return hex.EncodeToString(out), inputLog
70
+	return string(out), inputLog
72
 
71
 
73
 }
72
 }
74
 
73
 
125
 	}
124
 	}
126
 	fmt.Println(string(out))
125
 	fmt.Println(string(out))
127
 
126
 
128
-	return hex.EncodeToString(out), requestLog
127
+	return string(out), requestLog
129
 
128
 
130
 }
129
 }
131
 
130
 
165
 	}
164
 	}
166
 	fmt.Println(string(out))
165
 	fmt.Println(string(out))
167
 
166
 
168
-	return hex.EncodeToString(out), requestLog
167
+	return string(out), requestLog
169
 
168
 
170
 }
169
 }
171
 
170
 
229
 	}
228
 	}
230
 	fmt.Println(string(out))
229
 	fmt.Println(string(out))
231
 
230
 
232
-	return hex.EncodeToString(out), requestLog
231
+	return string(out), requestLog
233
 
232
 
234
 }
233
 }
235
 
234
 
398
 	}
397
 	}
399
 	fmt.Println(string(out))
398
 	fmt.Println(string(out))
400
 
399
 
401
-	return hex.EncodeToString(out), requestLog
400
+	return string(out), requestLog
402
 
401
 
403
 }
402
 }
404
 
403
 
438
 	}
437
 	}
439
 	fmt.Println(string(out))
438
 	fmt.Println(string(out))
440
 
439
 
441
-	return hex.EncodeToString(out), requestLog
440
+	return string(out), requestLog
442
 
441
 
443
 }
442
 }
444
 
443
 
508
 	}
507
 	}
509
 	fmt.Println(string(out))
508
 	fmt.Println(string(out))
510
 
509
 
511
-	return hex.EncodeToString(out), requestLog
510
+	return string(out), requestLog
512
 
511
 
513
 }
512
 }
514
 
513
 
578
 	str2 := string(mjson)
577
 	str2 := string(mjson)
579
 	fmt.Println(string(out))
578
 	fmt.Println(string(out))
580
 
579
 
581
-	return hex.EncodeToString(out), str2
580
+	return string(out), str2
582
 
581
 
583
 }
582
 }
584
 
583
 
618
 	str2 := string(mjson)
617
 	str2 := string(mjson)
619
 	fmt.Println(string(out))
618
 	fmt.Println(string(out))
620
 
619
 
621
-	return hex.EncodeToString(out), str2
620
+	return string(out), str2
622
 
621
 
623
 }
622
 }
624
 
623
 
654
 	//str2 := string(mjson)
653
 	//str2 := string(mjson)
655
 	fmt.Println(string(out))
654
 	fmt.Println(string(out))
656
 
655
 
657
-	return hex.EncodeToString(out)
656
+	return string(out)
658
 }
657
 }
659
 
658
 
660
 //确认订单
659
 //确认订单