合并杨迪文件2

ear_tag/src/main/java/com/huimv/ear_tag/EarTagApplication.java

@@ -1,8 +1,10 @@
-package com.huimv.ear_tag;
+package com.huimv.eartag;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import tk.mybatis.spring.annotation.MapperScan;
 
+@MapperScan(basePackages = {"com.huimv.eartag.dao"})
 @SpringBootApplication
 public class EarTagApplication {
 

ear_tag/src/main/java/com/huimv/ear_tag/controller/EartagDataController.java

@@ -1,11 +1,11 @@
-package com.huimv.ear_tag.controller;
+package com.huimv.eartag.controller;
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.entity.Result;
-import com.huimv.ear_tag.entity.StatusCode;
-import com.huimv.ear_tag.pojo.EartagData;
-import com.huimv.ear_tag.service.EartagDataService;
+import com.huimv.eartag.entity.Result;
+import com.huimv.eartag.entity.StatusCode;
+import com.huimv.eartag.pojo.EartagData;
+import com.huimv.eartag.service.EartagDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ear_tag/src/main/java/com/huimv/ear_tag/controller/FarmInfoController.java

@@ -1,12 +1,12 @@
-package com.huimv.ear_tag.controller;
+package com.huimv.eartag.controller;
 
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.entity.Result;
-import com.huimv.ear_tag.entity.StatusCode;
-import com.huimv.ear_tag.pojo.FarmInfo;
-import com.huimv.ear_tag.service.FarmInfoService;
+import com.huimv.eartag.entity.Result;
+import com.huimv.eartag.entity.StatusCode;
+import com.huimv.eartag.pojo.FarmInfo;
+import com.huimv.eartag.service.FarmInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ear_tag/src/main/java/com/huimv/ear_tag/controller/JqidController.java

@@ -1,12 +1,12 @@
-package com.huimv.ear_tag.controller;
+package com.huimv.eartag.controller;
 
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.entity.Result;
-import com.huimv.ear_tag.entity.StatusCode;
-import com.huimv.ear_tag.pojo.Jqid;
-import com.huimv.ear_tag.service.JqidService;
+import com.huimv.eartag.entity.Result;
+import com.huimv.eartag.entity.StatusCode;
+import com.huimv.eartag.pojo.Jqid;
+import com.huimv.eartag.service.JqidService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ear_tag/src/main/java/com/huimv/ear_tag/controller/PigHomeController.java

@@ -1,12 +1,12 @@
-package com.huimv.ear_tag.controller;
+package com.huimv.eartag.controller;
 
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.entity.Result;
-import com.huimv.ear_tag.entity.StatusCode;
-import com.huimv.ear_tag.pojo.PigHome;
-import com.huimv.ear_tag.service.PigHomeService;
+import com.huimv.eartag.entity.Result;
+import com.huimv.eartag.entity.StatusCode;
+import com.huimv.eartag.pojo.PigHome;
+import com.huimv.eartag.service.PigHomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ear_tag/src/main/java/com/huimv/ear_tag/dao/EartagDataMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.ear_tag.dao;
+package com.huimv.eartag.dao;
 
 
-import com.huimv.ear_tag.pojo.EartagData;
+import com.huimv.eartag.pojo.EartagData;
 import tk.mybatis.mapper.common.Mapper;
 
 /****

ear_tag/src/main/java/com/huimv/ear_tag/dao/FarmInfoMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.ear_tag.dao;
+package com.huimv.eartag.dao;
 
 
-import com.huimv.ear_tag.pojo.FarmInfo;
+import com.huimv.eartag.pojo.FarmInfo;
 import tk.mybatis.mapper.common.Mapper;
 
 /****

ear_tag/src/main/java/com/huimv/ear_tag/dao/JqidMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.ear_tag.dao;
+package com.huimv.eartag.dao;
 
 
-import com.huimv.ear_tag.pojo.Jqid;
+import com.huimv.eartag.pojo.Jqid;
 import tk.mybatis.mapper.common.Mapper;
 
 /****

ear_tag/src/main/java/com/huimv/ear_tag/dao/PigHomeMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.ear_tag.dao;
+package com.huimv.eartag.dao;
 
 
-import com.huimv.ear_tag.pojo.PigHome;
+import com.huimv.eartag.pojo.PigHome;
 import tk.mybatis.mapper.common.Mapper;
 
 /****

ear_tag/src/main/java/com/huimv/ear_tag/entity/BCrypt.java

@@ -12,7 +12,7 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;

ear_tag/src/main/java/com/huimv/ear_tag/entity/CacheKey.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 /****
  * @Author:www.itheima.com

ear_tag/src/main/java/com/huimv/ear_tag/entity/ChineseUtils.java

@@ -1,7 +1,6 @@
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 import java.io.UnsupportedEncodingException;
-import java.util.Date;
 import java.util.Random;
 
 /***

ear_tag/src/main/java/com/huimv/ear_tag/entity/IdWorker.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 import java.lang.management.ManagementFactory;
 import java.net.InetAddress;

ear_tag/src/main/java/com/huimv/ear_tag/entity/Page.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 import java.io.Serializable;
 import java.util.List;

ear_tag/src/main/java/com/huimv/ear_tag/entity/PageResult.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/ear_tag/entity/RandomValueUtil.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 /***
  *

ear_tag/src/main/java/com/huimv/ear_tag/entity/Result.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 import java.io.Serializable;
 

ear_tag/src/main/java/com/huimv/ear_tag/entity/StatusCode.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.entity;
+package com.huimv.eartag.entity;
 
 /**
  * 返回码

ear_tag/src/main/java/com/huimv/ear_tag/pojo/EartagData.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.pojo;
+package com.huimv.eartag.pojo;
 
 import javax.persistence.*;
 import java.io.Serializable;

ear_tag/src/main/java/com/huimv/ear_tag/pojo/FarmInfo.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.pojo;
+package com.huimv.eartag.pojo;
 
 import javax.persistence.*;
 import java.io.Serializable;

ear_tag/src/main/java/com/huimv/ear_tag/pojo/Jqid.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.pojo;
+package com.huimv.eartag.pojo;
 
 import javax.persistence.*;
 import java.io.Serializable;

ear_tag/src/main/java/com/huimv/ear_tag/pojo/PigHome.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.pojo;
+package com.huimv.eartag.pojo;
 
 import javax.persistence.*;
 import java.io.Serializable;

ear_tag/src/main/java/com/huimv/ear_tag/service/EartagDataService.java

@@ -1,10 +1,10 @@
-package com.huimv.ear_tag.service;
+package com.huimv.eartag.service;
 
 
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.pojo.EartagData;
+import com.huimv.eartag.pojo.EartagData;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/ear_tag/service/FarmInfoService.java

@@ -1,8 +1,8 @@
-package com.huimv.ear_tag.service;
+package com.huimv.eartag.service;
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.pojo.FarmInfo;
+import com.huimv.eartag.pojo.FarmInfo;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/ear_tag/service/IParseClientMessage.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.service;
+package com.huimv.eartag.service;
 
 public interface IParseClientMessage {
 

ear_tag/src/main/java/com/huimv/ear_tag/service/JqidService.java

@@ -1,7 +1,7 @@
-package com.huimv.ear_tag.service;
+package com.huimv.eartag.service;
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.pojo.Jqid;
+import com.huimv.eartag.pojo.Jqid;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/ear_tag/service/PigHomeService.java

@@ -1,8 +1,8 @@
-package com.huimv.ear_tag.service;
+package com.huimv.eartag.service;
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.pojo.PigHome;
+import com.huimv.eartag.pojo.PigHome;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/ear_tag/service/impl/EartagDataServiceImpl.java

@@ -1,12 +1,12 @@
-package com.huimv.ear_tag.service.impl;
+package com.huimv.eartag.service.impl;
 
 
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.dao.EartagDataMapper;
-import com.huimv.ear_tag.pojo.EartagData;
-import com.huimv.ear_tag.service.EartagDataService;
+import com.huimv.eartag.dao.EartagDataMapper;
+import com.huimv.eartag.pojo.EartagData;
+import com.huimv.eartag.service.EartagDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

ear_tag/src/main/java/com/huimv/ear_tag/service/impl/FarmInfoServiceImpl.java

@@ -1,13 +1,13 @@
-package com.huimv.ear_tag.service.impl;
+package com.huimv.eartag.service.impl;
 
 
 
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.dao.FarmInfoMapper;
-import com.huimv.ear_tag.pojo.FarmInfo;
-import com.huimv.ear_tag.service.FarmInfoService;
+import com.huimv.eartag.dao.FarmInfoMapper;
+import com.huimv.eartag.pojo.FarmInfo;
+import com.huimv.eartag.service.FarmInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

ear_tag/src/main/java/com/huimv/ear_tag/service/impl/JqidServiceImpl.java

@@ -1,14 +1,14 @@
-package com.huimv.ear_tag.service.impl;
+package com.huimv.eartag.service.impl;
 
 
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.dao.JqidMapper;
-import com.huimv.ear_tag.pojo.Jqid;
-import com.huimv.ear_tag.service.FarmInfoService;
-import com.huimv.ear_tag.service.JqidService;
-import com.huimv.ear_tag.service.PigHomeService;
+import com.huimv.eartag.dao.JqidMapper;
+import com.huimv.eartag.pojo.Jqid;
+import com.huimv.eartag.service.FarmInfoService;
+import com.huimv.eartag.service.JqidService;
+import com.huimv.eartag.service.PigHomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

ear_tag/src/main/java/com/huimv/ear_tag/service/impl/ParseClientMessageImpl.java

@@ -1,6 +1,6 @@
-package com.huimv.ear_tag.service.impl;
+package com.huimv.eartag.service.impl;
 
-import com.huimv.ear_tag.service.IParseClientMessage;
+import com.huimv.eartag.service.IParseClientMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

ear_tag/src/main/java/com/huimv/ear_tag/service/impl/PigHomeServiceImpl.java

@@ -1,11 +1,11 @@
-package com.huimv.ear_tag.service.impl;
+package com.huimv.eartag.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.huimv.ear_tag.dao.PigHomeMapper;
-import com.huimv.ear_tag.pojo.PigHome;
-import com.huimv.ear_tag.service.FarmInfoService;
-import com.huimv.ear_tag.service.PigHomeService;
+import com.huimv.eartag.dao.PigHomeMapper;
+import com.huimv.eartag.pojo.PigHome;
+import com.huimv.eartag.service.FarmInfoService;
+import com.huimv.eartag.service.PigHomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

ear_tag/src/test/java/com/huimv/ear_tag/EarTagApplicationTests.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag;
+package com.huimv.eartag;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

ear_tag/src/test/java/com/huimv/ear_tag/service/ParseClientMessageTest.java

@@ -1,4 +1,4 @@
-package com.huimv.ear_tag.service;
+package com.huimv.eartag.service;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;