zouxuan 5 years ago
parent
commit
d175fe749c

+ 1 - 1
edu-common/src/main/java/com/keao/edu/common/security/BaseAccessDeniedHandler.java

@@ -6,7 +6,7 @@ import java.io.PrintWriter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 8 - 10
edu-common/src/main/java/com/keao/edu/common/security/BaseAuthenticationEntryPoint.java

@@ -1,13 +1,8 @@
 package com.keao.edu.common.security;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.exception.ExceptionUtils;
+import com.keao.edu.common.constant.CommonConstants;
+import com.keao.edu.common.entity.HttpResponseResult;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.InsufficientAuthenticationException;
@@ -16,8 +11,11 @@ import org.springframework.security.oauth2.common.exceptions.InvalidTokenExcepti
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
 
-import com.keao.edu.common.constant.CommonConstants;
-import com.keao.edu.common.entity.HttpResponseResult;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 
 @Component
 public class BaseAuthenticationEntryPoint implements AuthenticationEntryPoint {

+ 6 - 8
edu-common/src/main/java/com/keao/edu/common/service/impl/RedisIdGeneratorService.java

@@ -1,9 +1,7 @@
 package com.keao.edu.common.service.impl;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-
+import com.keao.edu.common.redis.service.RedisCache;
+import com.keao.edu.common.service.IdGeneratorService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,9 +11,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 
-import com.google.common.base.Strings;
-import com.keao.edu.common.redis.service.RedisCache;
-import com.keao.edu.common.service.IdGeneratorService;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
 @Service
 public class RedisIdGeneratorService implements IdGeneratorService {
@@ -73,7 +71,7 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 		} finally {
 			redisTemplate.expire(key, 600, TimeUnit.SECONDS);// 保留10分钟内的key
 		}
-		if (Strings.isNullOrEmpty(orderId))
+		if (StringUtils.isEmpty(orderId))
 			return 0;
 		return Long.parseLong(orderId);
 	}

+ 11 - 1
edu-user/edu-user-server/pom.xml

@@ -40,5 +40,15 @@
             <groupId>com.keao.edu</groupId>
             <artifactId>edu-common</artifactId>
         </dependency>
-    </dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.1.10</version>
+            <scope>compile</scope>
+        </dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+	</dependencies>
 </project>

+ 2 - 19
edu-user/edu-user-server/src/main/resources/logback-spring.xml

@@ -27,29 +27,12 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
+	<logger name="com.ym.mec" level="DEBUG" />
 
 	<!--开发环境:打印控制台 -->
-	<springProfile name="dev">
-		<root level="INFO">
+		<root level="DEBUG">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>
-	</springProfile>
-	
-	<springProfile name="test">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-
-	<!--生产环境:输出到文件 -->
-	<springProfile name="prod">
-		<root level="WARN">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
 
 </configuration>