Merge remote-tracking branch 'origin/develop'

netbuffer · netbuffer · commit 25f69218a931 · 2017-02-15T10:15:53.000+08:00
diff --git a/src/main/java/README.md b/src/main/java/README.md
@@ -6,5 +6,6 @@
 * `TestController`-一些乱七八糟的测试...
 * `MySpringTextWsHandler`spring-websocket测试
 * `UserController`测试数据获取、json/pdf/excel视图
+---
 
 > 使用idea编译工程需要在maven pom.xml中配置打包xml/properties资源,默认idea不打包,eclipse会打包
diff --git a/src/main/java/cn/com/ttblog/ssmbootstrap_table/controller/UserController.java b/src/main/java/cn/com/ttblog/ssmbootstrap_table/controller/UserController.java
@@ -180,4 +180,14 @@ public ModelAndView showUserXML(HttpServletRequest request, Model model) {
 		us.add(userService.getUserById(2));
 		return us;
 	}
+
+	/**
+	 * 测试异步方法执行
+	 */
+	@RequestMapping(value = "/testasync",method = RequestMethod.GET)
+	public @ResponseBody String testasync() {
+		//会立即返回响应success
+		userService.execute();
+		return "success";
+	}
 }
diff --git a/src/main/java/cn/com/ttblog/ssmbootstrap_table/listener/LoginProcessListener.java b/src/main/java/cn/com/ttblog/ssmbootstrap_table/listener/LoginProcessListener.java
@@ -0,0 +1,30 @@
+package cn.com.ttblog.ssmbootstrap_table.listener;
+
+import cn.com.ttblog.ssmbootstrap_table.event.LoginEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class LoginProcessListener implements ApplicationListener<LoginEvent> {
+	
+	private static final Logger LOG=LoggerFactory.getLogger(LoginProcessListener.class);
+
+	/**
+	 * @Async异步处理
+	 */
+	@Async
+	@Override
+	public void onApplicationEvent(LoginEvent loginEvent) {
+		LOG.warn("开始异步记录用户登录日志");
+		try {
+			TimeUnit.SECONDS.sleep(10);
+		} catch (InterruptedException e) {
+			LOG.error("sleep error",e);
+		}
+		LOG.warn("结束异步记录用户登录日志:{}",loginEvent);
+	}
+}
diff --git a/src/main/java/cn/com/ttblog/ssmbootstrap_table/service/IUserService.java b/src/main/java/cn/com/ttblog/ssmbootstrap_table/service/IUserService.java
@@ -18,4 +18,5 @@ public interface IUserService {
 	public void addUM();
 	public void addUMtest() throws IllegalArgumentException;
 	public void deleteById(Long id);
+    void execute();
 }
diff --git a/src/main/java/cn/com/ttblog/ssmbootstrap_table/serviceimpl/UserServiceImpl.java b/src/main/java/cn/com/ttblog/ssmbootstrap_table/serviceimpl/UserServiceImpl.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Resource;
 
@@ -13,6 +14,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -128,4 +130,16 @@ public User getUserByName(String userName) {
 		return userDao.selectByName(userName);
 	}
 
+	@Async
+	@Override
+	public void execute() {
+		logger.warn("异步方法开始执行");
+		try {
+			TimeUnit.SECONDS.sleep(10);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		logger.warn("异步方法结束执行");
+	}
+
 }
diff --git a/src/main/java/cn/com/ttblog/ssmbootstrap_table/util/Config.java b/src/main/java/cn/com/ttblog/ssmbootstrap_table/util/Config.java
@@ -0,0 +1,15 @@
+package cn.com.ttblog.ssmbootstrap_table.util;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * 启用异步方法
+ * 发现在xml中配置<task:annotation-driven></task:annotation-driven>不生效,
+ * 基于java config是生效的
+ * http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/scheduling/annotation/EnableAsync.html
+ */
+@Configuration
+@EnableAsync
+public class Config {
+}
diff --git a/src/main/resources/spring/spring-context.xml b/src/main/resources/spring/spring-context.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans    
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:aop="http://www.springframework.org/schema/aop"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans-4.0.xsd    
                         http://www.springframework.org/schema/context    
