diff --git a/demo/pom.xml b/demo/pom.xml
index aacdcff..dbb0940 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>com.example</groupId>
 	<artifactId>demo-1</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>	
+	<packaging>war</packaging>	
 	<name>demo-1</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -24,6 +24,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+		<dependency>
+            <groupId>org.springframework.boot</groupId>  
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -32,6 +36,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+		  <groupId>org.awaitility</groupId>
+		  <artifactId>awaitility</artifactId>
+		  <scope>test</scope>
+		</dependency>		
 		<!-- 
 	    <dependency>
 	      <groupId>com.google.code.gson</groupId>
@@ -64,8 +73,7 @@
 			</plugin>
 			<plugin>  
 			    <groupId>org.apache.maven.plugins</groupId>  
-			    <artifactId>maven-surefire-plugin</artifactId>  
-			    <version>2.4.2</version>  
+			    <artifactId>maven-surefire-plugin</artifactId>    
 			    <configuration>  
 			    <skipTests>true</skipTests>  
 			    </configuration>  
@@ -73,4 +81,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/demo/src/main/java/com/example/bean/UserBean.java b/demo/src/main/java/com/example/bean/UserBean.java
index bf990f8..867db76 100644
--- a/demo/src/main/java/com/example/bean/UserBean.java
+++ b/demo/src/main/java/com/example/bean/UserBean.java
@@ -1,5 +1,6 @@
 package com.example.bean;
 
+import java.io.Serializable;
 import java.util.Date;
 
 import javax.persistence.Column;
@@ -10,7 +11,12 @@
 
 @Entity
 @Table(name="UDATA", schema = "System")
-public class UserBean {
+public class UserBean implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	@Id
 	private String account;
 	
@@ -23,6 +29,12 @@ public class UserBean {
 	@Column(name="reg")
 	private Date reg;
 	
+	@Column(name="login")
+	private Date login;
+	
+	@Column(name="logout")
+	private Date logout;
+	
 	public String getAccount() {
 		return account;
 	}
@@ -48,9 +60,23 @@ public void setReg(Date reg) {
 		this.reg = reg;
 	}
 
+	
+	
+	public Date getLogin() {
+		return login;
+	}
+	public void setLogin(Date login) {
+		this.login = login;
+	}
+	public Date getLogout() {
+		return logout;
+	}
+	public void setLogout(Date logout) {
+		this.logout = logout;
+	}
 	@Override
 	public String toString() {
-		return "account="+account+",pwd="+pwd+",name="+name+",reg="+reg;
+		return "account="+account+",pwd="+pwd+",name="+name+",reg="+reg+",login="+login+",logout="+logout;
 	}
 	
 }
diff --git a/demo/src/main/java/com/example/config/RedisConfig.java b/demo/src/main/java/com/example/config/RedisConfig.java
new file mode 100644
index 0000000..08e3239
--- /dev/null
+++ b/demo/src/main/java/com/example/config/RedisConfig.java
@@ -0,0 +1,68 @@
+package com.example.config;
+
+
+
+
+import java.lang.reflect.Method;
+import java.time.Duration;
+
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.interceptor.KeyGenerator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+
+
+public class RedisConfig extends CachingConfigurerSupport {
+	@Bean
+	public JedisConnectionFactory redisConnectionFactory() {
+
+		return new JedisConnectionFactory();
+	}
+
+	// key值命名
+	@Bean
+	public KeyGenerator wiselyKeyGenerator() {
+		return new KeyGenerator() {
+			@Override
+			public Object generate(Object target, Method method, Object... params) {
+				StringBuilder sb = new StringBuilder();
+                sb.append(target.getClass().getName());
+				sb.append(method.getName());
+				for (Object obj : params) {
+					sb.append(obj.toString());
+				}
+				
+				return sb.toString();
+			}
+		};
+	}
+
+	@Bean
+	public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory factory) {
+		RedisTemplate<String, String> redisTemplate = new RedisTemplate<String, String>();
+		redisTemplate.setConnectionFactory(factory);
+		return redisTemplate;
+	}
+
+	@Bean
+	public CacheManager cacheManager(RedisConnectionFactory factory) {
+
+		RedisSerializationContext.SerializationPair<Object> pair = RedisSerializationContext.SerializationPair
+				.fromSerializer(new GenericJackson2JsonRedisSerializer());
+		RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
+				.serializeValuesWith(pair) // 序列化方式
+				.entryTtl(Duration.ofHours(1)); // 過期時間
+
+		return RedisCacheManager.builder(RedisCacheWriter.nonLockingRedisCacheWriter(factory))
+				.cacheDefaults(defaultCacheConfig).build();
+
+	}
+}
diff --git a/demo/src/main/java/com/example/controller/ScheduledTasks.java b/demo/src/main/java/com/example/controller/ScheduledTasks.java
new file mode 100644
index 0000000..b3fc781
--- /dev/null
+++ b/demo/src/main/java/com/example/controller/ScheduledTasks.java
@@ -0,0 +1,23 @@
+package com.example.controller;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+
+
+@Component
+public class ScheduledTasks {
+	private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
+
+	private static final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+
+	@Scheduled(fixedRate=5000)
+	public void reportCurrentTime() {
+		log.info("The time is now {}", dateFormat.format(new Date()));
+	}
+}
diff --git a/demo/src/main/java/com/example/controller/UserController.java b/demo/src/main/java/com/example/controller/UserController.java
index e6ab937..bc855fe 100644
--- a/demo/src/main/java/com/example/controller/UserController.java
+++ b/demo/src/main/java/com/example/controller/UserController.java
@@ -6,8 +6,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -17,6 +19,7 @@
 import com.example.service.UserService;
 
 @SpringBootApplication
