diff --git a/casic-web/pom.xml b/casic-web/pom.xml index e31fbd2..5c97785 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-smartcity-sanitation ../pom.xml 1.0.0 @@ -152,10 +152,10 @@ ehcache - - - - + + + + commons-io commons-io @@ -199,13 +199,13 @@ spring-boot-starter-tomcat - provided + javax.servlet javax.servlet-api 3.1.0 - provided + @@ -222,7 +222,7 @@ /config/** - **/MockController.class + /config/application.yml diff --git a/casic-web/pom.xml b/casic-web/pom.xml index e31fbd2..5c97785 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-smartcity-sanitation ../pom.xml 1.0.0 @@ -152,10 +152,10 @@ ehcache - - - - + + + + commons-io commons-io @@ -199,13 +199,13 @@ spring-boot-starter-tomcat - provided + javax.servlet javax.servlet-api 3.1.0 - provided + @@ -222,7 +222,7 @@ /config/** - **/MockController.class + /config/application.yml diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index 70146de..9668d6c 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -56,7 +56,6 @@ e.printStackTrace(); } - UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray()); token.setRememberMe(false); try { @@ -78,4 +77,4 @@ return resultData; } -} +} \ No newline at end of file diff --git a/casic-web/pom.xml b/casic-web/pom.xml index e31fbd2..5c97785 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-template + casic-smartcity-sanitation ../pom.xml 1.0.0 @@ -152,10 +152,10 @@ ehcache - - - - + + + + commons-io commons-io @@ -199,13 +199,13 @@ spring-boot-starter-tomcat - provided + javax.servlet javax.servlet-api 3.1.0 - provided + @@ -222,7 +222,7 @@ /config/** - **/MockController.class + /config/application.yml diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index 70146de..9668d6c 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -56,7 +56,6 @@ e.printStackTrace(); } - UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray()); token.setRememberMe(false); try { @@ -78,4 +77,4 @@ return resultData; } -} +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7263006..7c429da 100644 --- a/pom.xml +++ b/pom.xml @@ -4,6 +4,22 @@ com.casic casic-smartcity-sanitation 1.0.0 + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-classic + 1.1.11 + + + ch.qos.logback + logback-classic + 1.1.11 + + casic-smartcity-sanitation pom @@ -186,11 +202,11 @@ ${screw.version} - - com.zaxxer - HikariCP - ${hikari.version} - + + + + + mysql