配置修改

554530af · 赵然 · 75d6e998 · 554530af · 554530af · 554530af
Commit 554530af authored Oct 08, 2018 by 赵然
59 changed files
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,15 +2,15 @@
 <project version="4">
  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/entities/AwardVO.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/entities/AwardVO.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/handlers/ActivityModule.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/ActivityModule.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/handlers/AutoModule.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/AutoModule.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/handlers/CoderModule.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/CoderModule.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/handlers/CollectModule.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/CollectModule.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/handlers/HelloWorld.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/HelloWorld.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/handlers/RedModule.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/RedModule.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/handlers/SignModule.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/SignModule.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/com/atguigu/springmvc/handlers/SpringMVCTest.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/src/main/com/atguigu/springmvc/handlers/SpringMVCTest.java" charset="GBK" />
    <file url="PROJECT" charset="UTF-8" />
  </component>
 </project>
\ No newline at end of file
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/META-INF/MANIFEST.MF
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/META-INF/MANIFEST.MF
 Manifest-Version: 1.0
-Class-Path: 
+Built-By: Administrator
+Created-By: IntelliJ IDEA
+Build-Jdk: 1.8.0_151
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/SecurityUtils.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/SecurityUtils.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/MatcherString.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/MatcherString.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/MongoUtils.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/MongoUtils.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/MysqlUtils.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/MysqlUtils.class
--- a/target/classes/com/atguigu/springmvc/common/RedisUtil.class
+++ b/target/classes/com/atguigu/springmvc/common/RedisUtil.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/main/com/atguigu/springmvc/common/SecurityUtils.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/main/com/atguigu/springmvc/common/SecurityUtils.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/entities/Address.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/entities/Address.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/entities/AwardVO.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/entities/AwardVO.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/entities/CustomHdToolVO.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/entities/CustomHdToolVO.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/entities/User.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/entities/User.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/enums/ActivityDataTypeEnum.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/enums/ActivityDataTypeEnum.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/enums/PrizeTypeEnum.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/enums/PrizeTypeEnum.class
--- a/target/classes/com/atguigu/springmvc/handlers/ActivityModule.class
+++ b/target/classes/com/atguigu/springmvc/handlers/ActivityModule.class
--- a/target/classes/com/atguigu/springmvc/handlers/AutoModule.class
+++ b/target/classes/com/atguigu/springmvc/handlers/AutoModule.class
--- a/target/classes/com/atguigu/springmvc/handlers/CoderModule.class
+++ b/target/classes/com/atguigu/springmvc/handlers/CoderModule.class
--- a/target/classes/com/atguigu/springmvc/handlers/CollectModule.class
+++ b/target/classes/com/atguigu/springmvc/handlers/CollectModule.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/HelloWorld.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/HelloWorld.class
--- a/target/classes/com/atguigu/springmvc/handlers/PackageModule.class
+++ b/target/classes/com/atguigu/springmvc/handlers/PackageModule.class
--- a/target/classes/com/atguigu/springmvc/handlers/RedModule.class
+++ b/target/classes/com/atguigu/springmvc/handlers/RedModule.class
--- a/target/classes/com/atguigu/springmvc/handlers/SignModule.class
+++ b/target/classes/com/atguigu/springmvc/handlers/SignModule.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/SpringMVCTest.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/SpringMVCTest.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/service/Authorization.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/service/Authorization.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/service/CustomHdToolCtrlService.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/service/CustomHdToolCtrlService.class
--- a/target/classes/com/atguigu/springmvc/service/ManagerService.class
+++ b/target/classes/com/atguigu/springmvc/service/ManagerService.class
--- a/target/classes/com/atguigu/springmvc/service/NewActivityService.class
+++ b/target/classes/com/atguigu/springmvc/service/NewActivityService.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/views/HelloView.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/views/HelloView.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/log4j.properties
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/log4j.properties
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/dispatcherServlet-servlet.xml
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/dispatcherServlet-servlet.xml
@@ -8,7 +8,7 @@
 		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
 	<!-- 配置自定扫描的包 -->
