新增数据时将id/token放入header，主参数体放入body

src/main/java/cn/efunbox/audio/aop/AdminInterceptor.java

@@ -28,8 +28,10 @@ public class AdminInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request,
                              HttpServletResponse response, Object handler) throws Exception {
-        String id = request.getParameter("id");
-        String token = request.getParameter("token");
+//        String id = request.getParameter("id");
+//        String token = request.getParameter("token");
+        String id = request.getHeader("id");
+        String token = request.getHeader("token");
         if(id==null || token==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return false;

src/main/java/cn/efunbox/audio/aop/AuthInterceptor.java

@@ -5,6 +5,7 @@ import cn.efunbox.audio.service.DeviceService;
 import cn.efunbox.audio.utils.ApiCode;
 import cn.efunbox.audio.utils.HttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -26,9 +27,11 @@ public class AuthInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request,
                              HttpServletResponse response, Object handler) throws Exception {
-        Map map = new HashMap<>();
-        String id = request.getParameter("id");
-        String token = request.getParameter("token");
+//        Map map = new HashMap<>();
+//        String id = request.getParameter("id");
+//        String token = request.getParameter("token");
+        String id = request.getHeader("id");
+        String token = request.getHeader("token");
         if(id==null || token==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return false;

src/main/java/cn/efunbox/audio/config/Config.java

@@ -46,7 +46,7 @@ public class Config extends WebMvcConfigurerAdapter{
 
         registry.addInterceptor(adminInterceptor())
                 .addPathPatterns("/**")
-                .excludePathPatterns("/device/**", "/admin/**", "/audio/search");
+                .excludePathPatterns("/device/**", "/admin/login", "/audio/search");
     }
 
     /**

src/main/java/cn/efunbox/audio/controller/AdminController.java

@@ -11,12 +11,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -67,17 +69,49 @@ public class AdminController {
         return;
     }
 
+//    @RequestMapping(value = "/register", method = RequestMethod.POST)
+//    public void Insert(HttpServletRequest request, HttpServletResponse response){
+//        String name = request.getParameter("name");
+//        String pwd = request.getParameter("pwd");
+//        String idChannel = request.getParameter("idChannel");
+//        if(name==null || name.length()<4 || pwd==null || pwd.length()<4){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
+//        if(idChannel==null || idChannel.length()==0)
+//            idChannel = "0";
+//        String salt = UUID.randomUUID().toString().replaceAll("-","");
+//        String token = UUID.randomUUID().toString().replaceAll("-", "");
+//        String pwdMD5 = Common.getMD5(Common.getMD5(pwd) + salt);
+//
+//        List<Admin> list = adminService.SearchByName(name);
+//        if(list!=null && list.size()>0){
+//            HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
+//            return;
+//        }
+//        Admin admin = new Admin();
+//        admin.setName(name);
+//        admin.setIdChannel(Long.valueOf(idChannel));
+//        admin.setPwd(pwdMD5);
+//        admin.setSalt(salt);
+//        admin.setToken(token);
+//        admin.setCreated(new Date());
+//        admin = adminService.Insert(admin);
+//        SaveRedis(admin);
+//
+//        HttpUtil.responseOutWithJson(request, response, admin);
+//        return;
+//    }
+
     @RequestMapping(value = "/register", method = RequestMethod.POST)
-    public void Insert(HttpServletRequest request, HttpServletResponse response){
-        String name = request.getParameter("name");
-        String pwd = request.getParameter("pwd");
-        String idChannel = request.getParameter("idChannel");
+    public void Insert(HttpServletRequest request, HttpServletResponse response, @RequestBody Admin admin){
+        String name = admin.getName();
+        String pwd = admin.getPwd();
+
         if(name==null || name.length()<4 || pwd==null || pwd.length()<4){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
-        if(idChannel==null || idChannel.length()==0)
-            idChannel = "0";
         String salt = UUID.randomUUID().toString().replaceAll("-","");
         String token = UUID.randomUUID().toString().replaceAll("-", "");
         String pwdMD5 = Common.getMD5(Common.getMD5(pwd) + salt);
@@ -87,12 +121,10 @@ public class AdminController {
             HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
             return;
         }
-        Admin admin = new Admin();
-        admin.setName(name);
         admin.setPwd(pwdMD5);
         admin.setSalt(salt);
         admin.setToken(token);
-        admin.setIdChannel(Long.valueOf(idChannel));
+        admin.setCreated(new Date());
         admin = adminService.Insert(admin);
         SaveRedis(admin);
 

src/main/java/cn/efunbox/audio/controller/AudioController.java

@@ -6,6 +6,7 @@ import cn.efunbox.audio.utils.ApiCode;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -52,6 +53,8 @@ public class AudioController {
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
+        if(id==null || id.length()==0)
+            id = request.getHeader("id");
         List<Audio> list = null;
 //        System.out.println("album:"+album+",name:"+name);
         if(name!=null && name.length()>0  && album!=null && album.length()>0)
@@ -99,27 +102,40 @@ public class AudioController {
         return;
     }
 
+//    @RequestMapping(value = "/insert", method = RequestMethod.POST)
+//    public void Insert(HttpServletRequest request, HttpServletResponse response){
+//        String gid = request.getParameter("gid");
+//        String rid = request.getParameter("rid");
+//        String album = request.getParameter("album");
+//        String lesson = request.getParameter("lesson");
+//        String name = request.getParameter("name");
+//        String url = request.getParameter("url");
+//        if(gid==null || rid==null || album==null || name==null){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
+//
+//        Audio audio = new Audio();
+//        audio.setIdGroup(Long.valueOf(gid));
+//        audio.setIdResource(rid);
+//        audio.setAlbum(album);
+//        if(lesson!=null && lesson.length()>0)
+//            audio.setLesson(Integer.valueOf(lesson));
+//        audio.setName(name);
+//        audio.setUrl(url);
+//        audio.setCreated(new Date());
+//        audio = audioService.Insert(audio);
+//
+//        HttpUtil.responseOutWithJson(request, response, audio);
+//        return;
+//    }
+
     @RequestMapping(value = "/insert", method = RequestMethod.POST)
-    public void Insert(HttpServletRequest request, HttpServletResponse response){
-        String gid = request.getParameter("gid");
-        String rid = request.getParameter("rid");
-        String album = request.getParameter("album");
-        String lesson = request.getParameter("lesson");
-        String name = request.getParameter("name");
-        String url = request.getParameter("url");
-        if(gid==null || rid==null || album==null || name==null){
+    public void Insert(HttpServletRequest request, HttpServletResponse response, @RequestBody Audio audio){
+        if(audio.getIdGroup()==null || audio.getIdResource()==null || audio.getName()==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
-
-        Audio audio = new Audio();
-        audio.setIdGroup(Long.valueOf(gid));
-        audio.setIdResource(rid);
-        audio.setAlbum(album);
-        if(lesson!=null && lesson.length()>0)
-            audio.setLesson(Integer.valueOf(lesson));
-        audio.setName(name);
-        audio.setUrl(url);
         audio.setCreated(new Date());
         audio = audioService.Insert(audio);
 

src/main/java/cn/efunbox/audio/controller/ChannelController.java

@@ -6,12 +6,14 @@ import cn.efunbox.audio.utils.ApiCode;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -48,25 +50,38 @@ public class ChannelController {
         return;
     }
 
-    @RequestMapping(value = "/insert", method = RequestMethod.POST)
-    public void Insert(HttpServletRequest request, HttpServletResponse response){
-        String name = request.getParameter("name");
-        String idFather = request.getParameter("idFather");
-        if(name==null){
-            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
-            return;
-        }
-        if(idFather==null || idFather.length()==0)
-            idFather = "0";
+//    @RequestMapping(value = "/insert", method = RequestMethod.POST)
+//    public void Insert(HttpServletRequest request, HttpServletResponse response){
+//        String name = request.getParameter("name");
+//        String idFather = request.getParameter("idFather");
+//        if(name==null){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
+//        if(idFather==null || idFather.length()==0)
+//            idFather = "0";
+//
+//        List<Channel> list = channelService.SearchByName(name);
+//        if(list!=null && list.size()>0){
+//            HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
+//            return;
+//        }
+//        Channel channel = new Channel();
+//        channel.setName(name);
+//        channel.setIdFather(Long.valueOf(idFather));
+//        channel = channelService.Insert(channel);
+//        HttpUtil.responseOutWithJson(request, response, channel);
+//        return;
+//    }
 
-        List<Channel> list = channelService.SearchByName(name);
+    @RequestMapping(value = "/insert", method = RequestMethod.POST)
+    public void Insert(HttpServletRequest request, HttpServletResponse response, @RequestBody Channel channel){
+        List<Channel> list = channelService.SearchByName(channel.getName());
         if(list!=null && list.size()>0){
             HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
             return;
         }
-        Channel channel = new Channel();
-        channel.setName(name);
-        channel.setIdFather(Long.valueOf(idFather));
+        channel.setCreated(new Date());
         channel = channelService.Insert(channel);
         HttpUtil.responseOutWithJson(request, response, channel);
         return;

src/main/java/cn/efunbox/audio/controller/DeviceController.java

@@ -2,16 +2,14 @@ package cn.efunbox.audio.controller;
 
 import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.entity.Device;
+import cn.efunbox.audio.entity.Grouping;
 import cn.efunbox.audio.service.ChannelService;
 import cn.efunbox.audio.service.DeviceService;
 import cn.efunbox.audio.utils.ApiCode;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -53,28 +51,59 @@ public class DeviceController {
         return map;
     }
 
+//    @RequestMapping(value = "/register" ,method = RequestMethod.POST)
+//    public Map Register(HttpServletRequest request){
+//        Map map = new HashMap<>();
+//        String idChannel = request.getParameter("idChannel");
+//        String idDevice = request.getParameter("idDevice");
+//        if(idChannel==null || idDevice==null){
+//            map.put("code", ApiCode.PARAMETER_ERROR.getCode());
+//            map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
+//            return map;
+//        }
+//        if(deviceService.CheckRegister(Long.valueOf(idChannel), Long.valueOf(idDevice))) {
+//            map.put("code", ApiCode.RECORD_EXIST.getCode());
+//            map.put("msg", ApiCode.RECORD_EXIST.getMessage());
+//            return map;
+//        }
+//        List<Channel> channelList = channelService.SearchById(Long.valueOf(idChannel));
+//        if(channelList==null || channelList.size()<1){
+//            map.put("code", ApiCode.PARAMETER_ERROR.getCode());
+//            map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
+//            return map;
+//        }
+//        Device device = deviceService.Register(Long.valueOf(idChannel), Long.valueOf(idDevice));
+//        if(device!=null){
+//            map.put("code", ApiCode.OK.getCode());
+//            Map data = new HashMap<>();
+//            data.put("id", device.getId());
+//            data.put("token", device.getTokenNew());
+//            map.put("data", data);
+//        }
+//
+//        return map;
+//    }
+
     @RequestMapping(value = "/register" ,method = RequestMethod.POST)
-    public Map Register(HttpServletRequest request){
+    public Map Register(HttpServletRequest request, @RequestBody Device device){
         Map map = new HashMap<>();
-        String idChannel = request.getParameter("idChannel");
-        String idDevice = request.getParameter("idDevice");
-        if(idChannel==null || idDevice==null){
+        if(device.getIdChannel()==null || device.getIdDevice()==null){
             map.put("code", ApiCode.PARAMETER_ERROR.getCode());
             map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
             return map;
         }
-        if(deviceService.CheckRegister(Long.valueOf(idChannel), Long.valueOf(idDevice))){
+        if(deviceService.CheckRegister(device.getIdChannel(), device.getIdDevice())){
             map.put("code", ApiCode.RECORD_EXIST.getCode());
             map.put("msg", ApiCode.RECORD_EXIST.getMessage());
             return map;
         }
-        List<Channel> channelList = channelService.SearchById(Long.valueOf(idChannel));
+        List<Channel> channelList = channelService.SearchById(device.getIdChannel());
         if(channelList==null || channelList.size()<1){
             map.put("code", ApiCode.PARAMETER_ERROR.getCode());
             map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
             return map;
         }
-        Device device = deviceService.Register(Long.valueOf(idChannel), Long.valueOf(idDevice));
+        device = deviceService.Register(device.getIdChannel(), device.getIdDevice());
         if(device!=null){
             map.put("code", ApiCode.OK.getCode());
             Map data = new HashMap<>();

src/main/java/cn/efunbox/audio/controller/GroupingController.java

@@ -6,12 +6,14 @@ import cn.efunbox.audio.utils.ApiCode;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -51,25 +53,42 @@ public class GroupingController {
         return;
     }
 
+//    @RequestMapping(value = "/insert", method = RequestMethod.POST)
+//    public void Insert(HttpServletRequest request, HttpServletResponse response){
+//        String name = request.getParameter("name");
+//        String idFather = request.getParameter("idFather");
+//        if(name==null){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
+//        if(idFather==null || idFather.length()==0)
+//            idFather = "0";
+//
+//        List<Grouping> list = groupingService.SearchByName(name);
+//        if(list!=null && list.size()>0){
+//            HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
+//            return;
+//        }
+//        Grouping grouping = new Grouping();
+//        grouping.setName(name);
+//        grouping.setIdFather(Long.valueOf(idFather));
+//        grouping = groupingService.Insert(grouping);
+//        HttpUtil.responseOutWithJson(request, response, grouping);
+//        return;
+//    }
+
     @RequestMapping(value = "/insert", method = RequestMethod.POST)
-    public void Insert(HttpServletRequest request, HttpServletResponse response){
-        String name = request.getParameter("name");
-        String idFather = request.getParameter("idFather");
-        if(name==null){
+    public void Insert(HttpServletRequest request, HttpServletResponse response, @RequestBody Grouping grouping){
+        if(grouping.getName()==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
-        if(idFather==null || idFather.length()==0)
-            idFather = "0";
-
-        List<Grouping> list = groupingService.SearchByName(name);
+        List<Grouping> list = groupingService.SearchByName(grouping.getName());
         if(list!=null && list.size()>0){
             HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
             return;
         }
-        Grouping grouping = new Grouping();
-        grouping.setName(name);
-        grouping.setIdFather(Long.valueOf(idFather));
+        grouping.setCreated(new Date());
         grouping = groupingService.Insert(grouping);
         HttpUtil.responseOutWithJson(request, response, grouping);
         return;

src/main/java/cn/efunbox/audio/controller/RightsController.java

@@ -10,12 +10,14 @@ import cn.efunbox.audio.utils.ApiCode;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -63,31 +65,58 @@ public class RightsController {
         return;
     }
 
+//    @RequestMapping(value = "/insert", method = RequestMethod.POST)
+//    public void Insert(HttpServletRequest request, HttpServletResponse response){
+//        String idChannel = request.getParameter("idChannel");
+//        String idGroup = request.getParameter("idGroup");
+//        if(idChannel==null || idGroup==null){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
+//
+//        List<Rights> list = rightsService.SearchByIdChannelAndIdGroup(Long.valueOf(idChannel), Long.valueOf(idGroup));
+//        if(list!=null && list.size()>0){
+//            HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
+//            return;
+//        }
+//        List<Channel> cList = channelService.SearchById(Long.valueOf(idChannel));
+//        List<Grouping> gList = groupingService.SearchById(Long.valueOf(idGroup));
+//        if(cList==null || cList.size()<1 || gList==null || gList.size()<1){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
+//        Rights rights = new Rights();
+//        rights.setIdChannel(cList.get(0).getId());
+//        rights.setNameChannel(cList.get(0).getName());
+//        rights.setIdGroup(gList.get(0).getId());
+//        rights.setNameGroup(gList.get(0).getName());
+//        rights = rightsService.Insert(rights);
+//
+//        HttpUtil.responseOutWithJson(request, response, rights);
+//        return;
+//    }
+
     @RequestMapping(value = "/insert", method = RequestMethod.POST)
-    public void Insert(HttpServletRequest request, HttpServletResponse response){
-        String idChannel = request.getParameter("idChannel");
-        String idGroup = request.getParameter("idGroup");
-        if(idChannel==null || idGroup==null){
+    public void Insert(HttpServletRequest request, HttpServletResponse response, @RequestBody Rights rights){
+        if(rights.getIdChannel()==null || rights.getIdGroup()==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
 
-        List<Rights> list = rightsService.SearchByIdChannelAndIdGroup(Long.valueOf(idChannel), Long.valueOf(idGroup));
+        List<Rights> list = rightsService.SearchByIdChannelAndIdGroup(rights.getIdChannel(), rights.getIdGroup());
         if(list!=null && list.size()>0){
             HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
             return;
         }
-        List<Channel> cList = channelService.SearchById(Long.valueOf(idChannel));
-        List<Grouping> gList = groupingService.SearchById(Long.valueOf(idGroup));
+        List<Channel> cList = channelService.SearchById(rights.getIdChannel());
+        List<Grouping> gList = groupingService.SearchById(rights.getIdGroup());
         if(cList==null || cList.size()<1 || gList==null || gList.size()<1){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
-        Rights rights = new Rights();
-        rights.setIdChannel(cList.get(0).getId());
         rights.setNameChannel(cList.get(0).getName());
-        rights.setIdGroup(gList.get(0).getId());
         rights.setNameGroup(gList.get(0).getName());
+        rights.setCreated(new Date());
         rights = rightsService.Insert(rights);
 
         HttpUtil.responseOutWithJson(request, response, rights);