|
@@ -9,9 +9,11 @@ import cn.efunbox.audio.service.ChannelService;
|
|
import cn.efunbox.audio.service.DeviceService;
|
|
import cn.efunbox.audio.service.DeviceService;
|
|
import cn.efunbox.audio.utils.ApiCode;
|
|
import cn.efunbox.audio.utils.ApiCode;
|
|
import cn.efunbox.audio.utils.HttpUtil;
|
|
import cn.efunbox.audio.utils.HttpUtil;
|
|
|
|
+import cn.efunbox.audio.utils.SecurityUtils;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.data.domain.Page;
|
|
import org.springframework.data.domain.Page;
|
|
@@ -62,6 +64,8 @@ public class DeviceController {
|
|
private String terminal;
|
|
private String terminal;
|
|
@Value("${iaas.user.audio.entryType}")
|
|
@Value("${iaas.user.audio.entryType}")
|
|
private String entryType;
|
|
private String entryType;
|
|
|
|
+ @Value("${interface.sign.key}")
|
|
|
|
+ private String signKey;
|
|
|
|
|
|
@RequestMapping(value = "/feign")
|
|
@RequestMapping(value = "/feign")
|
|
public void Feigh(HttpServletRequest request, HttpServletResponse response,
|
|
public void Feigh(HttpServletRequest request, HttpServletResponse response,
|
|
@@ -186,10 +190,24 @@ public class DeviceController {
|
|
public void token(HttpServletRequest request, HttpServletResponse response){
|
|
public void token(HttpServletRequest request, HttpServletResponse response){
|
|
String idChannel = request.getParameter("idChannel");
|
|
String idChannel = request.getParameter("idChannel");
|
|
String idDevice = request.getParameter("idDevice");
|
|
String idDevice = request.getParameter("idDevice");
|
|
- if(idChannel==null || idDevice==null){
|
|
|
|
|
|
+ String sign = request.getParameter("sign");
|
|
|
|
+
|
|
|
|
+ if(StringUtils.isBlank(idChannel) || StringUtils.isBlank(idDevice) || StringUtils.isBlank(sign)){
|
|
HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
|
|
HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+ Map<String,String> param = new HashMap<>();
|
|
|
|
+ param.put("idChannel",idChannel);
|
|
|
|
+ param.put("idDevice",idDevice);
|
|
|
|
+ String test = SecurityUtils.createMD5Sign(param, signKey);
|
|
|
|
+
|
|
|
|
+ if (!sign.equalsIgnoreCase(test)) {
|
|
|
|
+ HttpUtil.responseApiCode(request, response, ApiCode.SIGN_FAIL);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
List<Channel> channelList = channelService.SearchById(Long.valueOf(idChannel));
|
|
List<Channel> channelList = channelService.SearchById(Long.valueOf(idChannel));
|
|
if(channelList==null || channelList.size()<1){
|
|
if(channelList==null || channelList.size()<1){
|