修改实例化关系

yzg-util-db/src/main/java/com/yanzuoguang/dao/impl/BaseDaoSql.java

@@ -11,8 +11,11 @@ import com.yanzuoguang.util.helper.ArrayHelper;
 import com.yanzuoguang.util.helper.StringFormatHandle;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.*;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanInitializationException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.*;
 
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -22,7 +25,7 @@ import java.util.regex.Pattern;
  *
  * @author 颜佐光
  */
-public abstract class BaseDaoSql {
+public abstract class BaseDaoSql implements ApplicationContextAware {
 
     /**
      * SQL语句支持的最大长度
@@ -30,14 +33,14 @@ public abstract class BaseDaoSql {
     public static int MAX_LEVEL = 10;
 
     /**
-     * 定义列表记录缓存对象
+     * 数据库执行类
      */
-    protected MemoryCache cacheList = new MemoryCache(0);
+    private DbExecute db;
 
     /**
-     * 数据库执行类
+     * 定义列表记录缓存对象
      */
-    private DbExecute db;
+    protected MemoryCache cacheList = new MemoryCache(0);
 
     /**
      * 当前Dao的表结构SQL语句信息
@@ -69,7 +72,25 @@ public abstract class BaseDaoSql {
         this.init();
     }
 
-    @Resource
+    /**
+     * Set the ApplicationContext that this object runs in.
+     * Normally this call will be used to initialize the object.
+     * <p>Invoked after population of normal bean properties but before an init callback such
+     * as {@link InitializingBean#afterPropertiesSet()}
+     * or a custom init-method. Invoked after {@link ResourceLoaderAware#setResourceLoader},
+     * {@link ApplicationEventPublisherAware#setApplicationEventPublisher} and
+     * {@link MessageSourceAware}, if applicable.
+     *
+     * @param applicationContext the ApplicationContext object to be used by this object
+     * @throws ApplicationContextException in case of context initialization errors
+     * @throws BeansException              if thrown by application context methods
+     * @see BeanInitializationException
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.db = applicationContext.getBean(DbExecute.class);
+    }
+
     public void setDb(DbExecute db) {
         this.db = db;
     }

yzg-util-db/src/main/java/com/yanzuoguang/db/ConfigDb.java

 package com.yanzuoguang.db;
 
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-
 /**
  * 打印SQL日志
  *
@@ -33,10 +29,6 @@ public class ConfigDb {
     @Value("${yzg.row.name.type:0}")
     private int rowNameType;
 
-    @Resource
-    @Qualifier("jdbcTemplate")
-    private JdbcTemplate jdbc;
-
     public boolean isPrintMapper() {
         return printMapper;
     }
@@ -52,8 +44,4 @@ public class ConfigDb {
     public int getRowNameType() {
         return rowNameType;
     }
-
-    public JdbcTemplate getJdbc() {
-        return jdbc;
-    }
 }

yzg-util-db/src/main/java/com/yanzuoguang/db/impl/DbExecuteImpl.java

@@ -30,6 +30,8 @@ public class DbExecuteImpl implements DbExecute, ApplicationContextAware {
 
     private ConfigDb configDb;
 
+    private JdbcTemplate jdbc;
+
     /**
      * Set the ApplicationContext that this object runs in.
      * Normally this call will be used to initialize the object.
@@ -48,6 +50,11 @@ public class DbExecuteImpl implements DbExecute, ApplicationContextAware {
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         this.printSql = applicationContext.getBean(DbPrintSql.class);
         this.configDb = applicationContext.getBean(ConfigDb.class);
+        this.jdbc = applicationContext.getBean(JdbcTemplate.class);
+    }
+
+    public JdbcTemplate getJdbc() {
+        return jdbc;
     }
 
     /**
@@ -189,8 +196,4 @@ public class DbExecuteImpl implements DbExecute, ApplicationContextAware {
                 .replaceAll("((?i)GROUP\\s*?(?i)BY\\s*?)1\\s*?,", "$1")
                 .replaceAll("(?i)GROUP\\s*?(?i)BY\\s*?1\\s*?", "");
     }
-
-    private JdbcTemplate getJdbc() {
-        return configDb.getJdbc();
-    }
 }

yzg-util-mq/src/main/java/com/yanzuoguang/mq/base/MqConfigurable.java

@@ -8,11 +8,14 @@ import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.support.CorrelationData;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanInitializationException;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.context.*;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.nio.charset.Charset;
 
 /**
@@ -22,9 +25,8 @@ import java.nio.charset.Charset;
  */
 @Configurable
 @Component
-public class MqConfigurable implements RabbitTemplate.ConfirmCallback, RabbitTemplate.ReturnCallback {
+public class MqConfigurable implements RabbitTemplate.ConfirmCallback, RabbitTemplate.ReturnCallback, ApplicationContextAware {
 
-    @Resource
     private MessageService messageService;
 
     /**
@@ -49,6 +51,25 @@ public class MqConfigurable implements RabbitTemplate.ConfirmCallback, RabbitTem
         return new MyRabbitTemplate(rabbitTemplate);
     }
 
+    /**
+     * Set the ApplicationContext that this object runs in.
+     * Normally this call will be used to initialize the object.
+     * <p>Invoked after population of normal bean properties but before an init callback such
+     * as {@link InitializingBean#afterPropertiesSet()}
+     * or a custom init-method. Invoked after {@link ResourceLoaderAware#setResourceLoader},
+     * {@link ApplicationEventPublisherAware#setApplicationEventPublisher} and
+     * {@link MessageSourceAware}, if applicable.
+     *
+     * @param applicationContext the ApplicationContext object to be used by this object
+     * @throws ApplicationContextException in case of context initialization errors
+     * @throws BeansException              if thrown by application context methods
+     * @see BeanInitializationException
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.messageService = applicationContext.getBean(MessageService.class);
+    }
+
 
     /**
      * 确认是否发送成功

yzg-util-mq/src/main/java/com/yanzuoguang/mq/base/MqConsumeDynamic.java

@@ -7,23 +7,23 @@ import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanInitializationException;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.*;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-
 /**
  * MQ消费者通过代码初始化
  *
  * @author 颜佐光
  */
 @Component
-public class MqConsumeDynamic {
+public class MqConsumeDynamic implements ApplicationContextAware {
 
-    @Resource
     private ConnectionFactory connectionFactory;
 
-    @Resource
     private RabbitAdmin rabbitAdmin;
 
     @Value("${spring.rabbitmq.listener.simple.concurrency:1}")
@@ -35,6 +35,26 @@ public class MqConsumeDynamic {
     @Value("${spring.rabbitmq.listener.simple.transaction-size:100}")
     private int txSize;
 
+    /**
+     * Set the ApplicationContext that this object runs in.
+     * Normally this call will be used to initialize the object.
+     * <p>Invoked after population of normal bean properties but before an init callback such
+     * as {@link InitializingBean#afterPropertiesSet()}
+     * or a custom init-method. Invoked after {@link ResourceLoaderAware#setResourceLoader},
+     * {@link ApplicationEventPublisherAware#setApplicationEventPublisher} and
+     * {@link MessageSourceAware}, if applicable.
+     *
+     * @param applicationContext the ApplicationContext object to be used by this object
+     * @throws ApplicationContextException in case of context initialization errors
+     * @throws BeansException              if thrown by application context methods
+     * @see BeanInitializationException
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        connectionFactory = applicationContext.getBean(ConnectionFactory.class);
+        rabbitAdmin = applicationContext.getBean(RabbitAdmin.class);
+    }
+
     public SimpleMessageListenerContainer init(String queueName, ChannelAwareMessageListener messageListener) {
         return init(queueName, 0, messageListener);
     }