修改包名

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

@@ -1,12 +1,9 @@
 package cn.efunbox.audio.aop;
 
 import cn.efunbox.audio.consts.Consts;
-import cn.efunbox.audio.entity.Admin;
-import cn.efunbox.audio.entity.Device;
 import cn.efunbox.audio.service.AdminService;
-import cn.efunbox.audio.service.DeviceService;
-import cn.efunbox.audio.util.ApiCode;
-import cn.efunbox.audio.util.HttpUtil;
+import cn.efunbox.audio.utils.ApiCode;
+import cn.efunbox.audio.utils.HttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
@@ -15,8 +12,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 管理员验证拦截器

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

@@ -1,10 +1,9 @@
 package cn.efunbox.audio.aop;
 
 import cn.efunbox.audio.entity.Device;
-import cn.efunbox.audio.impl.DeviceServiceImpl;
 import cn.efunbox.audio.service.DeviceService;
-import cn.efunbox.audio.util.ApiCode;
-import cn.efunbox.audio.util.HttpUtil;
+import cn.efunbox.audio.utils.ApiCode;
+import cn.efunbox.audio.utils.HttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

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

@@ -3,9 +3,9 @@ package cn.efunbox.audio.controller;
 import cn.efunbox.audio.consts.Consts;
 import cn.efunbox.audio.entity.Admin;
 import cn.efunbox.audio.service.AdminService;
-import cn.efunbox.audio.util.ApiCode;
-import cn.efunbox.audio.util.Common;
-import cn.efunbox.audio.util.HttpUtil;
+import cn.efunbox.audio.utils.ApiCode;
+import cn.efunbox.audio.utils.Common;
+import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -56,7 +54,7 @@ public class AdminController {
 //        System.out.println(pwdMD5);
 //        System.out.println(admin.getPwd());
         if(pwdMD5.equalsIgnoreCase(admin.getPwd())){
-            String token = UUID.randomUUID().toString().replaceAll("-","");
+            String token = UUID.randomUUID().toString().replaceAll("-", "");
             admin.setToken(token);
             adminService.Update(admin);
             admin.setPwd("");

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

@@ -2,15 +2,12 @@ package cn.efunbox.audio.controller;
 
 import cn.efunbox.audio.entity.*;
 import cn.efunbox.audio.service.*;
-import cn.efunbox.audio.util.ApiCode;
-import cn.efunbox.audio.util.HttpUtil;
-import com.netflix.ribbon.proxy.annotation.Http;
-import com.sun.tools.javac.util.*;
+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 javax.servlet.http.HttpServletRequest;

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

@@ -1,11 +1,9 @@
 package cn.efunbox.audio.controller;
 
-import cn.efunbox.audio.entity.Audio;
 import cn.efunbox.audio.entity.Channel;
-import cn.efunbox.audio.service.AudioService;
 import cn.efunbox.audio.service.ChannelService;
-import cn.efunbox.audio.util.ApiCode;
-import cn.efunbox.audio.util.HttpUtil;
+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;
@@ -14,9 +12,7 @@ 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.Random;
 
 /**
  * Created by yao on 17-9-26.

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

@@ -2,10 +2,9 @@ package cn.efunbox.audio.controller;
 
 import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.entity.Device;
-import cn.efunbox.audio.repository.DeviceRepo;
 import cn.efunbox.audio.service.ChannelService;
 import cn.efunbox.audio.service.DeviceService;
-import cn.efunbox.audio.util.ApiCode;
+import cn.efunbox.audio.utils.ApiCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,11 +1,9 @@
 package cn.efunbox.audio.controller;
 
-import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.entity.Grouping;
-import cn.efunbox.audio.service.ChannelService;
 import cn.efunbox.audio.service.GroupingService;
-import cn.efunbox.audio.util.ApiCode;
-import cn.efunbox.audio.util.HttpUtil;
+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;

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

@@ -1,11 +1,9 @@
 package cn.efunbox.audio.controller;
 
-import cn.efunbox.audio.entity.Audio;
 import cn.efunbox.audio.entity.Record;
-import cn.efunbox.audio.service.AudioService;
 import cn.efunbox.audio.service.RecordService;
-import cn.efunbox.audio.util.ApiCode;
-import cn.efunbox.audio.util.HttpUtil;
+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;
@@ -14,9 +12,7 @@ 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.Random;
 
 /**
  * 音频点播记录

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

@@ -6,8 +6,8 @@ import cn.efunbox.audio.entity.Rights;
 import cn.efunbox.audio.service.ChannelService;
 import cn.efunbox.audio.service.GroupingService;
 import cn.efunbox.audio.service.RightsService;
-import cn.efunbox.audio.util.ApiCode;
-import cn.efunbox.audio.util.HttpUtil;
+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;

src/main/java/cn/efunbox/audio/util/AbstractApiCode.java

@@ -1,4 +1,4 @@
-package cn.efunbox.audio.util;
+package cn.efunbox.audio.utils;
 
 import java.io.Serializable;
 

src/main/java/cn/efunbox/audio/util/ApiCode.java

@@ -1,4 +1,4 @@
-package cn.efunbox.audio.util;
+package cn.efunbox.audio.utils;
 
 /**
  * Created by yao on 17-9-26.

src/main/java/cn/efunbox/audio/util/ApiResult.java

@@ -1,4 +1,4 @@
-package cn.efunbox.audio.util;
+package cn.efunbox.audio.utils;
 
 import java.io.Serializable;
 import java.util.Map;

src/main/java/cn/efunbox/audio/util/Common.java

@@ -1,4 +1,4 @@
-package cn.efunbox.audio.util;
+package cn.efunbox.audio.utils;
 
 import java.security.MessageDigest;
 

src/main/java/cn/efunbox/audio/util/HttpUtil.java

@@ -1,4 +1,4 @@
-package cn.efunbox.audio.util;
+package cn.efunbox.audio.utils;
 
 import com.alibaba.fastjson.JSON;
 import org.slf4j.Logger;