-                        http://www.springframework.org/schema/context/spring-context-4.0.xsd    
-                        http://www.springframework.org/schema/mvc
-                        http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
-                        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-                        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
-	
+                        http://www.springframework.org/schema/context/spring-context-4.0.xsd
+                        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
+	<description>
+		spring主配置文件
+	</description>
+
 	<context:component-scan base-package="cn.com.ttblog.ssmbootstrap_table">
         <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
         <context:exclude-filter type="annotation" expression="org.springframework.web.bind.annotation.ControllerAdvice" />
@@ -25,7 +24,6 @@
 				<value>classpath*:app.properties</value>
 				<value>classpath*:jdbc.properties</value>
 				<value>classpath*:jmx.properties</value>
-				<value>classpath*:swagger.properties</value>
 			</list>
 		</property>
 	</bean>
@@ -35,11 +33,11 @@
 	</bean>
 
 	<!-- 启用aop -->
-	<aop:aspectj-autoproxy/>
+	<aop:aspectj-autoproxy expose-proxy="true"></aop:aspectj-autoproxy>
 
 	<!-- 加载资源文件 -->
 	<import resource="spring-mybatis.xml" />
-	<import resource="spring-jmx.xml" />
+	<!--<import resource="spring-jmx.xml" />-->
 	<import resource="classpath*:cxf/cxf.xml" />
 	<import resource="spring-ehcache.xml"/>
 	<import resource="spring-websocket.xml"/>
@@ -71,4 +69,4 @@
              <property name="name" value="production-user" />
 		</bean>
 	</beans>
-</beans>
+</beans>
diff --git a/src/main/resources/spring/spring-jmx.xml b/src/main/resources/spring/spring-jmx.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans    
-                        http://www.springframework.org/schema/beans/spring-beans-3.2.xsd    
-                        http://www.springframework.org/schema/context    
-                        http://www.springframework.org/schema/context/spring-context-3.2.xsd    
-                        http://www.springframework.org/schema/mvc
-                        http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-                        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
-                        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd">
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+                        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 	<bean
 		class="org.springframework.jmx.export.annotation.AnnotationMBeanExporter" />
 	<bean name="beanMonitor" class="cn.com.ttblog.ssmbootstrap_table.mbean.BeanMonitor"></bean>
diff --git a/src/test/java/cn/com/ttblog/ssmbootstrap_table/TestDelListContent.java b/src/test/java/cn/com/ttblog/ssmbootstrap_table/TestDelListContent.java
@@ -1,29 +1,16 @@
 package cn.com.ttblog.ssmbootstrap_table;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import net.sourceforge.pinyin4j.PinyinHelper;
-import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
-import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
-import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-
+import cn.com.ttblog.ssmbootstrap_table.model.User;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.com.ttblog.ssmbootstrap_table.model.User;
+import java.util.*;
 
 public class TestDelListContent {
-	
-	private static Logger logger = LoggerFactory.getLogger(TestMyBatis.class);
+
+	private static Logger logger = LoggerFactory.getLogger(TestDelListContent.class);
 
 	@Test
 	@Ignore
@@ -53,7 +40,7 @@ public void testSystemProperties() {
 		}
 		System.out.println(arr.toString());
 	}