-	<context:component-scan base-package="com.atguigu.springmvc" />
+	<context:component-scan base-package="main.com.atguigu.springmvc" />
 	<mvc:resources location="/" mapping="/*.html"/>
 	<mvc:resources location="/css/" mapping="/css/**"/>

--- a/target/classes/com/atguigu/springmvc/common/SecurityUtils.class
+++ b/target/classes/com/atguigu/springmvc/common/SecurityUtils.class
--- a/target/classes/com/atguigu/springmvc/common/MatcherString.class
+++ b/target/classes/com/atguigu/springmvc/common/MatcherString.class
--- a/target/classes/com/atguigu/springmvc/common/MongoUtils.class
+++ b/target/classes/com/atguigu/springmvc/common/MongoUtils.class
--- a/target/classes/com/atguigu/springmvc/common/MysqlUtils.class
+++ b/target/classes/com/atguigu/springmvc/common/MysqlUtils.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/RedisUtil.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/common/RedisUtil.class
--- a/target/classes/main/com/atguigu/springmvc/common/SecurityUtils.class
+++ b/target/classes/main/com/atguigu/springmvc/common/SecurityUtils.class
--- a/target/classes/com/atguigu/springmvc/entities/Address.class
+++ b/target/classes/com/atguigu/springmvc/entities/Address.class
--- a/target/classes/com/atguigu/springmvc/entities/AwardVO.class
+++ b/target/classes/com/atguigu/springmvc/entities/AwardVO.class
--- a/target/classes/com/atguigu/springmvc/entities/CustomHdToolVO.class
+++ b/target/classes/com/atguigu/springmvc/entities/CustomHdToolVO.class
--- a/target/classes/com/atguigu/springmvc/entities/User.class
+++ b/target/classes/com/atguigu/springmvc/entities/User.class
--- a/target/classes/com/atguigu/springmvc/enums/ActivityDataTypeEnum.class
+++ b/target/classes/com/atguigu/springmvc/enums/ActivityDataTypeEnum.class
--- a/target/classes/com/atguigu/springmvc/enums/PrizeTypeEnum.class
+++ b/target/classes/com/atguigu/springmvc/enums/PrizeTypeEnum.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/ActivityModule.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/ActivityModule.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/AutoModule.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/AutoModule.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/CoderModule.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/CoderModule.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/CollectModule.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/CollectModule.class
--- a/target/classes/com/atguigu/springmvc/handlers/HelloWorld.class
+++ b/target/classes/com/atguigu/springmvc/handlers/HelloWorld.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/PackageModule.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/PackageModule.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/RedModule.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/RedModule.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/SignModule.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/handlers/SignModule.class
--- a/target/classes/com/atguigu/springmvc/handlers/SpringMVCTest.class
+++ b/target/classes/com/atguigu/springmvc/handlers/SpringMVCTest.class
--- a/target/classes/com/atguigu/springmvc/service/Authorization.class
+++ b/target/classes/com/atguigu/springmvc/service/Authorization.class
--- a/target/classes/com/atguigu/springmvc/service/CustomHdToolCtrlService.class
+++ b/target/classes/com/atguigu/springmvc/service/CustomHdToolCtrlService.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/service/ManagerService.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/service/ManagerService.class
--- a/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/service/NewActivityService.class
+++ b/out/artifacts/DuibaTestToolV2_1_war_exploded/WEB-INF/classes/com/atguigu/springmvc/service/NewActivityService.class
--- a/target/classes/com/atguigu/springmvc/views/HelloView.class
+++ b/target/classes/com/atguigu/springmvc/views/HelloView.class
--- a/target/classes/log4j.properties
+++ b/target/classes/log4j.properties
--- a/webapp/WEB-INF/dispatcherServlet-servlet.xml
+++ b/webapp/WEB-INF/dispatcherServlet-servlet.xml
@@ -8,7 +8,7 @@
 		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
 	<!-- 配置自定扫描的包 -->
-	<context:component-scan base-package="com.atguigu.springmvc" />
+	<context:component-scan base-package="main.com.atguigu.springmvc" />
 	<mvc:resources location="/" mapping="/*.html"/>
 	<mvc:resources location="/css/" mapping="/css/**"/>