提交 eef5af5d 编写于 作者: sq3536's avatar sq3536

151 release

上级 7dc811c4
...@@ -14,15 +14,15 @@ ...@@ -14,15 +14,15 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>ibiz-boot-starter-parent</artifactId> <artifactId>ibiz-boot-starter-parent</artifactId>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-151</version>
<name>iBiz Boot Starter Parent</name> <name>iBiz Boot Starter Parent</name>
<description>iBiz Boot Starter Parent</description> <description>iBiz Boot Starter Parent</description>
<properties> <properties>
<revision>2.4.0-SNAPSHOT</revision> <revision>2.4.0-151</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ibiz-boot-starter.version>2.4.0-SNAPSHOT</ibiz-boot-starter.version> <ibiz-boot-starter.version>2.4.0-151</ibiz-boot-starter.version>
<ibiz.cloud.version>8.1.0.151</ibiz.cloud.version> <ibiz.cloud.version>8.1.0.151</ibiz.cloud.version>
<spring-cloud.version>2020.0.1</spring-cloud.version> <spring-cloud.version>2020.0.1</spring-cloud.version>
<spring-cloud-starter-bootstrap.version>3.0.1</spring-cloud-starter-bootstrap.version> <spring-cloud-starter-bootstrap.version>3.0.1</spring-cloud-starter-bootstrap.version>
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ibiz-boot-starter</artifactId> <artifactId>ibiz-boot-starter</artifactId>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-151</version>
<name>iBiz Boot Starter</name> <name>iBiz Boot Starter</name>
<description>iBiz Boot Starter</description> <description>iBiz Boot Starter</description>
<parent> <parent>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-boot-starter-parent</artifactId> <artifactId>ibiz-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-151</version>
<relativePath>../ibiz-boot-starter-parent/pom.xml</relativePath> <relativePath>../ibiz-boot-starter-parent/pom.xml</relativePath>
</parent> </parent>
......
...@@ -3,9 +3,12 @@ package net.ibizsys.central.plugin.boot.core.runtime; ...@@ -3,9 +3,12 @@ package net.ibizsys.central.plugin.boot.core.runtime;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.baomidou.dynamic.datasource.creator.DataSourceCreator; import com.baomidou.dynamic.datasource.creator.DataSourceCreator;
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
import com.zaxxer.hikari.HikariDataSource;
import net.ibizsys.central.cloud.core.ServiceHubBase; import net.ibizsys.central.cloud.core.ServiceHubBase;
import net.ibizsys.central.cloud.core.service.ISysServiceAPIDocAdapter; import net.ibizsys.central.cloud.core.service.ISysServiceAPIDocAdapter;
import net.ibizsys.central.cloud.core.util.domain.DataSource; import net.ibizsys.central.cloud.core.util.domain.DataSource;
import net.ibizsys.runtime.util.DBTypes;
import net.ibizsys.runtime.util.EntityUtils;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationArguments;
...@@ -16,6 +19,7 @@ import org.springframework.context.ApplicationContextAware; ...@@ -16,6 +19,7 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
...@@ -72,6 +76,7 @@ public class BootServiceHub extends ServiceHubBase implements ApplicationContext ...@@ -72,6 +76,7 @@ public class BootServiceHub extends ServiceHubBase implements ApplicationContext
} }
protected void registerDataSource(DataSource ds) throws Exception{ protected void registerDataSource(DataSource ds) throws Exception{
DataSourceProperty dataSourceProperty = new DataSourceProperty(); DataSourceProperty dataSourceProperty = new DataSourceProperty();
...@@ -90,10 +95,12 @@ public class BootServiceHub extends ServiceHubBase implements ApplicationContext ...@@ -90,10 +95,12 @@ public class BootServiceHub extends ServiceHubBase implements ApplicationContext
log.error(ex); log.error(ex);
} }
this.setDataSource(ds.getDataSourceId(), dataSource); this.setDataSource(ds.getDataSourceId(), dataSource);
} }
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
this.install(); this.install();
......
...@@ -8,20 +8,20 @@ ...@@ -8,20 +8,20 @@
<parent> <parent>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-boot-starter-parent</artifactId> <artifactId>ibiz-boot-starter-parent</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-151</version>
<relativePath>ibiz-boot-starter-parent/pom.xml</relativePath> <relativePath>ibiz-boot-starter-parent/pom.xml</relativePath>
</parent> </parent>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-boot-starters</artifactId> <artifactId>ibiz-boot-starters</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-151</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>ibiz-boot-starters</name> <name>ibiz-boot-starters</name>
<description>ibiz-boot-starters</description> <description>ibiz-boot-starters</description>
<properties> <properties>
<revision>2.4.0-SNAPSHOT</revision> <revision>2.4.0-151</revision>
</properties> </properties>
<modules> <modules>
<module>ibiz-boot-starter-parent</module> <module>ibiz-boot-starter-parent</module>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册