zr

src/com/atguigu/springmvc/common/MatcherString.java → src/main/com/atguigu/springmvc/common/MatcherString.java

-package com.atguigu.springmvc.common;
+package main.com.atguigu.springmvc.common;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

src/com/atguigu/springmvc/common/MongoUtils.java → src/main/com/atguigu/springmvc/common/MongoUtils.java

-package com.atguigu.springmvc.common;
+package main.com.atguigu.springmvc.common;
 
 
 import com.alibaba.fastjson.JSON;

src/com/atguigu/springmvc/common/MysqlUtils.java → src/main/com/atguigu/springmvc/common/MysqlUtils.java

-package com.atguigu.springmvc.common;
+package main.com.atguigu.springmvc.common;
 
 import java.sql.*;
 import java.util.ArrayList;

src/com/atguigu/springmvc/common/RedisUtil.java → src/main/com/atguigu/springmvc/common/RedisUtil.java

-package com.atguigu.springmvc.common;
+package main.com.atguigu.springmvc.common;
 
 import io.restassured.response.Response;
 

src/com/atguigu/springmvc/common/SecurityUtils.java → src/main/com/atguigu/springmvc/common/SecurityUtils.java

-package com.atguigu.springmvc.common;
+package main.com.atguigu.springmvc.common;
 
 import java.math.BigInteger;
 import java.security.MessageDigest;

src/com/atguigu/springmvc/entities/Address.java → src/main/com/atguigu/springmvc/entities/Address.java

