Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
matrix
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mall
arch
matrix
Commits
fff260bb
Commit
fff260bb
authored
Jan 03, 2020
by
qiuweili123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
format
parent
89ecec02
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
16 deletions
+8
-16
AbsDataSource.java
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/bean/AbsDataSource.java
+7
-8
MatrixDataSource.java
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/bean/MatrixDataSource.java
+1
-3
MatrixDynamicDataSource.java
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/bean/MatrixDynamicDataSource.java
+0
-2
MatrixDataSourceConfig.java
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/config/MatrixDataSourceConfig.java
+0
-2
MatrixDataSourceProperties.java
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/properties/MatrixDataSourceProperties.java
+0
-1
No files found.
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/bean/AbsDataSource.java
View file @
fff260bb
...
@@ -13,7 +13,6 @@ import javax.sql.DataSource;
...
@@ -13,7 +13,6 @@ import javax.sql.DataSource;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Method
;
import
java.sql.Connection
;
import
java.sql.Connection
;
import
java.sql.SQLException
;
import
java.sql.SQLException
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.concurrent.locks.Lock
;
import
java.util.concurrent.locks.Lock
;
...
@@ -24,10 +23,10 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
...
@@ -24,10 +23,10 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
private
static
Lock
lock
=
new
ReentrantLock
();
private
static
Lock
lock
=
new
ReentrantLock
();
private
static
DataSourceProvider
dataSourceProvider
=
ServiceLoaderFactory
.
getInstance
(
DataSourceProvider
.
class
);
private
static
DataSourceProvider
dataSourceProvider
=
ServiceLoaderFactory
.
getInstance
(
DataSourceProvider
.
class
);
@Getter
@Getter
private
static
Map
<
String
,
DataSource
>
dataSourceMap
=
dataSourceProvider
.
loadDataSources
();
private
static
Map
<
String
,
DataSource
>
dataSourceMap
=
dataSourceProvider
.
loadDataSources
();
public
AbsDataSource
()
{
public
AbsDataSource
()
{
...
@@ -63,8 +62,8 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
...
@@ -63,8 +62,8 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
public
void
destroy
()
throws
Exception
{
public
void
destroy
()
throws
Exception
{
List
<
String
>
removeDsNames
=
getRemoveDsNames
();
List
<
String
>
removeDsNames
=
getRemoveDsNames
();
for
(
String
dsName
:
removeDsNames
)
{
for
(
String
dsName
:
removeDsNames
)
{
log
.
info
(
"datasource {} start closing ...."
,
dsName
);
log
.
info
(
"datasource {} start closing ...."
,
dsName
);
DataSource
dataSource
=
dataSourceMap
.
get
(
dsName
);
DataSource
dataSource
=
dataSourceMap
.
get
(
dsName
);
Class
<?
extends
DataSource
>
clazz
=
dataSource
.
getClass
();
Class
<?
extends
DataSource
>
clazz
=
dataSource
.
getClass
();
try
{
try
{
...
@@ -74,7 +73,7 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
...
@@ -74,7 +73,7 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
log
.
warn
(
"datasource close the datasource named [{}] failed,"
,
dsName
);
log
.
warn
(
"datasource close the datasource named [{}] failed,"
,
dsName
);
}
}
removeDataSource
(
dsName
);
removeDataSource
(
dsName
);
log
.
info
(
"datasource {} closed success"
,
dsName
);
log
.
info
(
"datasource {} closed success"
,
dsName
);
}
}
}
}
...
@@ -96,12 +95,12 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
...
@@ -96,12 +95,12 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
}
}
protected
abstract
DataSource
getDataSource
();
protected
abstract
DataSource
getDataSource
();
/**
/**
* 确定要清除的数据源名称
* 确定要清除的数据源名称
*
* @return
* @return
*/
*/
protected
abstract
List
<
String
>
getRemoveDsNames
();
protected
abstract
List
<
String
>
getRemoveDsNames
();
}
}
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/bean/MatrixDataSource.java
View file @
fff260bb
package
com
.
secoo
.
mall
.
datasource
.
bean
;
package
com
.
secoo
.
mall
.
datasource
.
bean
;
import
com.google.common.collect.Lists
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
javax.sql.DataSource
;
import
javax.sql.DataSource
;
import
java.lang.reflect.Method
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
...
@@ -19,7 +17,7 @@ public class MatrixDataSource extends AbsDataSource {
...
@@ -19,7 +17,7 @@ public class MatrixDataSource extends AbsDataSource {
private
String
dsName
;
private
String
dsName
;
public
MatrixDataSource
(){
public
MatrixDataSource
()
{
}
}
...
...
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/bean/MatrixDynamicDataSource.java
View file @
fff260bb
...
@@ -4,10 +4,8 @@ import com.secoo.mall.datasource.holder.DataSourceContextHolder;
...
@@ -4,10 +4,8 @@ import com.secoo.mall.datasource.holder.DataSourceContextHolder;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
javax.sql.DataSource
;
import
javax.sql.DataSource
;
import
java.lang.reflect.Method
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 此数据源为支持@selectDataSource注解的多数据源使用
* 此数据源为支持@selectDataSource注解的多数据源使用
...
...
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/config/MatrixDataSourceConfig.java
View file @
fff260bb
...
@@ -2,8 +2,6 @@ package com.secoo.mall.datasource.config;
...
@@ -2,8 +2,6 @@ package com.secoo.mall.datasource.config;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.Properties
;
@Data
@Data
public
class
MatrixDataSourceConfig
implements
DataSourceConfig
{
public
class
MatrixDataSourceConfig
implements
DataSourceConfig
{
...
...
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/properties/MatrixDataSourceProperties.java
View file @
fff260bb
...
@@ -8,7 +8,6 @@ public class MatrixDataSourceProperties extends MatrixDataSourceConfig {
...
@@ -8,7 +8,6 @@ public class MatrixDataSourceProperties extends MatrixDataSourceConfig {
public
static
final
String
PREFIX
=
"spring.datasource.matrix"
;
public
static
final
String
PREFIX
=
"spring.datasource.matrix"
;
public
MatrixDataSourceProperties
()
{
public
MatrixDataSourceProperties
()
{
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment