Browse Source

优化数据源的配置、修改动态数据源的代码。

yangzhijie 6 năm trước cách đây
mục cha
commit
fc3b3fe194

+ 1 - 1
src/main/java/com/leanwo/gateway/MyGlobalFilter.java → src/main/java/com/leanwo/gateway/GlobalAccountFilter.java

@@ -22,7 +22,7 @@ import reactor.core.publisher.Mono;
  *
  */
 @Component//注入Spring容器
-public class MyGlobalFilter implements GlobalFilter, Ordered{
+public class GlobalAccountFilter implements GlobalFilter, Ordered{
 
 
 	@Autowired

+ 5 - 5
src/main/java/com/leanwo/gateway/dto/AccountManagementDto.java

@@ -12,7 +12,7 @@ public class AccountManagementDto {
     private Long id;
 
     /** 账套id. */
-    private Long account;
+    private Long accountId;
 
     /** 账套名称. */
     private String accountName;
@@ -65,8 +65,8 @@ public class AccountManagementDto {
      *
      * @return the 账套id
      */
-    public Long getAccount() {
-        return account;
+    public Long getAccountId() {
+        return accountId;
     }
 
     /**
@@ -75,8 +75,8 @@ public class AccountManagementDto {
      * @param account
      *            the new 账套id
      */
-    public void setAccount(Long account) {
-        this.account = account;
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
     }
 
     /**

+ 2 - 2
src/main/java/com/leanwo/gateway/imp/GatewayServiceImpl.java

@@ -35,13 +35,13 @@ public class GatewayServiceImpl implements GatewayService {
 			for (AccountManagementDto accountManagementDto : accountManagementDtos) {
 				if (accountManagementDto != null) {
 					if (domainName.contains(accountManagementDto.getDomainName())) {
-						return accountManagementDto.getAccount();
+						return accountManagementDto.getAccountId();
 					}
 				}
 			}
 		}
 
-		return -1L;
+		return 0L;
 	}
 
 	@Override