+@EnableScheduling
 @Controller
 @ComponentScan("com.example.service")
 @EntityScan("com.example.bean")
@@ -24,7 +27,8 @@
 public class UserController {
 	@Autowired
 	private UserService userService;
-
+	
+	
 	public static void main(String[] args) {
 		SpringApplication.run(UserController.class, args);
 	}
@@ -56,5 +60,19 @@ public List<UserBean> deleteUData(@RequestParam String account)
 	{    
 		System.out.println("controller="+account);
 		return userService.deleteUser(account);    
+	}
+	@ResponseBody
+	@GetMapping("/login")
+	public UserBean loginUser(@RequestParam String account, @RequestParam String pwd)
+	{
+		
+		return userService.loginUser(account, pwd);
+	}
+	@ResponseBody
+	@GetMapping("/logout")
+	public UserBean logoutUser(@RequestParam String account, @RequestParam String pwd)
+	{
+		
+		return userService.logoutUser(account, pwd);
 	}	
 }
diff --git a/demo/src/main/java/com/example/repository/UserRepository.java b/demo/src/main/java/com/example/repository/UserRepository.java
index 75c6c94..aee48d5 100644
--- a/demo/src/main/java/com/example/repository/UserRepository.java
+++ b/demo/src/main/java/com/example/repository/UserRepository.java
@@ -13,6 +13,9 @@ public interface UserRepository extends CrudRepository<UserBean,String>{
 	@Query(value="SELECT * FROM UDATA WHERE ACCOUNT=?1",nativeQuery=true)
 	UserBean queryByAccount(String account);
 	
+	@Query(value="SELECT * FROM UDATA WHERE ACCOUNT=?1 AND PWD=?2",nativeQuery=true)
+	UserBean verifyIdPwd(String account, String pwd);	
+	
 	@Query(value="INSERT INTO UDATA(ACCOUNT,PWD,NAME,REG)VALUES(?1,?2,?3,SYSDATE)",nativeQuery=true)
 	@Modifying
 	@Transactional
@@ -22,10 +25,23 @@ public interface UserRepository extends CrudRepository<UserBean,String>{
 	@Modifying
 	@Transactional
 	void modifyByAccount(String pwd,String name,String account);
+
+	@Query(value="UPDATE UDATA SET LOGIN=SYSDATE WHERE ACCOUNT=?1",nativeQuery=true)
+	@Modifying
+	@Transactional
+	void modifyLoginTime(String account);	
+
+	@Query(value="UPDATE UDATA SET LOGOUT=SYSDATE WHERE ACCOUNT=?1",nativeQuery=true)
+	@Modifying
+	@Transactional
+	void modifyLogoutTime(String account);	
 	
 	@Query(value="DELETE FROM UDATA WHERE ACCOUNT=?1 ",nativeQuery=true)
 	@Modifying
 	@Transactional
 	void deleteByAccount(String account);
+	
+	
+	
 
 }
diff --git a/demo/src/main/java/com/example/service/UserService.java b/demo/src/main/java/com/example/service/UserService.java
index ac9295a..893a995 100644
--- a/demo/src/main/java/com/example/service/UserService.java
+++ b/demo/src/main/java/com/example/service/UserService.java
@@ -5,6 +5,9 @@
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import com.example.bean.UserBean;
@@ -13,6 +16,7 @@
 
 
 @Service
+@CacheConfig(cacheNames = "userService")
 public class UserService {
 	@Autowired
 	private UserRepository userRepository;
@@ -46,7 +50,23 @@ public List<UserBean> deleteUser(String account) {
 		return userBeans;
 	}
 	
-	
-	
+	@Cacheable(value = "userCache")
+	public UserBean loginUser(String account, String pwd){
+		UserBean userBean = userRepository.verifyIdPwd(account,pwd);
+		if(userBean!=null) {
+			userRepository.modifyLoginTime(account);
+		}
+		userBean = findUser(account);
+		return userBean;
+	}
+
+	@CacheEvict(value = "userCache")
+	public UserBean logoutUser(String account, String pwd) {
+		if(account!=null && pwd!=null) {
+			userRepository.modifyLogoutTime(account);
+		}
+		UserBean userBean = findUser(account);
+		return userBean;
+	}
 	
 }
diff --git a/demo/src/main/resources/application.properties b/demo/src/main/resources/application.properties
index 4372c0e..053e75d 100644
--- a/demo/src/main/resources/application.properties
+++ b/demo/src/main/resources/application.properties
@@ -24,4 +24,16 @@ spring.jpa.properties.hibernate.format_sql=true
 #spring.thymeleaf.suffix=.html
 #spring.thymeleaf.mode=HTML5
 #spring.thymeleaf.encoding=UTF-8
-#spring.thymeleaf.content-type=text/html
\ No newline at end of file
+#spring.thymeleaf.content-type=text/html
+
+# REDIS (RedisProperties)
+
+spring.redis.database=0  
+spring.redis.host=127.0.0.1
+spring.redis.port=6379  
+spring.redis.password=  
+spring.redis.jedis.pool.max-active=8  
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8  
+spring.redis.jedis.pool.min-idle=0  
+spring.redis.timeout=300
\ No newline at end of file