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

service/fj_service.go

 	if ret2 != 0 {
 		return "", ""
 	}
-	return ConvertToString(Remove0000(string(outputStr)), "gbk", "utf-8"), ConvertToString(Remove0000(string(errMessageStr)), "gbk", "utf-8")
+	return ConvertToString(Remove0000(string(outputStr)), "GB18030", "utf-8"), ConvertToString(Remove0000(string(errMessageStr)), "GB18030", "utf-8")
 }
 
 func GetFjAuthorizationInfo(org_id string) {