From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java
index 86caebf..f19401a 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessStrategy.java
@@ -1,8 +1,18 @@
 package com.vci.ubcs.ddl.processor.ddl;
 
 import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
+import com.vci.ubcs.ddl.mapper.DdlMSMapper;
+import com.vci.ubcs.ddl.mapper.DdlMySqlMapper;
+import com.vci.ubcs.ddl.mapper.DdlOracleMapper;
+import com.vci.ubcs.starter.util.VciSpringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -11,25 +21,31 @@
  * @author LiHang
  * @date 2023/4/24
  */
+@Component
+@DependsOn("vciSpringUtil")
 public class DdlMapperProcessStrategy {
 
 	@Value("${spring.datasource.driver-class-name}")
-	private static final String DATABASE_DRIVER = "";
+	private String DATABASE_DRIVER;
 
-	public static List<DdlMapperProcessor> processors = Lists.newArrayList();
+	private final static List<DdlMapperProcessor> PROCESSORS = Lists.newArrayList();
 
 	static {
-		processors.add(new DdlMsMapperProcessor());
-		processors.add(new DdlMySqlMapperProcessor());
-		processors.add(new DdlOracleMapperProcessor());
+		PROCESSORS.add(VciSpringUtil.getBean(DdlOracleMapperProcessor.class));
+		PROCESSORS.add(VciSpringUtil.getBean(DdlMySqlMapperProcessor.class));
+		PROCESSORS.add(VciSpringUtil.getBean(DdlMsMapperProcessor.class));
+		PROCESSORS.add(VciSpringUtil.getBean(DdlDmMapperProcessor.class));
 	}
 
-	public static DdlMapperProcessor getProcessor(){
-		for (DdlMapperProcessor processor : processors) {
+	@Bean("ddlMapper")
+	public  DdlMapperProcessor getProcessor(){
+		for (DdlMapperProcessor processor : PROCESSORS) {
 			if (processor.support(DATABASE_DRIVER)){
+				System.out.println("===========================================");
+				System.out.println("鑾峰彇DDL鎿嶄綔绫绘垚鍔燂細" + processor.getClass().getName());
 				return processor;
 			}
 		}
-		return DdlOracleMapperProcessor.SINGLE.INSTANCE;
+		return VciSpringUtil.getBean(DdlOracleMapperProcessor.class);
 	}
 }

--
Gitblit v1.9.3