优化结构

zhou-hao · zhou-hao · commit ae2abf3880c4 · 2017-02-04T09:32:10.000+08:00
diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AopAuthorizeValidator.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AopAuthorizeValidator.java
@@ -2,18 +2,17 @@
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.hsweb.commons.ClassUtils;
+import org.hsweb.commons.StringUtils;
+import org.hsweb.web.bean.po.user.User;
 import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.core.authorize.oauth2.OAuth2Manager;
 import org.hsweb.web.core.authorize.validator.SimpleAuthorizeValidator;
-import org.hsweb.web.bean.po.user.User;
 import org.hsweb.web.core.exception.AuthorizeException;
 import org.hsweb.web.core.session.HttpSessionManager;
 import org.hsweb.web.core.utils.AopUtils;
-import org.hsweb.web.core.utils.ThreadLocalUtils;
 import org.hsweb.web.core.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.hsweb.commons.ClassUtils;
-import org.hsweb.commons.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
diff --git a/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceAutoConfiguration.java b/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceAutoConfiguration.java
@@ -86,7 +86,8 @@ public DynamicXaDataSourceImpl dynamicXaDataSource(@Qualifier("dataSource") Data
     }
 
     @Bean(initMethod = "init", destroyMethod = "close")
-    public UserTransactionManager userTransactionManager() {
+    public UserTransactionManager userTransactionManager(
+            UserTransactionService userTransactionService) {
         UserTransactionManager transactionManager = new UserTransactionManager();
         transactionManager.setForceShutdown(true);
         transactionManager.setStartupTransactionService(false);
diff --git a/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/config/ConfigService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/config/ConfigService.java
@@ -47,7 +47,6 @@ public interface ConfigService extends GenericService<Config, String> {
      */
     String get(String name, String key, String defaultValue);
 
-
     /**
      * 参照 {@link ConfigService#get(String, String)}，将值转为int类型
      */

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ public DynamicXaDataSourceImpl dynamicXaDataSource(@Qualifier("dataSource") Data`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Bean(initMethod = "init", destroyMethod = "close")`
`89`		`- public UserTransactionManager userTransactionManager() {`
	`89`	`+ public UserTransactionManager userTransactionManager(`
	`90`	`+ UserTransactionService userTransactionService) {`
`90`	`91`	`UserTransactionManager transactionManager = new UserTransactionManager();`
`91`	`92`	`transactionManager.setForceShutdown(true);`
`92`	`93`	`transactionManager.setStartupTransactionService(false);`