-	
+
 	@Test
 	public void testAddToIndex() {
 		List<String> arr=new ArrayList<String>();
@@ -63,19 +50,19 @@ public void testAddToIndex() {
 		arr.add("4");
 		arr.add("5");
 		arr.add("6");
-		
+
 		System.out.println("arr->tostring:"+arr.toString());
 		System.out.println("arr->deeptostring:"+Arrays.deepToString(arr.toArray()));
-		
+
 		List<User> listuser=new ArrayList<User>();
-		
+
 		listuser.add(new User("1", "男", 22, "", "",23, "", null,null));
 		listuser.add(new User("2", "男", 22, "", "",23, "", null,null));
 		listuser.add(new User("3", "男", 22, "", "",23, "", null,null));
-		
+
 		System.out.println("listuser->tostring:"+listuser.toString());
 		System.out.println("listuser->deeptostring:"+Arrays.deepToString(listuser.toArray()));
-		
+
 		List<String> arr2=new ArrayList<String>();
 		arr2.add("7");
 		arr2.add("8");
diff --git a/src/test/java/cn/com/ttblog/ssmbootstrap_table/TestJodaTime.java b/src/test/java/cn/com/ttblog/ssmbootstrap_table/TestJodaTime.java
@@ -6,13 +6,25 @@
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeUtils;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalTime;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import cn.com.ttblog.ssmbootstrap_table.util.JodaTimeUtil;
 
+/**
+ * 	 LocalDate - date without time
+	 LocalTime - time without date
+	 Instant - an instantaneous point on the time-line
+	 DateTime - full date and time with time-zone
+	 DateTimeZone - a better time-zone
+	 Duration and Period - amounts of time
+	 Interval - the time between two instants
+	 A comprehensive and flexible formatter-parser
+ */
 //@Ignore
 public class TestJodaTime {
 	Logger log = LoggerFactory.getLogger(this.getClass());
@@ -121,4 +133,22 @@ public void parse(){
 	public void getTimeStamp(){
 		System.out.println("timestamp:"+System.currentTimeMillis());
 	}
+
+	@Test
+	public void test() {
+		LocalDate localDate = new LocalDate();
+		System.out.println("localDate：" + localDate);
+		System.out.println("localDate.toDate()：" + localDate.toDate());
+		LocalTime localTime=new LocalTime();
+		System.out.println("localTime:"+localTime);
+		System.out.println("localTime.toDateTimeToday():"+localTime.toDateTimeToday());
+		LocalTime minTime=new LocalTime(0,0,0,0);
+		LocalTime maxTime=new LocalTime(23,59,59,59);
+		System.out.println("maxTime:"+maxTime);
+		System.out.println("maxTime:"+maxTime.toDateTimeToday());
+		System.out.println("昨天的时间从:"+minTime.toDateTimeToday().plusDays(-1)+"到:"+maxTime.toDateTimeToday().plusDays(-1));
+		DateTime d1=new DateTime();
+		DateTime d2=new DateTime().plusMinutes(2);
+		System.out.println("d2.compareTo(d1):"+d2.compareTo(d1));
+	}
 }
diff --git a/src/test/java/cn/com/ttblog/ssmbootstrap_table/TestPinyin4j.java b/src/test/java/cn/com/ttblog/ssmbootstrap_table/TestPinyin4j.java
@@ -13,7 +13,7 @@
 
 public class TestPinyin4j {
 	
-	private static Logger logger = LoggerFactory.getLogger(TestMyBatis.class);
+	private static Logger logger = LoggerFactory.getLogger(TestPinyin4j.class);
 	
     /** 
      * 提取每个汉字的首字母 
diff --git a/src/test/java/cn/com/ttblog/ssmbootstrap_table/TestWebService.java b/src/test/java/cn/com/ttblog/ssmbootstrap_table/TestWebService.java
@@ -1,20 +1,17 @@
 package cn.com.ttblog.ssmbootstrap_table;
 
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
 import java.net.URL;
 
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class TestWebService {
 
-	private static Logger logger = LoggerFactory.getLogger(TestMyBatis.class);
+	private static Logger logger = LoggerFactory.getLogger(TestWebService.class);
 
 	@Test
 	public void testWebService() throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,5 @@ public interface IUserService {`
`18`	`18`	`public void addUM();`
`19`	`19`	`public void addUMtest() throws IllegalArgumentException;`
`20`	`20`	`public void deleteById(Long id);`
	`21`	`+ void execute();`
`21`	`22`	`}`