修复会话管理器配置

zhou-hao · zhou-hao · commit 6e6ed84d8b22 · 2016-10-27T18:27:52.000+08:00
diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/session/redis/RedisHttpSessionManagerConfiguration.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/session/redis/RedisHttpSessionManagerConfiguration.java
@@ -4,6 +4,7 @@
 import org.hsweb.web.core.session.HttpSessionManagerListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
@@ -14,25 +15,17 @@
 import javax.annotation.Resource;
 import java.util.List;
 
-/**
- * Created by zhouhao on 16-5-27.
- */
 @Configuration
 @ConditionalOnBean(value = RedisOperationsSessionRepository.class, name = "sessionRedisTemplate")
-@Order(Ordered.HIGHEST_PRECEDENCE)
+@ConditionalOnWebApplication
 public class RedisHttpSessionManagerConfiguration {
-    @Autowired(required = false)
-    private List<HttpSessionManagerListener> httpSessionManagerListeners;
 
     @Resource(name = "sessionRedisTemplate")
     private RedisTemplate sessionRedisTemplate;
 
-    @Bean
-    public HttpSessionManager sessionListener(RedisOperationsSessionRepository repository) {
+    @Bean(name = "httpSessionManager")
+    public HttpSessionManager redisHttpSessionManager(RedisOperationsSessionRepository repository) {
         RedisHttpSessionManager redisHttpSessionManager = new RedisHttpSessionManager();
-        if (httpSessionManagerListeners != null) {
-            redisHttpSessionManager.setListeners(httpSessionManagerListeners);
-        }
         redisHttpSessionManager.setSessionRedisTemplate(sessionRedisTemplate);
         redisHttpSessionManager.setRedisOperationsSessionRepository(repository);
         return redisHttpSessionManager;
diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/session/simple/SimpleHttpSessionManagerAutoConfiguration.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/session/simple/SimpleHttpSessionManagerAutoConfiguration.java
@@ -11,16 +11,16 @@
 @ConditionalOnWebApplication
 public class SimpleHttpSessionManagerAutoConfiguration {
 
-    @Bean
-    public HttpSessionManager simpleHttpSessionManager() {
+    @Bean(name = "httpSessionManager")
+    public HttpSessionManager httpSessionManager() {
         SimpleHttpSessionManager httpSessionManager = new SimpleHttpSessionManager();
         return httpSessionManager;
     }
 
     @Bean
-    public UserLoginOutListener sessionListener() {
+    public UserLoginOutListener sessionListener(HttpSessionManager httpSessionManager) {
         UserLoginOutListener loginOutListener = new UserLoginOutListener();
-        loginOutListener.setHttpSessionManager(simpleHttpSessionManager());
+        loginOutListener.setHttpSessionManager(httpSessionManager);
         return loginOutListener;
     }
 }
diff --git a/hsweb-web-core/src/main/resources/org.hsweb.web.core.session.redis/getUserIds.lua b/hsweb-web-core/src/main/resources/org.hsweb.web.core.session.redis/getUserIds.lua
@@ -0,0 +1,16 @@
+local ids = redis.call('KEYS', 'http.session.user:*');
+local ids_ = {};
+for i, v in ipairs(ids) do
+
+    local userId = v:sub(19,-1);
+    local sessoinId = redis.call('GET', v);
+    local sessionExists = redis.call('EXISTS', 'spring:session:sessions:' .. sessoinId);
+    if (sessionExists== 1)
+    then
+        table.insert(ids_, userId);
+    else
+        return sessoinId;
+--        redis.call("DEL", 'http.session.user:' .. userId);
+    end
+end
+return ids_;
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/FormDeployContextLoaderListener.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/FormDeployContextLoaderListener.java
@@ -1,8 +1,12 @@
 package org.hsweb.web.service.impl;
 
+import org.hsweb.ezorm.meta.TableMetaData;
 import org.hsweb.web.bean.common.QueryParam;
+import org.hsweb.web.bean.po.form.Form;
 import org.hsweb.web.service.form.DynamicFormService;
 import org.hsweb.web.service.form.FormService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ApplicationEvent;
@@ -16,10 +20,12 @@
 @Component
 public class FormDeployContextLoaderListener implements ApplicationListener<ContextRefreshedEvent> {
     @Resource
-    private FormService formService;
+    private FormService        formService;
     @Resource
     private DynamicFormService dynamicFormService;
 
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
     @Override
     public void onApplicationEvent(ContextRefreshedEvent event) {
         if (event.getApplicationContext().getParent() != null) return;
@@ -28,9 +34,15 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
         try {
             formService.select(param).forEach(form -> {
                 try {
-                    dynamicFormService.deploy(form);
+                    Form deployed = formService.selectDeployed(form.getName());
+                    if (null != deployed) {
+                        TableMetaData metaData = dynamicFormService.parseMeta(deployed);
+                        dynamicFormService.getDefaultDatabase().reloadTable(metaData);
+                    } else {
+                        dynamicFormService.deploy(form);
+                    }
                 } catch (Exception e) {
-                    throw new RuntimeException(e);
+                    logger.error("部署{}:({})失败", form.getName(), form.getRemark(), e);
                 }
             });
         } catch (Exception e) {
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/DynamicFormServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/form/DynamicFormServiceImpl.java
@@ -98,7 +98,9 @@ public Database getDefaultDatabase() {
 
     @Override
     public TableMetaData parseMeta(Form form) {
-        return formParser.parse(form);
+        TableMetaData metaData = formParser.parse(form);
+        initDefaultField(metaData);
+        return metaData;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,16 @@`
`11`	`11`	`@ConditionalOnWebApplication`
`12`	`12`	`public class SimpleHttpSessionManagerAutoConfiguration {`
`13`	`13`
`14`		`- @Bean`
`15`		`- public HttpSessionManager simpleHttpSessionManager() {`
	`14`	`+ @Bean(name = "httpSessionManager")`
	`15`	`+ public HttpSessionManager httpSessionManager() {`
`16`	`16`	`SimpleHttpSessionManager httpSessionManager = new SimpleHttpSessionManager();`
`17`	`17`	`return httpSessionManager;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`@Bean`
`21`		`- public UserLoginOutListener sessionListener() {`
	`21`	`+ public UserLoginOutListener sessionListener(HttpSessionManager httpSessionManager) {`
`22`	`22`	`UserLoginOutListener loginOutListener = new UserLoginOutListener();`
`23`		`- loginOutListener.setHttpSessionManager(simpleHttpSessionManager());`
	`23`	`+ loginOutListener.setHttpSessionManager(httpSessionManager);`
`24`	`24`	`return loginOutListener;`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,9 @@ public Database getDefaultDatabase() {`
`98`	`98`
`99`	`99`	`@Override`
`100`	`100`	`public TableMetaData parseMeta(Form form) {`
`101`		`- return formParser.parse(form);`
	`101`	`+ TableMetaData metaData = formParser.parse(form);`
	`102`	`+ initDefaultField(metaData);`
	`103`	`+ return metaData;`
`102`	`104`	`}`
`103`	`105`
`104`	`106`	`@Override`