m

spring-boot-helloWorld/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.3.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

spring-boot-web/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>com.neo</groupId>
 	<artifactId>spring-boot-web</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
 
 	<name>spring-boot-web</name>
 	<description>Demo project for Spring Boot</description>
@@ -14,8 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.6.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<version>2.1.3.RELEASE</version>
 	</parent>
 
 	<properties>
@@ -26,51 +25,34 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
 		<dependency>
-	        <groupId>org.springframework.boot</groupId>
-	        <artifactId>spring-boot-starter-web</artifactId>
-	    </dependency>
-	    <dependency>
-	        <groupId>org.springframework.boot</groupId>
-	        <artifactId>spring-boot-starter-data-jpa</artifactId>
-	    </dependency>
-	     <dependency>
-	        <groupId>mysql</groupId>
-	        <artifactId>mysql-connector-java</artifactId>
-	    </dependency>
-	     <dependency>
-	        <groupId>org.springframework.boot</groupId>
-	        <artifactId>spring-boot-devtools</artifactId>
-	        <optional>true</optional>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
-		<dependency>  
-		    <groupId>org.springframework.boot</groupId>
-		    <artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency> 
 		<dependency>
-		    <groupId>org.webjars.bower</groupId>
-		    <artifactId>jquery</artifactId>
-		    <version>2.0.3</version>
-		</dependency> 
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
 		<dependency>
-		    <groupId>org.webjars.bower</groupId>
-		    <artifactId>bootstrap</artifactId>
-		    <version>3.0.3</version>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>jquery</artifactId>
+			<version>2.0.3</version>
 		</dependency>
-		<dependency>  
-		    <groupId>org.springframework.boot</groupId>  
-		    <artifactId>spring-boot-starter-redis</artifactId>  
-		</dependency>  
 		<dependency>
-		    <groupId>org.springframework.session</groupId>
-		    <artifactId>spring-session-data-redis</artifactId>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>bootstrap</artifactId>
+			<version>3.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	
@@ -79,9 +61,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-	                <fork>true</fork>
-	            </configuration>
 			</plugin>
 		</plugins>
 	</build>

spring-boot-web/src/main/java/com/neo/Application.java → spring-boot-web/src/main/java/com/neo/WebApplication.java

@@ -4,9 +4,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class Application {
+public class WebApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
+		SpringApplication.run(WebApplication.class, args);
 	}
 }

spring-boot-web/src/main/java/com/neo/config/RedisConfig.java

@@ -1,63 +0,0 @@
-package com.neo.config;
-
-import java.lang.reflect.Method;
-
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.interceptor.KeyGenerator;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.cache.RedisCacheManager;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Configuration
-@EnableCaching
-public class RedisConfig extends CachingConfigurerSupport{
-	
-	@Bean
-	public KeyGenerator keyGenerator() {
-        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();
-            }
-        };
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Bean
-    public CacheManager cacheManager(RedisTemplate redisTemplate) {
-        RedisCacheManager rcm = new RedisCacheManager(redisTemplate);
-        //设置缓存过期时间
-        //rcm.setDefaultExpiration(60);//秒
-        return rcm;
-    }
-    
-    @Bean
-    public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory factory) {
-        StringRedisTemplate template = new StringRedisTemplate(factory);
-        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
-        ObjectMapper om = new ObjectMapper();
-        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-        jackson2JsonRedisSerializer.setObjectMapper(om);
-        template.setValueSerializer(jackson2JsonRedisSerializer);
-        template.afterPropertiesSet();
-        return template;
-    }
-
-}

spring-boot-web/src/main/java/com/neo/config/SessionConfig.java

@@ -1,10 +0,0 @@
-package com.neo.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-
-@Configuration
-@EnableRedisHttpSession(maxInactiveIntervalInSeconds = 86400*30)
-public class SessionConfig {
-	
-}

spring-boot-web/src/main/java/com/neo/domain/User.java → spring-boot-web/src/main/java/com/neo/model/User.java

