|
@@ -1,6 +1,7 @@
|
|
|
package cn.efunbox.audio.controller;
|
|
|
|
|
|
//import cn.efunbox.audio.clients.UserFeign;
|
|
|
+import cn.efunbox.audio.clients.AudioHttp;
|
|
|
import cn.efunbox.audio.clients.UserHttp;
|
|
|
import cn.efunbox.audio.entity.Channel;
|
|
|
import cn.efunbox.audio.entity.Device;
|
|
@@ -11,6 +12,7 @@ import cn.efunbox.audio.utils.ApiCode;
|
|
|
import cn.efunbox.audio.utils.ApiResult;
|
|
|
import cn.efunbox.audio.utils.Common;
|
|
|
import cn.efunbox.audio.utils.HttpUtil;
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.lang.reflect.Array;
|
|
|
import java.sql.Timestamp;
|
|
|
import java.util.*;
|
|
|
|
|
@@ -40,6 +43,8 @@ public class DeviceController {
|
|
|
// UserFeign userFeign;
|
|
|
@Autowired
|
|
|
UserHttp userHttp;
|
|
|
+ @Autowired
|
|
|
+ AudioHttp audioHttp;
|
|
|
|
|
|
@Value("${iaas.user.register}")
|
|
|
private String urlRegister;
|
|
@@ -61,10 +66,23 @@ public class DeviceController {
|
|
|
@RequestMapping(value = "/feign")
|
|
|
public void Feigh(HttpServletRequest request, HttpServletResponse response,
|
|
|
@RequestParam("idChannel")String idChannel, @RequestParam("mobile")String mobile){
|
|
|
- String ip = HttpUtil.getIpAddress(request);
|
|
|
- System.out.println("start:"+ip);
|
|
|
- String res = userHttp.Register(UUID.randomUUID().toString().substring(0, 31),
|
|
|
- idChannel, ip, mobile, mobile);
|
|
|
+
|
|
|
+ String res = audioHttp.GetResource("653f6a0c-b997-11e7-9771-080027fcfc4b");
|
|
|
+ System.out.println(res);
|
|
|
+ Map map = JSONObject.parseObject(res);
|
|
|
+ if(map.get("code").toString().equalsIgnoreCase("200")){
|
|
|
+ map = JSONObject.parseObject(map.get("data").toString());
|
|
|
+ JSONArray array = JSONArray.parseArray(map.get("audios").toString());
|
|
|
+ map = JSONObject.parseObject(array.get(0).toString());
|
|
|
+ String path = map.get("path").toString();
|
|
|
+ System.out.println(path);
|
|
|
+ }
|
|
|
+
|
|
|
+// String ip = HttpUtil.getIpAddress(request);
|
|
|
+// System.out.println("start:"+ip);
|
|
|
+// String res = userHttp.Register(UUID.randomUUID().toString().substring(0, 31),
|
|
|
+// idChannel, ip, mobile, mobile);
|
|
|
+
|
|
|
// String res = userFeign.Register(
|
|
|
//// "application/json",
|
|
|
// bizCode,
|