tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-08-18 00:24:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat[boot]: 支持spring boot的自动化配置

Browse Source
This commit is contained in:
jaysunxiao
2021-09-07 15:32:59 +08:00
parent 47be79785e
commit 44e4782641
37 changed files with 657 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot/pom.xml
+252
View File
@@ -0,0 +1,252 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.zfoo</groupId>
<artifactId>boot</artifactId>
<version>3.0</version>
<packaging>jar</packaging>
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
<zfoo.net.version>3.0</zfoo.net.version>
<zfoo.scheduler.version>3.0</zfoo.scheduler.version>
<zfoo.storage.version>3.0</zfoo.storage.version>
<zfoo.orm.version>3.0</zfoo.orm.version>
<zfoo.protocol.version>3.0</zfoo.protocol.version>
<zfoo.util.version>3.0</zfoo.util.version>
<!-- 核心spring框架 -->
<spring.version>5.3.4</spring.version>
<spring.boot.version>2.4.3</spring.boot.version>
<!-- 工具包 -->
<commons-codec.version>1.15</commons-codec.version>
<commons-io.version>2.8.0</commons-io.version>
<commons-collections.version>4.4</commons-collections.version>
<commons-lang.version>3.12.0</commons-lang.version>
<commons-fileupload.version>1.4</commons-fileupload.version>
<commons-logging.version>1.2</commons-logging.version>
<commons-log4j.version>2.14.0</commons-log4j.version>
<httpcomponents.version>4.5.13</httpcomponents.version>
<httpcore.version>4.4.14</httpcore.version>
<google.guava.version>30.1-jre</google.guava.version>
<google.protobuf.version>3.9.1</google.protobuf.version>
<google.gson.version>2.8.6</google.gson.version>
<kryo.version>5.0.3</kryo.version>
<caffeine.version>2.8.8</caffeine.version>
<jctools.version>3.2.0</jctools.version>
<hutool.version>5.5.9</hutool.version>
<oshi.version>5.7.0</oshi.version>
<snakeyaml.version>1.28</snakeyaml.version>
<!-- json和xml解析包 -->
<jackson.version>2.12.1</jackson.version>
<fastjson.version>1.2.51</fastjson.version>
<!-- office文档解析包 -->
<poi.version>4.1.2</poi.version>
<!-- 字节码增强 -->
<javassist.version>3.27.0-GA</javassist.version>
<bytebuddy.version>1.10.22</bytebuddy.version>
<!-- 网络通讯框架 -->
<netty.version>4.1.63.Final</netty.version>
<!-- 分布式zookeeper核心依赖包 -->
<zookeeper.version>3.6.1</zookeeper.version>
<curator.version>5.1.0</curator.version>
<!-- 数据库和缓存 -->
<mongodb-driver-sync.version>4.2.1</mongodb-driver-sync.version>
<jedis.version>3.3.0</jedis.version>
<!-- 消息队列中间件 -->
<rocketmq.version>4.5.2</rocketmq.version>
<!-- elastic search 中间件 -->
<elastic.search.version>7.9.3</elastic.search.version>
<elastic.search.spring.version>4.1.5</elastic.search.spring.version>
<lucene.version>8.6.2</lucene.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.3</logback.version>
<junit.version>4.12</junit.version>
<!-- java版本和文件编码 -->
<java.version>11</java.version>
<file.encoding>UTF-8</file.encoding>
<jakarta.version>1.3.5</jakarta.version>
<!-- maven核心插件 -->
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
<project.build.sourceEncoding>${file.encoding}</project.build.sourceEncoding>
<maven.compiler.encoding>${file.encoding}</maven.compiler.encoding>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring.boot.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.zfoo</groupId>
<artifactId>net</artifactId>
<version>${zfoo.net.version}</version>
</dependency>
<dependency>
<groupId>com.zfoo</groupId>
<artifactId>orm</artifactId>
<version>${zfoo.orm.version}</version>
</dependency>
<dependency>
<groupId>com.zfoo</groupId>
<artifactId>event</artifactId>
<version>${zfoo.event.version}</version>
</dependency>
<dependency>
<groupId>com.zfoo</groupId>
<artifactId>scheduler</artifactId>
<version>${zfoo.scheduler.version}</version>
</dependency>
<dependency>
<groupId>com.zfoo</groupId>
<artifactId>storage</artifactId>
<version>${zfoo.storage.version}</version>
</dependency>
<!-- slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- logback核心包 -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- logback的sl4j的实现 -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- 依赖的测试库 -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
<plugins>
<!-- 清理插件 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven-clean-plugin.version}</version>
</plugin>
<!-- 编译插件 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${file.encoding}</encoding>
</configuration>
</plugin>
<!-- resource资源管理插件 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
<executions>
<execution>
<id>copy-resources</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<encoding>${file.encoding}</encoding>
<outputDirectory>${project.build.directory}/resource</outputDirectory>
<resources>
<resource>
<directory>src/main/resources/</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<!-- 测试插件 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<forkMode>once</forkMode>
<threadCount>10</threadCount>
<argLine>-Dfile.encoding=${file.encoding}</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
</plugins>
</build>
</project>
orm/src/main/java/com/zfoo/orm/model/config/CachesConfig.java → boot/src/main/java/com/zfoo/boot/EventAutoConfiguration.java
+17 -10
View File
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2020 The zfoo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
@@ -11,23 +10,31 @@
* See the License for the specific language governing permissions and limitations under the License.
*/
package com.zfoo.orm.model.config;
package com.zfoo.boot;
import java.util.List;
import com.zfoo.event.EventContext;
import com.zfoo.event.schema.EventRegisterProcessor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author jaysunxiao
* @version 3.0
*/
public class CachesConfig {
@Configuration(proxyBeanMethods = false)
public class EventAutoConfiguration {
private List<CacheStrategy> cacheStrategies;
public List<CacheStrategy> getCacheStrategies() {
return cacheStrategies;
@Bean
@ConditionalOnMissingBean
public EventRegisterProcessor eventRegisterProcessor() {
return new EventRegisterProcessor();
}
public void setCacheStrategies(List<CacheStrategy> cacheStrategies) {
this.cacheStrategies = cacheStrategies;
@Bean
@ConditionalOnMissingBean
public EventContext eventContext() {
return new EventContext();
}
}
boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java
+73
View File
@@ -0,0 +1,73 @@
/*
* Copyright (C) 2020 The zfoo Authors
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and limitations under the License.
*/
package com.zfoo.boot;
import com.zfoo.net.NetContext;
import com.zfoo.net.config.manager.ConfigManager;
import com.zfoo.net.config.model.NetConfig;
import com.zfoo.net.consumer.service.Consumer;
import com.zfoo.net.dispatcher.manager.PacketDispatcher;
import com.zfoo.net.packet.service.PacketService;
import com.zfoo.net.session.manager.SessionManager;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author jaysunxiao
* @version 3.0
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(NetConfig.class)
public class NetAutoConfiguration {
@Bean
@ConditionalOnBean(NetConfig.class)
public ConfigManager configManager(NetConfig netConfig) {
var configManager = new ConfigManager();
configManager.setLocalConfig(netConfig);
return configManager;
}
@Bean
@ConditionalOnMissingBean
public PacketService packetService() {
return new PacketService();
}
@Bean
@ConditionalOnMissingBean
public PacketDispatcher packetDispatcher() {
return new PacketDispatcher();
}
@Bean
@ConditionalOnMissingBean
public Consumer consumer() {
return new Consumer();
}
@Bean
@ConditionalOnMissingBean
public SessionManager sessionManager() {
return new SessionManager();
}
@Bean
@ConditionalOnMissingBean
public NetContext netContext() {
return new NetContext();
}
}
boot/src/main/java/com/zfoo/boot/OrmAutoConfiguration.java
+60
View File
@@ -0,0 +1,60 @@
/*
* Copyright (C) 2020 The zfoo Authors
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and limitations under the License.
*/
package com.zfoo.boot;
import com.zfoo.orm.OrmContext;
import com.zfoo.orm.manager.OrmManager;
import com.zfoo.orm.model.accessor.MongodbAccessor;
import com.zfoo.orm.model.config.OrmConfig;
import com.zfoo.orm.model.query.MongodbQuery;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author jaysunxiao
* @version 3.0
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(OrmConfig.class)
public class OrmAutoConfiguration {
@Bean
@ConditionalOnBean(OrmConfig.class)
public OrmManager ormManager(OrmConfig ormConfig) {
var ormManager = new OrmManager();
ormManager.setOrmConfig(ormConfig);
return ormManager;
}
@Bean
@ConditionalOnMissingBean
public MongodbAccessor mongodbAccessor() {
return new MongodbAccessor();
}
@Bean
@ConditionalOnMissingBean
public MongodbQuery mongodbQuery() {
return new MongodbQuery();
}
@Bean
@ConditionalOnMissingBean
public OrmContext ormContext() {
return new OrmContext();
}
}
boot/src/main/java/com/zfoo/boot/SchedulerAutoConfiguration.java
+40
View File
@@ -0,0 +1,40 @@
/*
* Copyright (C) 2020 The zfoo Authors
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and limitations under the License.
*/
package com.zfoo.boot;
import com.zfoo.scheduler.SchedulerContext;
import com.zfoo.scheduler.schema.SchedulerRegisterProcessor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author jaysunxiao
* @version 3.0
*/
@Configuration(proxyBeanMethods = false)
public class SchedulerAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public SchedulerRegisterProcessor schedulerRegisterProcessor() {
return new SchedulerRegisterProcessor();
}
@Bean
@ConditionalOnMissingBean
public SchedulerContext schedulerContext() {
return new SchedulerContext();
}
}
boot/src/main/java/com/zfoo/boot/StorageAutoConfiguration.java
+53
View File
@@ -0,0 +1,53 @@
/*
* Copyright (C) 2020 The zfoo Authors
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and limitations under the License.
*/
package com.zfoo.boot;
import com.zfoo.storage.StorageContext;
import com.zfoo.storage.interpreter.ExcelResourceReader;
import com.zfoo.storage.manager.StorageManager;
import com.zfoo.storage.model.config.StorageConfig;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author jaysunxiao
* @version 3.0
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(StorageConfig.class)
public class StorageAutoConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnBean(StorageConfig.class)
public StorageManager storageManager(StorageConfig storageConfig) {
var storageManager = new StorageManager();
storageManager.setStorageConfig(storageConfig);
return storageManager;
}
@Bean
@ConditionalOnMissingBean
public ExcelResourceReader excelResourceReader() {
return new ExcelResourceReader();
}
@Bean
@ConditionalOnMissingBean
public StorageContext storageContext() {
return new StorageContext();
}
}
boot/src/main/resources/META-INF/spring.factories
+6
View File
@@ -0,0 +1,6 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.zfoo.boot.EventAutoConfiguration,\
com.zfoo.boot.SchedulerAutoConfiguration,\
com.zfoo.boot.StorageAutoConfiguration,\
com.zfoo.boot.OrmAutoConfiguration,\
com.zfoo.boot.NetAutoConfiguration
event/pom.xml
+1
View File
@@ -13,6 +13,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
hotswap/pom.xml
+1
View File
@@ -12,6 +12,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
monitor/pom.xml
+1
View File
@@ -12,6 +12,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
net/pom.xml
+1
View File
@@ -13,6 +13,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
net/src/main/java/com/zfoo/net/config/manager/ConfigManager.java
+2 -2
View File
@@ -64,7 +64,7 @@ public class ConfigManager implements IConfigManager {
@Override
public void initRegistry() {
// 通过protocol，写入provider的module的id和version
var providerConfig = localConfig.getProviderConfig();
var providerConfig = localConfig.getProvider();
if (Objects.nonNull(providerConfig) && CollectionUtils.isNotEmpty(providerConfig.getModules())) {
var providerModules = new ArrayList<ProtocolModule>(providerConfig.getModules().size());
for (var providerModule : providerConfig.getModules()) {
@@ -76,7 +76,7 @@ public class ConfigManager implements IConfigManager {
}
// 通过protocol，写入consumer的module的id和version
var consumerConfig = localConfig.getConsumerConfig();
var consumerConfig = localConfig.getConsumer();
if (Objects.nonNull(consumerConfig) && CollectionUtils.isNotEmpty(consumerConfig.getModules())) {
var consumerModules = new ArrayList<ProtocolModule>(consumerConfig.getModules().size());
for (var providerModule : consumerConfig.getModules()) {
net/src/main/java/com/zfoo/net/config/model/HostConfig.java
+7 -7
View File
@@ -25,7 +25,7 @@ public class HostConfig {
private String center;
private String user;
private String password;
private Map<String, String> addressMap;
private Map<String, String> address;
public void setCenter(String center) {
this.center = center;
@@ -51,12 +51,12 @@ public class HostConfig {
this.password = password;
}
public Map<String, String> getAddressMap() {
return addressMap;
public Map<String, String> getAddress() {
return address;
}
public void setAddressMap(Map<String, String> addressMap) {
this.addressMap = addressMap;
public void setAddress(Map<String, String> address) {
this.address = address;
}
@Override
@@ -71,11 +71,11 @@ public class HostConfig {
return Objects.equals(center, that.center) &&
Objects.equals(user, that.user) &&
Objects.equals(password, that.password) &&
Objects.equals(addressMap, that.addressMap);
Objects.equals(address, that.address);
}
@Override
public int hashCode() {
return Objects.hash(center, user, password, addressMap);
return Objects.hash(center, user, password, address);
}
}
net/src/main/java/com/zfoo/net/config/model/MonitorConfig.java
+8 -8
View File
@@ -25,14 +25,14 @@ public class MonitorConfig {
private String center;
private String user;
private String password;
private Map<String, String> addressMap;
private Map<String, String> address;
public static MonitorConfig valueOf(String center, String user, String password, Map<String, String> addressMap) {
MonitorConfig config = new MonitorConfig();
config.center = center;
config.user = user;
config.password = password;
config.addressMap = addressMap;
config.address = addressMap;
return config;
}
@@ -60,12 +60,12 @@ public class MonitorConfig {
this.password = password;
}
public Map<String, String> getAddressMap() {
return addressMap;
public Map<String, String> getAddress() {
return address;
}
public void setAddressMap(Map<String, String> addressMap) {
this.addressMap = addressMap;
public void setAddress(Map<String, String> address) {
this.address = address;
}
@Override
@@ -80,11 +80,11 @@ public class MonitorConfig {
return Objects.equals(center, that.center) &&
Objects.equals(user, that.user) &&
Objects.equals(password, that.password) &&
Objects.equals(addressMap, that.addressMap);
Objects.equals(address, that.address);
}
@Override
public int hashCode() {
return Objects.hash(center, user, password, addressMap);
return Objects.hash(center, user, password, address);
}
}
net/src/main/java/com/zfoo/net/config/model/NetConfig.java
+32 -32
View File
@@ -37,16 +37,16 @@ public class NetConfig {
private boolean generateCsProtocol;
private boolean generateLuaProtocol;
private RegistryConfig registryConfig;
private MonitorConfig monitorConfig;
private HostConfig hostConfig;
private RegistryConfig registry;
private MonitorConfig monitor;
private HostConfig host;
private ProviderConfig providerConfig;
private ConsumerConfig consumerConfig;
private ProviderConfig provider;
private ConsumerConfig consumer;
public RegisterVO toLocalRegisterVO() {
return RegisterVO.valueOf(id, providerConfig, consumerConfig);
return RegisterVO.valueOf(id, provider, consumer);
}
public String getId() {
@@ -105,44 +105,44 @@ public class NetConfig {
this.generateLuaProtocol = generateLuaProtocol;
}
public RegistryConfig getRegistryConfig() {
return registryConfig;
public RegistryConfig getRegistry() {
return registry;
}
public void setRegistryConfig(RegistryConfig registryConfig) {
this.registryConfig = registryConfig;
public void setRegistry(RegistryConfig registry) {
this.registry = registry;
}
public MonitorConfig getMonitorConfig() {
return monitorConfig;
public MonitorConfig getMonitor() {
return monitor;
}
public void setMonitorConfig(MonitorConfig monitorConfig) {
this.monitorConfig = monitorConfig;
public void setMonitor(MonitorConfig monitor) {
this.monitor = monitor;
}
public HostConfig getHostConfig() {
return hostConfig;
public HostConfig getHost() {
return host;
}
public void setHostConfig(HostConfig hostConfig) {
this.hostConfig = hostConfig;
public void setHost(HostConfig host) {
this.host = host;
}
public ProviderConfig getProviderConfig() {
return providerConfig;
public ProviderConfig getProvider() {
return provider;
}
public void setProviderConfig(ProviderConfig providerConfig) {
this.providerConfig = providerConfig;
public void setProvider(ProviderConfig provider) {
this.provider = provider;
}
public ConsumerConfig getConsumerConfig() {
return consumerConfig;
public ConsumerConfig getConsumer() {
return consumer;
}
public void setConsumerConfig(ConsumerConfig consumerConfig) {
this.consumerConfig = consumerConfig;
public void setConsumer(ConsumerConfig consumer) {
this.consumer = consumer;
}
@Override
@@ -157,15 +157,15 @@ public class NetConfig {
return generateJsProtocol == netConfig.generateJsProtocol &&
Objects.equals(id, netConfig.id) &&
Objects.equals(protocolLocation, netConfig.protocolLocation) &&
Objects.equals(registryConfig, netConfig.registryConfig) &&
Objects.equals(monitorConfig, netConfig.monitorConfig) &&
Objects.equals(hostConfig, netConfig.hostConfig) &&
Objects.equals(providerConfig, netConfig.providerConfig) &&
Objects.equals(consumerConfig, netConfig.consumerConfig);
Objects.equals(registry, netConfig.registry) &&
Objects.equals(monitor, netConfig.monitor) &&
Objects.equals(host, netConfig.host) &&
Objects.equals(provider, netConfig.provider) &&
Objects.equals(consumer, netConfig.consumer);
}
@Override
public int hashCode() {
return Objects.hash(id, protocolLocation, generateJsProtocol, registryConfig, monitorConfig, hostConfig, providerConfig, consumerConfig);
return Objects.hash(id, protocolLocation, generateJsProtocol, registry, monitor, host, provider, consumer);
}
}
net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java
+8 -8
View File
@@ -27,14 +27,14 @@ public class RegistryConfig {
private String center;
private String user;
private String password;
private Map<String, String> addressMap;
private Map<String, String> address;
public static RegistryConfig valueOf(String center, String user, String password, Map<String, String> addressMap) {
RegistryConfig config = new RegistryConfig();
config.center = center;
config.user = user;
config.password = password;
config.addressMap = addressMap;
config.address = addressMap;
return config;
}
@@ -70,12 +70,12 @@ public class RegistryConfig {
this.password = password;
}
public Map<String, String> getAddressMap() {
return addressMap;
public Map<String, String> getAddress() {
return address;
}
public void setAddressMap(Map<String, String> addressMap) {
this.addressMap = addressMap;
public void setAddress(Map<String, String> address) {
this.address = address;
}
@Override
@@ -90,11 +90,11 @@ public class RegistryConfig {
return Objects.equals(center, that.center) &&
Objects.equals(user, that.user) &&
Objects.equals(password, that.password) &&
Objects.equals(addressMap, that.addressMap);
Objects.equals(address, that.address);
}
@Override
public int hashCode() {
return Objects.hash(center, user, password, addressMap);
return Objects.hash(center, user, password, address);
}
}
net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java
+6 -6
View File
@@ -126,7 +126,7 @@ public class ZookeeperRegistry implements IRegistry {
@Override
public void start() {
var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistryConfig();
var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistry();
if (Objects.isNull(registryConfig)) {
logger.info("服务提供者没有配置，不会在zk种注册服务，如果是单机启动请忽略这条日志");
return;
@@ -141,7 +141,7 @@ public class ZookeeperRegistry implements IRegistry {
}
private void startProvider() {
var providerConfig = NetContext.getConfigManager().getLocalConfig().getProviderConfig();
var providerConfig = NetContext.getConfigManager().getLocalConfig().getProvider();
if (Objects.isNull(providerConfig)) {
logger.info("服务提供者没有配置，不会在zk种注册服务，如果是单机启动请忽略这条日志");
@@ -153,14 +153,14 @@ public class ZookeeperRegistry implements IRegistry {
}
private void startCurator() {
var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistryConfig();
var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistry();
if (!registryConfig.getCenter().toLowerCase().matches("zookeeper")) {
throw new IllegalArgumentException(StringUtils
.format("[center:{}]注册中心只能是zookeeper", JsonUtils.object2String(registryConfig)));
}
var zookeeperConnectStr = HostAndPort.toHostAndPortListStr(HostAndPort.toHostAndPortList(registryConfig.getAddressMap().values()));
var zookeeperConnectStr = HostAndPort.toHostAndPortListStr(HostAndPort.toHostAndPortList(registryConfig.getAddress().values()));
var builder = CuratorFrameworkFactory.builder();
builder.connectString(zookeeperConnectStr);
if (registryConfig.hasZookeeperAuthor()) {
@@ -207,7 +207,7 @@ public class ZookeeperRegistry implements IRegistry {
// 创建zookeeper的根路径
var rootStat = curator.checkExists().forPath(ROOT_PATH);
if (Objects.isNull(rootStat)) {
var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistryConfig();
var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistry();
var builder = curator.create();
builder.creatingParentsIfNeeded();
if (registryConfig.hasZookeeperAuthor()) {
@@ -218,7 +218,7 @@ public class ZookeeperRegistry implements IRegistry {
builder.withMode(CreateMode.PERSISTENT);
builder.forPath(ROOT_PATH, StringUtils.bytes(registryConfig.getCenter()));
} else {
var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistryConfig();
var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistry();
var bytes = curator.getData().storingStatIn(new Stat()).forPath(ROOT_PATH);
var rootPathData = StringUtils.bytesToString(bytes);
net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java
+8 -14
View File
@@ -20,7 +20,6 @@ import com.zfoo.net.consumer.service.Consumer;
import com.zfoo.net.dispatcher.manager.PacketDispatcher;
import com.zfoo.net.packet.service.PacketService;
import com.zfoo.net.session.manager.SessionManager;
import com.zfoo.protocol.ProtocolManager;
import com.zfoo.protocol.registration.ProtocolModule;
import com.zfoo.protocol.util.DomUtils;
import com.zfoo.protocol.util.StringUtils;
@@ -60,11 +59,6 @@ public class NetDefinitionParser implements BeanDefinitionParser {
builder.addPropertyReference("localConfig", NetConfig.class.getCanonicalName());
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
// 注册ProtocolManager
clazz = ProtocolManager.class;
builder = BeanDefinitionBuilder.rootBeanDefinition(clazz);
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
// 注册PacketService
clazz = PacketService.class;
builder = BeanDefinitionBuilder.rootBeanDefinition(clazz);
@@ -104,31 +98,31 @@ public class NetDefinitionParser implements BeanDefinitionParser {
var registryElement = DomUtils.getFirstChildElementByTagName(element, "registry");
if (registryElement != null) {
parseRegistryConfig(registryElement, parserContext);
builder.addPropertyReference("registryConfig", RegistryConfig.class.getCanonicalName());
builder.addPropertyReference("registry", RegistryConfig.class.getCanonicalName());
}
var monitorElement = DomUtils.getFirstChildElementByTagName(element, "monitor");
if (monitorElement != null) {
parseMonitorConfig(monitorElement, parserContext);
builder.addPropertyReference("monitorConfig", MonitorConfig.class.getCanonicalName());
builder.addPropertyReference("monitor", MonitorConfig.class.getCanonicalName());
}
var hostElement = DomUtils.getFirstChildElementByTagName(element, "host");
if (hostElement != null) {
builder.addPropertyReference("hostConfig", HostConfig.class.getCanonicalName());
builder.addPropertyReference("host", HostConfig.class.getCanonicalName());
parseHostConfig(hostElement, parserContext);
}
var providerElement = DomUtils.getFirstChildElementByTagName(element, "provider");
if (providerElement != null) {
builder.addPropertyReference("providerConfig", ProviderConfig.class.getCanonicalName());
builder.addPropertyReference("provider", ProviderConfig.class.getCanonicalName());
parseProviderConfig(providerElement, parserContext);
}
var consumerElement = DomUtils.getFirstChildElementByTagName(element, "consumer");
if (consumerElement != null) {
parseConsumerConfig(consumerElement, parserContext);
builder.addPropertyReference("consumerConfig", ConsumerConfig.class.getCanonicalName());
builder.addPropertyReference("consumer", ConsumerConfig.class.getCanonicalName());
}
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
@@ -142,7 +136,7 @@ public class NetDefinitionParser implements BeanDefinitionParser {
resolvePlaceholder("user", "user", builder, element, parserContext);
resolvePlaceholder("password", "password", builder, element, parserContext);
var addressMap = parseAddress(element, parserContext);
builder.addPropertyValue("addressMap", addressMap);
builder.addPropertyValue("address", addressMap);
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
}
@@ -154,7 +148,7 @@ public class NetDefinitionParser implements BeanDefinitionParser {
resolvePlaceholder("user", "user", builder, element, parserContext);
resolvePlaceholder("password", "password", builder, element, parserContext);
var addressMap = parseAddress(element, parserContext);
builder.addPropertyValue("addressMap", addressMap);
builder.addPropertyValue("address", addressMap);
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
}
@@ -166,7 +160,7 @@ public class NetDefinitionParser implements BeanDefinitionParser {
resolvePlaceholder("user", "user", builder, element, parserContext);
resolvePlaceholder("password", "password", builder, element, parserContext);
var addressMap = parseAddress(element, parserContext);
builder.addPropertyValue("addressMap", addressMap);
builder.addPropertyValue("address", addressMap);
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
}
net/src/main/java/com/zfoo/net/task/TaskManager.java
+1 -1
View File
@@ -50,7 +50,7 @@ public final class TaskManager implements ITaskManager {
static {
var localConfig = NetContext.getConfigManager().getLocalConfig();
var providerConfig = localConfig.getProviderConfig();
var providerConfig = localConfig.getProvider();
var dispatch = providerConfig == null ? "consistent-hash" : providerConfig.getDispatch();
var dispatchThread = (providerConfig == null || StringUtils.isBlank(providerConfig.getDispatchThread()))
net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientTest.java
+3 -3
View File
@@ -44,7 +44,7 @@ public class TcpClientTest {
public void startClient0() {
var context = new ClassPathXmlApplicationContext("config.xml");
SessionUtils.printSessionInfo();
var client = new TcpClient(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHostConfig().getAddressMap().get("server0")));
var client = new TcpClient(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHost().getAddress().get("server0")));
var session = client.start();
var request = new TcpHelloRequest();
@@ -64,7 +64,7 @@ public class TcpClientTest {
public void syncClientTest() {
var context = new ClassPathXmlApplicationContext("config.xml");
SessionUtils.printSessionInfo();
var client = new TcpClient(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHostConfig().getAddressMap().get("server1")));
var client = new TcpClient(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHost().getAddress().get("server1")));
var session = client.start();
var executorSize = Runtime.getRuntime().availableProcessors() * 2;
@@ -93,7 +93,7 @@ public class TcpClientTest {
@Test
public void asyncClientTest() {
var context = new ClassPathXmlApplicationContext("config.xml");
var client1 = new TcpClient(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHostConfig().getAddressMap().get("server1")));
var client1 = new TcpClient(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHost().getAddress().get("server1")));
var session1 = client1.start();
var executorSize = Runtime.getRuntime().availableProcessors() * 2;
net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerTest.java
+3 -3
View File
@@ -42,7 +42,7 @@ public class TcpServerTest {
var context = new ClassPathXmlApplicationContext("config.xml");
SessionUtils.printSessionInfo();
var server0 = new TcpServer(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHostConfig().getAddressMap().get("server0")));
var server0 = new TcpServer(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHost().getAddress().get("server0")));
server0.start();
ThreadUtils.sleep(Long.MAX_VALUE);
}
@@ -53,7 +53,7 @@ public class TcpServerTest {
SessionUtils.printSessionInfo();
var server1 = new TcpServer(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHostConfig().getAddressMap().get("server1")));
var server1 = new TcpServer(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHost().getAddress().get("server1")));
server1.start();
// 连接server0
@@ -61,7 +61,7 @@ public class TcpServerTest {
executor.execute(() -> {
while (true) {
try {
var client0 = new TcpClient(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHostConfig().getAddressMap().get("client0")));
var client0 = new TcpClient(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHost().getAddress().get("client0")));
client0.start();
break;
} catch (Exception e) {
orm/pom.xml
+1
View File
@@ -12,6 +12,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
orm/src/main/java/com/zfoo/orm/manager/OrmManager.java
+5 -5
View File
@@ -98,9 +98,9 @@ public class OrmManager implements IOrmManager {
.codecRegistry(pojoCodecRegistry);
// 设置数据库地址
var hostConfig = ormConfig.getHostConfig();
if (CollectionUtils.isNotEmpty(hostConfig.getAddressMap())) {
var hostList = HostAndPort.toHostAndPortList(hostConfig.getAddressMap().values())
var hostConfig = ormConfig.getHost();
if (CollectionUtils.isNotEmpty(hostConfig.getAddress())) {
var hostList = HostAndPort.toHostAndPortList(hostConfig.getAddress().values())
.stream()
.map(it -> new ServerAddress(it.getHost(), it.getPort()))
.collect(Collectors.toList());
@@ -293,8 +293,8 @@ public class OrmManager implements IOrmManager {
public EntityDef parserEntityDef(Class<? extends IEntity<?>> clazz) {
analyze(clazz);
var cacheStrategies = ormConfig.getCachesConfig().getCacheStrategies();
var persisterStrategies = ormConfig.getPersistersConfig().getPersisterStrategies();
var cacheStrategies = ormConfig.getCaches();
var persisterStrategies = ormConfig.getPersisters();
var cache = clazz.getAnnotation(EntityCache.class);
var cacheStrategyOptional = cacheStrategies.stream().filter(it -> it.getStrategy().equals(cache.cacheStrategy())).findFirst();
orm/src/main/java/com/zfoo/orm/model/config/CacheStrategy.java
+6 -4
View File
@@ -23,12 +23,14 @@ public class CacheStrategy {
private int size;
private long expireMillisecond;
public CacheStrategy(String strategy, int cacheSize, long expireMillisecond) {
this.strategy = strategy;
this.size = cacheSize;
this.expireMillisecond = expireMillisecond;
public CacheStrategy() {
}
public CacheStrategy(String strategy, int size, long expireMillisecond) {
this.strategy = strategy;
this.size = size;
this.expireMillisecond = expireMillisecond;
}
public String getStrategy() {
return strategy;
orm/src/main/java/com/zfoo/orm/model/config/HostConfig.java
+6 -6
View File
@@ -24,14 +24,14 @@ public class HostConfig {
private String database;
private String user;
private String password;
private Map<String, String> addressMap;
private Map<String, String> address;
public static HostConfig valueOf(String database, String user, String password, Map<String, String> addressMap) {
HostConfig config = new HostConfig();
config.database = database;
config.user = user;
config.password = password;
config.addressMap = addressMap;
config.address = addressMap;
return config;
}
@@ -59,11 +59,11 @@ public class HostConfig {
this.password = password;
}
public Map<String, String> getAddressMap() {
return addressMap;
public Map<String, String> getAddress() {
return address;
}
public void setAddressMap(Map<String, String> addressMap) {
this.addressMap = addressMap;
public void setAddress(Map<String, String> address) {
this.address = address;
}
}
orm/src/main/java/com/zfoo/orm/model/config/OrmConfig.java
+17 -15
View File
@@ -13,6 +13,8 @@
package com.zfoo.orm.model.config;
import java.util.List;
/**
* @author jaysunxiao
* @version 3.0
@@ -23,11 +25,11 @@ public class OrmConfig {
private String entityPackage;
private HostConfig hostConfig;
private HostConfig host;
private CachesConfig cachesConfig;
private List<CacheStrategy> caches;
private PersistersConfig persistersConfig;
private List<PersisterStrategy> persisters;
public String getId() {
return id;
@@ -45,27 +47,27 @@ public class OrmConfig {
this.entityPackage = entityPackage;
}
public HostConfig getHostConfig() {
return hostConfig;
public HostConfig getHost() {
return host;
}
public void setHostConfig(HostConfig hostConfig) {
this.hostConfig = hostConfig;
public void setHost(HostConfig host) {
this.host = host;
}
public CachesConfig getCachesConfig() {
return cachesConfig;
public List<CacheStrategy> getCaches() {
return caches;
}
public void setCachesConfig(CachesConfig cachesConfig) {
this.cachesConfig = cachesConfig;
public void setCaches(List<CacheStrategy> caches) {
this.caches = caches;
}
public PersistersConfig getPersistersConfig() {
return persistersConfig;
public List<PersisterStrategy> getPersisters() {
return persisters;
}
public void setPersistersConfig(PersistersConfig persistersConfig) {
this.persistersConfig = persistersConfig;
public void setPersisters(List<PersisterStrategy> persisters) {
this.persisters = persisters;
}
}
orm/src/main/java/com/zfoo/orm/model/config/PersisterStrategy.java
+3
View File
@@ -25,6 +25,9 @@ public class PersisterStrategy {
private String config;
public PersisterStrategy() {
}
public PersisterStrategy(String strategy, String type, String config) {
this.strategy = strategy;
this.config = config;
orm/src/main/java/com/zfoo/orm/model/config/PersistersConfig.java
-33
View File
@@ -1,33 +0,0 @@
/*
* Copyright (C) 2020 The zfoo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and limitations under the License.
*/
package com.zfoo.orm.model.config;
import java.util.List;
/**
* @author jaysunxiao
* @version 3.0
*/
public class PersistersConfig {
private List<PersisterStrategy> persisterStrategies;
public List<PersisterStrategy> getPersisterStrategies() {
return persisterStrategies;
}
public void setPersisterStrategies(List<PersisterStrategy> persisterStrategies) {
this.persisterStrategies = persisterStrategies;
}
}
orm/src/main/java/com/zfoo/orm/schema/OrmDefinitionParser.java
+13 -31
View File
@@ -16,7 +16,10 @@ package com.zfoo.orm.schema;
import com.zfoo.orm.OrmContext;
import com.zfoo.orm.manager.OrmManager;
import com.zfoo.orm.model.accessor.MongodbAccessor;
import com.zfoo.orm.model.config.*;
import com.zfoo.orm.model.config.CacheStrategy;
import com.zfoo.orm.model.config.HostConfig;
import com.zfoo.orm.model.config.OrmConfig;
import com.zfoo.orm.model.config.PersisterStrategy;
import com.zfoo.orm.model.query.MongodbQuery;
import com.zfoo.protocol.util.DomUtils;
import com.zfoo.protocol.util.StringUtils;
@@ -42,7 +45,7 @@ public class OrmDefinitionParser implements BeanDefinitionParser {
String name;
BeanDefinitionBuilder builder;
// 注册NetConfig
// 注册OrmConfig
parseOrmConfig(element, parserContext);
// 注册OrmSpringContext
@@ -81,13 +84,15 @@ public class OrmDefinitionParser implements BeanDefinitionParser {
resolvePlaceholder("entity-package", "entityPackage", builder, element, parserContext);
parseHostConfig(DomUtils.getFirstChildElementByTagName(element, "host"), parserContext);
builder.addPropertyReference("hostConfig", HostConfig.class.getCanonicalName());
builder.addPropertyReference("host", HostConfig.class.getCanonicalName());
parseCaches(DomUtils.getFirstChildElementByTagName(element, "caches"), parserContext);
builder.addPropertyReference("cachesConfig", CachesConfig.class.getCanonicalName());
// 解析caches标签
var caches = parseCacheStrategies(DomUtils.getFirstChildElementByTagName(element, "caches"), parserContext);
builder.addPropertyValue("caches", caches);
parsePersisters(DomUtils.getFirstChildElementByTagName(element, "persisters"), parserContext);
builder.addPropertyReference("persistersConfig", PersistersConfig.class.getCanonicalName());
// 解析persisters标签
var persisters = parsePersisterStrategies(DomUtils.getFirstChildElementByTagName(element, "persisters"), parserContext);
builder.addPropertyValue("persisters", persisters);
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
}
@@ -103,34 +108,11 @@ public class OrmDefinitionParser implements BeanDefinitionParser {
resolvePlaceholder("password", "password", builder, element, parserContext);
var addressMap = parseAddress(element, parserContext);
builder.addPropertyValue("addressMap", addressMap);
builder.addPropertyValue("address", addressMap);
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
}
private void parseCaches(Element element, ParserContext parserContext) {
// 解析caches标签
var clazz = CachesConfig.class;
var builder = BeanDefinitionBuilder.rootBeanDefinition(clazz);
var cacheStrategies = parseCacheStrategies(element, parserContext);
builder.addPropertyValue("cacheStrategies", cacheStrategies);
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
}
private void parsePersisters(Element element, ParserContext parserContext) {
// 解析persisters标签
var clazz = PersistersConfig.class;
var builder = BeanDefinitionBuilder.rootBeanDefinition(clazz);
var persisterStrategies = parsePersisterStrategies(element, parserContext);
builder.addPropertyValue("persisterStrategies", persisterStrategies);
parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition());
}
private ManagedList<BeanDefinitionHolder> parseCacheStrategies(Element element, ParserContext parserContext) {
var cacheStrategiesElementList = DomUtils.getChildElementsByTagName(element, "cache");
var cacheStrategies = new ManagedList<BeanDefinitionHolder>();
pom.xml
+2
View File
@@ -24,6 +24,7 @@
<!-- 没有用<dependencyManagement>来管理这个root，是为了让下面的module不依赖于任何parent，复制出来就可以用 -->
<!-- 聚合，把下面的几个module一起打包，packaging必须为pom -->
<modules>
<module>boot</module>
<module>event</module>
<module>hotswap</module>
<module>monitor</module>
@@ -38,6 +39,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
protocol/pom.xml
+1
View File
@@ -13,6 +13,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
scheduler/pom.xml
+1
View File
@@ -13,6 +13,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
storage/pom.xml
+1
View File
@@ -13,6 +13,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>
storage/src/main/java/com/zfoo/storage/StorageContext.java
-10
View File
@@ -13,7 +13,6 @@
package com.zfoo.storage;
import com.zfoo.protocol.util.StringUtils;
import com.zfoo.scheduler.model.StopWatch;
import com.zfoo.storage.interpreter.IResourceReader;
import com.zfoo.storage.manager.IStorageManager;
@@ -24,9 +23,7 @@ import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ApplicationContextEvent;
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.support.ConversionServiceFactoryBean;
import org.springframework.core.Ordered;
import org.springframework.core.convert.ConversionService;
/**
* @author jaysunxiao
@@ -44,8 +41,6 @@ public class StorageContext implements ApplicationListener<ApplicationContextEve
private IStorageManager storageManager;
private ConversionService conversionService;
public static StorageContext getStorageContext() {
return instance;
}
@@ -58,10 +53,6 @@ public class StorageContext implements ApplicationListener<ApplicationContextEve
return instance;
}
public static ConversionService getConversionService() {
return instance.conversionService;
}
public static IResourceReader getResourceReader() {
return instance.resourceReader;
}
@@ -78,7 +69,6 @@ public class StorageContext implements ApplicationListener<ApplicationContextEve
// 初始化上下文
StorageContext.instance = this;
instance.applicationContext = event.getApplicationContext();
instance.conversionService = (ConversionService) applicationContext.getBean(StringUtils.uncapitalize(ConversionServiceFactoryBean.class.getName()));
instance.resourceReader = applicationContext.getBean(IResourceReader.class);
instance.storageManager = applicationContext.getBean(IStorageManager.class);
storage/src/main/java/com/zfoo/storage/interpreter/ExcelResourceReader.java
+17 -2
View File
@@ -16,13 +16,14 @@ package com.zfoo.storage.interpreter;
import com.zfoo.protocol.exception.RunException;
import com.zfoo.protocol.util.ReflectionUtils;
import com.zfoo.protocol.util.StringUtils;
import com.zfoo.storage.StorageContext;
import com.zfoo.storage.model.anno.Id;
import com.zfoo.storage.strategy.*;
import com.zfoo.storage.util.CellUtils;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.springframework.context.support.ConversionServiceFactoryBean;
import org.springframework.core.convert.TypeDescriptor;
import java.io.IOException;
@@ -40,6 +41,20 @@ public class ExcelResourceReader implements IResourceReader {
private static final TypeDescriptor TYPE_DESCRIPTOR = TypeDescriptor.valueOf(String.class);
private static final ConversionServiceFactoryBean conversionServiceFactoryBean = new ConversionServiceFactoryBean();
static {
var converters = new HashSet<>();
converters.add(new JsonToArrayConverter());
converters.add(new JsonToMapConverter());
converters.add(new JsonToObjectConverter());
converters.add(new StringToClassConverter());
converters.add(new StringToDateConverter());
converters.add(new StringToMapConverter());
conversionServiceFactoryBean.setConverters(converters);
conversionServiceFactoryBean.afterPropertiesSet();
}
@Override
public <T> List<T> read(InputStream inputStream, Class<T> clazz) {
var wb = createWorkbook(inputStream, clazz);
@@ -90,7 +105,7 @@ public class ExcelResourceReader implements IResourceReader {
private void inject(Object instance, Field field, String content) {
try {
var targetType = new TypeDescriptor(field);
var value = StorageContext.getConversionService().convert(content, TYPE_DESCRIPTOR, targetType);
var value = conversionServiceFactoryBean.getObject().convert(content, TYPE_DESCRIPTOR, targetType);
ReflectionUtils.makeAccessible(field);
ReflectionUtils.setField(field, instance, value);
} catch (Exception e) {
storage/src/main/java/com/zfoo/storage/schema/StorageDefinitionParser.java
-19
View File
@@ -19,17 +19,12 @@ import com.zfoo.storage.StorageContext;
import com.zfoo.storage.interpreter.ExcelResourceReader;
import com.zfoo.storage.manager.StorageManager;
import com.zfoo.storage.model.config.StorageConfig;
import com.zfoo.storage.strategy.*;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.context.support.ConversionServiceFactoryBean;
import org.w3c.dom.Element;
import java.util.ArrayList;
import java.util.List;
/**
* @author jaysunxiao
* @version 3.0
@@ -97,20 +92,6 @@ public class StorageDefinitionParser implements BeanDefinitionParser {
name = StringUtils.uncapitalize(clazz.getName());
builder = BeanDefinitionBuilder.rootBeanDefinition(clazz);
registry.registerBeanDefinition(name, builder.getBeanDefinition());
// 注入ConversionServiceFactoryBean
clazz = ConversionServiceFactoryBean.class;
name = StringUtils.uncapitalize(clazz.getName());
builder = BeanDefinitionBuilder.rootBeanDefinition(clazz);
List<Object> converters = new ArrayList<>();
converters.add(new JsonToArrayConverter());
converters.add(new JsonToMapConverter());
converters.add(new JsonToObjectConverter());
converters.add(new StringToClassConverter());
converters.add(new StringToDateConverter());
converters.add(new StringToMapConverter());
builder.addPropertyValue("converters", converters);
registry.registerBeanDefinition(name, builder.getBeanDefinition());
}
private void resolvePlaceholder(String attributeName, String fieldName, BeanDefinitionBuilder builder, Element element, ParserContext parserContext) {
util/pom.xml
+1
View File
@@ -13,6 +13,7 @@
<properties>
<!-- 本项目的其它module版本号 -->
<zfoo.boot.version>3.0</zfoo.boot.version>
<zfoo.event.version>3.0</zfoo.event.version>
<zfoo.hotswap.version>3.0</zfoo.hotswap.version>
<zfoo.monitor.version>3.0</zfoo.monitor.version>