@@ -1,4 +1,4 @@
-package com.neo.domain;
+package com.neo.model;
 
 import java.io.Serializable;
 
@@ -28,7 +28,7 @@ public class User implements Serializable {
 	public User() {
 		super();
 	}
-	public User(String email, String nickName, String passWord, String userName, String regTime) {
+	public User(String nickName,String email,String userName,  String passWord, String regTime) {
 		super();
 		this.email = email;
 		this.nickName = nickName;

spring-boot-web/src/main/java/com/neo/domain/UserRepository.java → spring-boot-web/src/main/java/com/neo/repository/UserRepository.java

@@ -1,5 +1,6 @@
-package com.neo.domain;
+package com.neo.repository;
 
+import com.neo.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {

spring-boot-web/src/main/java/com/neo/web/HelloController.java

@@ -5,6 +5,7 @@ import java.util.UUID;
 
 import javax.servlet.http.HttpSession;
 
+import com.neo.model.User;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,17 +15,7 @@ public class HelloController {
 	
     @RequestMapping("/hello")
 	public String hello(Locale locale, Model model) {
-		return "hello world";
+		return "Hello World";
 	}
-    
-    @RequestMapping("/uid")
-    String uid(HttpSession session) {
-        UUID uid = (UUID) session.getAttribute("uid");
-        if (uid == null) {
-            uid = UUID.randomUUID();
-        }
-        session.setAttribute("uid", uid);
-        return session.getId();
-    }
 
 }

spring-boot-web/src/main/java/com/neo/web/UserController.java

@@ -3,12 +3,11 @@ package com.neo.web;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.neo.domain.User;
-import com.neo.domain.UserRepository;
+import com.neo.model.User;
+import com.neo.repository.UserRepository;
 
 @RestController
 public class UserController {
@@ -17,7 +16,6 @@ public class UserController {
 	private UserRepository userRepository;
 	
     @RequestMapping("/getUser")
-    @Cacheable(value="user-key")
     public User getUser() {
     	User user=userRepository.findByUserName("aa");
     	System.out.println("若下面没出现“无缓存的时候调用”字样且能打印出数据表示测试成功");  
@@ -25,7 +23,6 @@ public class UserController {
     }
     
     @RequestMapping("/getUsers")
-    @Cacheable(value="key-Users")
     public List<User> getUsers() {
     	List<User> users=userRepository.findAll();
     	System.out.println("若下面没出现“无缓存的时候调用”字样且能打印出数据表示测试成功");  

spring-boot-web/src/main/resources/application.properties

@@ -1,32 +1,14 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/test
+spring.datasource.url=jdbc:mysql://localhost:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
 spring.datasource.username=root
 spring.datasource.password=root
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
-spring.jpa.properties.hibernate.hbm2ddl.auto=update
+spring.jpa.properties.hibernate.hbm2ddl.auto=create
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-spring.jpa.show-sql= true
-
-com.neo.title=\u7eaf\u6d01\u7684\u5fae\u7b11
-com.neo.description=\u5206\u4eab\u751f\u6d3b\u548c\u6280\u672f
-
-# REDIS (RedisProperties)
-# Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
-spring.redis.database=0  
-# Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=192.168.0.71
-# Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=6379  
-# Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
-spring.redis.password=  
-# \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09
-spring.redis.pool.max-active=8  
-# \u8fde\u63a5\u6c60\u6700\u5927\u963b\u585e\u7b49\u5f85\u65f6\u95f4\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09
-spring.redis.pool.max-wait=-1  
-# \u8fde\u63a5\u6c60\u4e2d\u7684\u6700\u5927\u7a7a\u95f2\u8fde\u63a5
-spring.redis.pool.max-idle=8  
-# \u8fde\u63a5\u6c60\u4e2d\u7684\u6700\u5c0f\u7a7a\u95f2\u8fde\u63a5
-spring.redis.pool.min-idle=0  
-# \u8fde\u63a5\u8d85\u65f6\u65f6\u95f4\uff08\u6beb\u79d2\uff09
-spring.redis.timeout=0 
+#sql\u8F93\u51FA
+spring.jpa.show-sql=true
+#format\u4E00\u4E0Bsql\u8FDB\u884C\u8F93\u51FA
+spring.jpa.properties.hibernate.format_sql=true
 
+com.neo.title=\u7EAF\u6D01\u7684\u5FAE\u7B11
+com.neo.description=\u5206\u4EAB\u751F\u6D3B\u548C\u6280\u672F

spring-boot-web/src/test/java/com/neo/ApplicationTests.java → spring-boot-web/src/test/java/com/neo/WebApplicationTests.java

@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class ApplicationTests {
+public class WebApplicationTests {
 
 	@Test
 	public void contextLoads() {

spring-boot-web/src/test/java/com/neo/domain/UserRepositoryTests.java → spring-boot-web/src/test/java/com/neo/model/UserRepositoryTests.java

@@ -1,16 +1,15 @@
-package com.neo.domain;
+package com.neo.model;
 
 import java.text.DateFormat;
 import java.util.Date;
 
+import com.neo.repository.UserRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.neo.Application;
 import org.springframework.test.context.junit4.SpringRunner;
 
 
@@ -31,9 +30,9 @@ public class UserRepositoryTests {
 		userRepository.save(new User("bb2", "bb@126.com", "bb", "bb123456",formattedDate));
 		userRepository.save(new User("cc3", "cc@126.com", "cc", "cc123456",formattedDate));
 
-		Assert.assertEquals(9, userRepository.findAll().size());
-		Assert.assertEquals("bb", userRepository.findByUserNameOrEmail("bb", "cc@126.com").getNickName());
-		userRepository.delete(userRepository.findByUserName("aa1"));
+//		Assert.assertEquals(9, userRepository.findAll().size());
+		Assert.assertEquals("bb2", userRepository.findByUserNameOrEmail("bb", "xxx126.com").getNickName());
+		userRepository.delete(userRepository.findByUserName("aa"));
 	}
 
 }

spring-boot-web/src/test/java/com/neo/util/TestRedis.java

@@ -1,53 +0,0 @@
-package com.neo.util;
-
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.neo.Application;
-import com.neo.domain.User;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class TestRedis {
-
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-    
-	@Autowired
-	private RedisTemplate redisTemplate;
-
-    @Test
-    public void test() throws Exception {
-        stringRedisTemplate.opsForValue().set("aaa", "111");
-        Assert.assertEquals("111", stringRedisTemplate.opsForValue().get("aaa"));
-    }
-    
-    @Test
-    public void testObj() throws Exception {
-        User user=new User("aa@126.com", "aa", "aa123456", "aa","123");
-        ValueOperations<String, User> operations=redisTemplate.opsForValue();
-        operations.set("com.neox", user);
-        operations.set("com.neo.f", user,1,TimeUnit.SECONDS);
-        Thread.sleep(1000);
-        //redisTemplate.delete("com.neo.f");
-        boolean exists=redisTemplate.hasKey("com.neo.f");
-        if(exists){
-        	System.out.println("exists is true");
-        }else{
-        	System.out.println("exists is false");
-        }
-       // Assert.assertEquals("aa", operations.get("com.neo.f").getUserName());
-    }
-
-
-}

spring-boot-web/src/test/java/com/neo/web/ProPertiesTest.java

@@ -8,9 +8,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.neo.Application;
 import com.neo.util.NeoProperties;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -18,11 +16,9 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest
 public class ProPertiesTest {
 
-	
 	@Autowired
     private NeoProperties neoProperties;
 
-
     @Test
     public void getHello() throws Exception {
     	System.out.println(neoProperties.getTitle());
@@ -30,7 +26,6 @@ public class ProPertiesTest {
         Assert.assertEquals(neoProperties.getDescription(), "分享生活和技术");
     }
 
-    
     @Test
     public void testMap() throws Exception {
     	Map<String, Long> orderMinTime=new HashMap<String, Long>();