Merge remote-tracking branch 'remotes/origin/develop'

Author: netbuffer

README.md

@@ -24,7 +24,7 @@
 * itextpdf
 
 > ## github:[https://github.com/netbuffer/ssmbootstrap_table](https://github.com/netbuffer/ssmbootstrap_table)
-> ## git@osc:[http://git.oschina.net/gradle/medoo_bootstrap_table](http://git.oschina.net/gradle/medoo_bootstrap_table)
+> ## git@osc:[https://git.oschina.net/gradle/ssmbootstrap_table](https://git.oschina.net/gradle/ssmbootstrap_table)
 
 ## How to run
 The project constructed by `maven`, please execute under the `src/main/java` `SQL script` to your `MySQL` database operation, and then modify the database configuration information `jdbc.properties` under the path `src/main/resource` configuration file in the project directory, enter, execute `mvn tomcat7:run` to run
@@ -45,6 +45,17 @@ metrics | @Timed
 
 #![springfox](src/main/webapp/image/swagger.png)
 
+
+> `sssbootstrap_table(spring+springmvc+spring data jpa)` github:[https://github.com/netbuffer/sssbootstrap_table](https://github.com/netbuffer/sssbootstrap_table)`/`git@osc:[https://git.oschina.net/netbuffer/sssbootstrap_table](https://git.oschina.net/netbuffer/sssbootstrap_table)    
+
+> `sshbootstrap_table(spring+struts2+hibernate)` github:[https://github.com/netbuffer/sshbootstrap-table](https://github.com/netbuffer/sshbootstrap-table)`/`git@osc:[https://git.oschina.net/netbuffer/sshbootstrap-table](https://git.oschina.net/netbuffer/sshbootstrap-table)    
+
+> `spring-boot-bootstrap_table(springboot)` github:[https://github.com/netbuffer/spring-boot-bootstrap_table](https://github.com/netbuffer/spring-boot-bootstrap_table)`/`git@osc:[https://git.oschina.net/netbuffer/spring-boot-bootstrap_table](https://git.oschina.net/netbuffer/spring-boot-bootstrap_table)   
+
+> `jfinal-bootstrap-table(jfinal)`github:[https://github.com/netbuffer/jfinal-bootstrap-table](https://github.com/netbuffer/jfinal-bootstrap-table)`/`git@osc:[http://git.oschina.net/gradle/jfinal-bootstrap-table](http://git.oschina.net/gradle/jfinal-bootstrap-table)  
+
+> `medoo_bootstrap_table(php5)`github:[https://github.com/netbuffer/medoo_bootstrap_table](https://github.com/netbuffer/medoo_bootstrap_table)`/`git@osc:[http://git.oschina.net/gradle/medoo_bootstrap_table](http://git.oschina.net/gradle/medoo_bootstrap_table)
+
 ---
 > 
 >   * develop开发分支

pom.xml

@@ -295,7 +295,7 @@
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>
 			<artifactId>ehcache</artifactId>
-			<version>2.10.2.2.21</version>
+			<version>2.10.4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>

src/main/java/cn/com/ttblog/ssmbootstrap_table/controller/EhcacheController.java

@@ -2,16 +2,17 @@
 
 import java.util.Arrays;
 
+import net.sf.ehcache.Element;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 浏览ehcache状态 
@@ -24,14 +25,15 @@ public class EhcacheController {
 //    private ApplicationContext applicationContext;
 	@Autowired
 	private CacheManager cacheManager;
+
 	@RequestMapping(value = {"/index/{cache}" })
 	public String index(@PathVariable("cache") String cache, ModelMap m) {
 		logger.debug("cache:{}", cache);
 		if(cacheManager!=null){
 			m.put("caches",Arrays.deepToString(cacheManager.getCacheNames()));
 			m.put("getDiskStorePath", cacheManager.getDiskStorePath());
 			m.put("getName", cacheManager.getName());
-//			m.put("getOriginalConfigurationText", cacheManager.getOriginalConfigurationText());
+			m.put("getOriginalConfigurationText", cacheManager.getOriginalConfigurationText());
 			m.put("getStatus", cacheManager.getStatus());
 			Cache c=cacheManager.getCache(cache);
 			if(c!=null){
@@ -42,4 +44,33 @@ public String index(@PathVariable("cache") String cache, ModelMap m) {
 		logger.debug("ehcache model:{}",m);
 		return "ehcache";
 	}
+
+	/**
+	 * put到指定cache下
+	 * @param cacheName
+	 * @param key
+	 * @param val
+	 * @return
+	 */
+	@RequestMapping(value = {"/putcache/{cache}/{key}/{val}" })
+	@ResponseBody
+	public Element put(@PathVariable("cache") String cacheName,@PathVariable("key") String key,@PathVariable("val") String val) {
+		Cache cache=cacheManager.getCache(cacheName);
+		Element element=new Element(key,val);
+		cache.put(element);
+		return element;
+	}
+
+	/**
+	 * 获取指定cache下的指定key内容
+	 * @param cacheName
+	 * @param key
+	 * @return
+	 */
+	@RequestMapping(value = {"/getcache/{cache}/{key}" })
+	@ResponseBody
+	public Element get(@PathVariable("cache") String cacheName,@PathVariable("key") String key) {
+		Cache cache=cacheManager.getCache(cacheName);
+		return cache.get(key);
+	}
 }

src/main/java/cn/com/ttblog/ssmbootstrap_table/controller/IndexController.java

@@ -73,11 +73,12 @@ public String login(HttpSession session, HttpServletRequest request,
 			Cookie c = new Cookie(ConfigConstant.USERNAME, username);
 			c.setMaxAge(86400);
 			response.addCookie(c);
-			Map<String, String> param=new HashMap<String,String>();
+			Map<String, String> param=new HashMap<>();
 			param.put("loginname", username);
 			param.put("logintime", new DateTime().toString("yyyy-MM-dd HH:mm:ss"));
 			param.put("loginip", request.getRemoteAddr());
-			applicationContext.publishEvent(new LoginEvent(param));  
+			//publishEvent会依次调用所有的监听器，同步调用，所有监听器执行完毕继续向下执行
+			applicationContext.publishEvent(new LoginEvent(this,param));
 			if(requri!=null&&requri.length()>0){
 				String uri=new String(Base64.decodeBase64(requri));
 				String touri=uri.substring(request.getContextPath().length()+1);

src/main/java/cn/com/ttblog/ssmbootstrap_table/event/LoginEvent.java

@@ -1,11 +1,27 @@
 package cn.com.ttblog.ssmbootstrap_table.event;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.context.ApplicationEvent;
+import java.util.Map;
 
 public class LoginEvent extends ApplicationEvent {
-	
-	public LoginEvent(Object source) {
+
+	private Map data;
+
+	public LoginEvent(Object source, Map<String, String> data) {
 		super(source);
+		this.data=data;
+	}
+
+	public Map getData() {
+		return data;
+	}
+
+	public void setData(Map data) {
+		this.data = data;
+	}
+
+	public String toString(){
+		return ToStringBuilder.reflectionToString(this);
 	}
-	
 }

src/main/java/cn/com/ttblog/ssmbootstrap_table/listener/TestReceiveLoginEventListener1.java

@@ -11,7 +11,7 @@
 @Component  
 public class TestReceiveLoginEventListener1 implements SmartApplicationListener {  
 
-	private static final Logger log = LoggerFactory.getLogger(TestReceiveLoginEventListener2.class);
+	private static final Logger log = LoggerFactory.getLogger(TestReceiveLoginEventListener1.class);
 
 	@Override
 	public boolean supportsEventType(final Class<? extends ApplicationEvent> eventType) {

src/main/java/cn/com/ttblog/ssmbootstrap_table/util/Config.java

@@ -1,15 +1,48 @@
 package cn.com.ttblog.ssmbootstrap_table.util;
 
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
 import org.springframework.scheduling.annotation.EnableAsync;
+import java.lang.reflect.Method;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 
 /**
  * 启用异步方法
  * 发现在xml中配置<task:annotation-driven></task:annotation-driven>不生效,
  * 基于java config是生效的
  * http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/scheduling/annotation/EnableAsync.html
+ * http://docs.spring.io/spring/docs/4.2.9.RELEASE/spring-framework-reference/htmlsingle/#scheduling-annotation-support-async
  */
 @Configuration
 @EnableAsync
-public class Config {
+public class Config implements AsyncConfigurer {
+
+    /**
+     * 自定义实现Executor
+     * @return
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        ExecutorService executorService=Executors.newSingleThreadExecutor(new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                return new Thread(r,"task");
+            }
+        });
+        return executorService;
+    }
+
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return new AsyncUncaughtExceptionHandler() {
+            @Override
+            public void handleUncaughtException(Throwable throwable, Method method, Object... objects) {
+                System.out.printf("throwable:%s,method:%s,objects:%s",throwable,method,objects);
+            }
+        };
+    }
 }

src/main/resources/spring/spring-context.xml

@@ -3,7 +3,11 @@
 	   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
+	   xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="
+	   					http://www.springframework.org/schema/task
+						http://www.springframework.org/schema/task/spring-task-4.0.xsd
+	   					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
@@ -14,9 +18,21 @@
 
 	<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.RestController"/>
         <context:exclude-filter type="annotation" expression="org.springframework.web.bind.annotation.ControllerAdvice" />
     </context:component-scan>
 
+	<!--<bean id="threadPoolTaskExecutor"-->
+		  <!--class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">-->
+		<!--<property name="corePoolSize" value="1" />-->
+		<!--<property name="maxPoolSize" value="10" />-->
+		<!--<property name="queueCapacity" value="50" />-->
+		<!--<property name="threadNamePrefix" value="task-" />-->
+		<!--<property name="keepAliveSeconds" value="30" />-->
+	<!--</bean>-->
+
+	<!--<task:annotation-driven executor="threadPoolTaskExecutor"></task:annotation-driven>-->
+
 	<bean id="configProperties"
 		class="org.springframework.beans.factory.config.PropertiesFactoryBean">
 		<property name="locations">

src/main/resources/spring/spring-mvc.xml

@@ -15,6 +15,7 @@
 	<!-- 多包扫描测试 -->
 	<context:component-scan base-package="cn.com.ttblog.ssmbootstrap_table.controller,com.other.**,org.exampledriven.cxfexample.**" use-default-filters="false">
         <context:include-filter type="annotation" expression="org.springframework.stereotype.Controller" />
+		<context:include-filter type="annotation" expression="org.springframework.web.bind.annotation.RestController" />
         <context:include-filter type="annotation" expression="org.springframework.web.bind.annotation.ControllerAdvice" />
     </context:component-scan>