-package com.atguigu.springmvc.entities;
+package main.com.atguigu.springmvc.entities;
 
 public class Address {
 

src/com/atguigu/springmvc/entities/AwardVO.java → src/main/com/atguigu/springmvc/entities/AwardVO.java

-package com.atguigu.springmvc.entities;
+package main.com.atguigu.springmvc.entities;
 
-import com.atguigu.springmvc.enums.PrizeTypeEnum;
+import main.com.atguigu.springmvc.enums.PrizeTypeEnum;
 
 /**
  *

src/com/atguigu/springmvc/entities/CustomHdToolVO.java → src/main/com/atguigu/springmvc/entities/CustomHdToolVO.java

-package com.atguigu.springmvc.entities;
+package main.com.atguigu.springmvc.entities;
 
 /**
  * 后台-自定义活动工具vo类

src/com/atguigu/springmvc/entities/User.java → src/main/com/atguigu/springmvc/entities/User.java

-package com.atguigu.springmvc.entities;
+package main.com.atguigu.springmvc.entities;
 
 public class User {
 	

src/com/atguigu/springmvc/enums/ActivityDataTypeEnum.java → src/main/com/atguigu/springmvc/enums/ActivityDataTypeEnum.java

-package com.atguigu.springmvc.enums;
+package main.com.atguigu.springmvc.enums;
 
 /**
  * 出奖方式

src/com/atguigu/springmvc/enums/PrizeTypeEnum.java → src/main/com/atguigu/springmvc/enums/PrizeTypeEnum.java

-package com.atguigu.springmvc.enums;
+package main.com.atguigu.springmvc.enums;
 
 /**
  * 奖品类型枚举 (支付宝 福袋 谢谢参与等..)

src/com/atguigu/springmvc/handlers/ActivityModule.java → src/main/com/atguigu/springmvc/handlers/ActivityModule.java

-package com.atguigu.springmvc.handlers;
-
-import com.atguigu.springmvc.common.MatcherString;
-import com.atguigu.springmvc.common.MysqlUtils;
-import com.atguigu.springmvc.entities.AwardVO;
-import com.atguigu.springmvc.enums.ActivityDataTypeEnum;
-import com.atguigu.springmvc.service.ManagerService;
+package main.com.atguigu.springmvc.handlers;
+
+import main.com.atguigu.springmvc.common.MysqlUtils;
+import main.com.atguigu.springmvc.entities.AwardVO;
+import main.com.atguigu.springmvc.enums.ActivityDataTypeEnum;
+import main.com.atguigu.springmvc.service.ManagerService;
+import main.com.atguigu.springmvc.entities.CustomHdToolVO;
+import main.com.atguigu.springmvc.service.CustomHdToolCtrlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import com.atguigu.springmvc.entities.CustomHdToolVO;
-import com.atguigu.springmvc.service.CustomHdToolCtrlService;
 import io.restassured.response.Response;
 import java.util.List;
 import java.util.ArrayList;
@@ -19,7 +18,6 @@ import java.util.Map;
 import com.alibaba.fastjson.JSON;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
-import org.testng.Assert;
 
 import javax.servlet.http.HttpServletRequest;
 

src/com/atguigu/springmvc/handlers/AutoModule.java → src/main/com/atguigu/springmvc/handlers/AutoModule.java

-package com.atguigu.springmvc.handlers;
+package main.com.atguigu.springmvc.handlers;
 
-import com.atguigu.springmvc.common.MongoUtils;
+import main.com.atguigu.springmvc.common.MongoUtils;
 import com.mongodb.DB;
 import com.mongodb.DBCursor;
 import com.mongodb.DBObject;

src/com/atguigu/springmvc/handlers/CoderModule.java → src/main/com/atguigu/springmvc/handlers/CoderModule.java

-package com.atguigu.springmvc.handlers;
+package main.com.atguigu.springmvc.handlers;
 
-import com.atguigu.springmvc.common.MatcherString;
+import main.com.atguigu.springmvc.common.MatcherString;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

src/com/atguigu/springmvc/handlers/CollectModule.java → src/main/com/atguigu/springmvc/handlers/CollectModule.java

-package com.atguigu.springmvc.handlers;
+package main.com.atguigu.springmvc.handlers;
 
-import com.atguigu.springmvc.common.MatcherString;
-import com.atguigu.springmvc.common.MysqlUtils;
-import com.atguigu.springmvc.service.Authorization;
-import com.atguigu.springmvc.service.NewActivityService;
+import main.com.atguigu.springmvc.common.MatcherString;
+import main.com.atguigu.springmvc.common.MysqlUtils;
+import main.com.atguigu.springmvc.service.Authorization;
+import main.com.atguigu.springmvc.service.NewActivityService;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.testng.Assert;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Base64;
@@ -24,9 +23,9 @@ import static io.restassured.RestAssured.given;
 @Controller
 public class CollectModule {
 	@Autowired
-	NewActivityService newActivityService;
+    NewActivityService newActivityService;
 	@Autowired
-	Authorization authorization;
+    Authorization authorization;
 
 	final Base64.Decoder decoder = Base64.getDecoder();
 	private MysqlUtils jdbc;

src/com/atguigu/springmvc/handlers/HelloWorld.java → src/main/com/atguigu/springmvc/handlers/HelloWorld.java

-package com.atguigu.springmvc.handlers;
+package main.com.atguigu.springmvc.handlers;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

src/com/atguigu/springmvc/handlers/PackageModule.java → src/main/com/atguigu/springmvc/handlers/PackageModule.java

-package com.atguigu.springmvc.handlers;
+package main.com.atguigu.springmvc.handlers;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

src/com/atguigu/springmvc/handlers/RedModule.java → src/main/com/atguigu/springmvc/handlers/RedModule.java

-package com.atguigu.springmvc.handlers;
+package main.com.atguigu.springmvc.handlers;
 
-import com.atguigu.springmvc.common.MatcherString;
-import com.atguigu.springmvc.common.MysqlUtils;
-import com.atguigu.springmvc.common.RedisUtil;
-import com.atguigu.springmvc.service.Authorization;
-import com.atguigu.springmvc.service.NewActivityService;
+import main.com.atguigu.springmvc.common.MatcherString;
+import main.com.atguigu.springmvc.common.RedisUtil;
+import main.com.atguigu.springmvc.service.Authorization;
+import main.com.atguigu.springmvc.service.NewActivityService;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -13,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Base64;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,9 +20,9 @@ import java.util.Map;
 @Controller
 public class RedModule {
 	@Autowired
-	NewActivityService newActivityService;
+    NewActivityService newActivityService;
 	@Autowired
-	Authorization authorization;
+    Authorization authorization;
 
 	/**
 	 * 功能：查询用户红包信息操作

src/com/atguigu/springmvc/handlers/SignModule.java → src/main/com/atguigu/springmvc/handlers/SignModule.java

-package com.atguigu.springmvc.handlers;
+package main.com.atguigu.springmvc.handlers;
 
+import main.com.atguigu.springmvc.common.MysqlUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import com.atguigu.springmvc.common.MysqlUtils;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;

src/com/atguigu/springmvc/handlers/SpringMVCTest.java → src/main/com/atguigu/springmvc/handlers/SpringMVCTest.java

-package com.atguigu.springmvc.handlers;
+package main.com.atguigu.springmvc.handlers;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import main.com.atguigu.springmvc.entities.User;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,8 +21,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.atguigu.springmvc.entities.User;
-
 @SessionAttributes(value={"user"}, types={String.class})
 @RequestMapping("/springmvc")
 @Controller

src/com/atguigu/springmvc/service/Authorization.java → src/main/com/atguigu/springmvc/service/Authorization.java

-package com.atguigu.springmvc.service;
+package main.com.atguigu.springmvc.service;
 
 
-import com.atguigu.springmvc.common.SecurityUtils;
+import main.com.atguigu.springmvc.common.SecurityUtils;
 import io.restassured.http.ContentType;
-import io.restassured.http.Cookies;
 import io.restassured.response.Response;
 import org.springframework.stereotype.Service;
 

src/com/atguigu/springmvc/service/CustomHdToolCtrlService.java → src/main/com/atguigu/springmvc/service/CustomHdToolCtrlService.java

-package com.atguigu.springmvc.service;
+package main.com.atguigu.springmvc.service;
 
-import com.atguigu.springmvc.enums.ActivityDataTypeEnum;
-import com.atguigu.springmvc.entities.CustomHdToolVO;
+import main.com.atguigu.springmvc.enums.ActivityDataTypeEnum;
+import main.com.atguigu.springmvc.entities.CustomHdToolVO;
 
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;

src/com/atguigu/springmvc/service/ManagerService.java → src/main/com/atguigu/springmvc/service/ManagerService.java

-package com.atguigu.springmvc.service;
+package main.com.atguigu.springmvc.service;
 
 
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Value;
 import org.testng.Assert;
 
 import java.util.HashMap;

src/com/atguigu/springmvc/service/NewActivityService.java → src/main/com/atguigu/springmvc/service/NewActivityService.java

-package com.atguigu.springmvc.service;
+package main.com.atguigu.springmvc.service;
 
-import io.restassured.http.Cookies;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/com/atguigu/springmvc/views/HelloView.java → src/main/com/atguigu/springmvc/views/HelloView.java

-package com.atguigu.springmvc.views;
+package main.com.atguigu.springmvc.views;
 
 import java.util.Date;
 import java.util.Map;