Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/java/com/reyun/controller/LoginController.java

@@ -85,8 +85,9 @@ public class LoginController
 
         Map<String, Object> rtnMap = Maps.newHashMap();
 
+        logger.info(email + "is login...");
         Account account = loginService.login(email, password);
-
+        logger.info("login account:" + account.toString());
         if (account != null) {
 
             if(!account.getRoleCategory().equals(5L)) {

src/main/java/com/reyun/service/impl/LoginServiceImpl.java

@@ -55,8 +55,6 @@ public class LoginServiceImpl implements LoginService {
         Account resultAccount = null;
         Account queryAccount = accountRepository.findAccountByEmail(email);
 
-        logger.info("login email:{}, pwd:{}", email, pwd);
-        logger.info("login account:{}", queryAccount);
 
         if (null != queryAccount) {
 
@@ -76,7 +74,6 @@ public class LoginServiceImpl implements LoginService {
                 }
             }
 
-            logger.info("authService.getOneAccount: {}", resultAccount);
         }
 
 		return resultAccount;

src/main/resources/logback/product/logback.xml

@@ -4,9 +4,9 @@
 
 	<appender name="infoFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<Encoding>UTF-8</Encoding>
-		<file>/data/logs/trackingio.com/trackingio.log</file>
+		<file>/data/logs/saasio.com/saasio.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>/data/logs/trackingio.com/trackingio.%d{yyyy-MM-dd}.log.zip</FileNamePattern>
+			<FileNamePattern>/data/logs/saasio.com/saasio.%d{yyyy-MM-dd}.log.zip</FileNamePattern>
 			<maxHistory>30</maxHistory>
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">