Merge pull request '调整代码部分代码结构，优化docker脚本' (#97) from baladiwei/gitlink-notification-system:master into master

common/src/main/java/cn/org/gitlink/notification/common/config/KafkaProducerConfig.java

@@ -1,4 +1,4 @@
-package cn.org.gitlink.notification.common.utils;
+package cn.org.gitlink.notification.common.config;
 
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringSerializer;
@@ -19,9 +19,6 @@ public class KafkaProducerConfig {
     @Value("${spring.kafka.producer.bootstrap_servers:#{null}}")
     private String bootstrapServers;
 
-    @Value("${spring.kafka.producer.client_id:#{null}}")
-    private String clientId;
-
     @Value("${spring.kafka.producer.retries:#{null}}")
     private Integer retries;
 
@@ -30,7 +27,7 @@ public class KafkaProducerConfig {
 
     @Bean
     public KafkaTemplate<String, String> kafkaTemplate() {
-        return new KafkaTemplate<>(producerConfigs(),true);
+        return new KafkaTemplate<>(producerConfigs(), true);
     }
 
     @Bean
@@ -39,7 +36,6 @@ public class KafkaProducerConfig {
         props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
         props.put(ProducerConfig.RETRIES_CONFIG, retries);
         props.put(ProducerConfig.ACKS_CONFIG, "all");
-        props.put(ProducerConfig.CLIENT_ID_CONFIG, clientId);
         props.put(ProducerConfig.BATCH_SIZE_CONFIG, batchSize);
         props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
         props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);

executor/src/main/java/cn/org/gitlink/notification/executor/core/config/KafkaConsumerConfig.java

@@ -20,12 +20,6 @@ public class KafkaConsumerConfig {
     @Value("${spring.kafka.consumer.bootstrap_servers:#{null}}")
     private String servers;
 
-    @Value("${spring.kafka.consumer.group_id}")
-    private String groupId;
-
-    @Value("${spring.kafka.consumer.client_id}")
-    private String clientId;
-
     @Value("${spring.kafka.consumer.auto_offset_reset}")
     private String autoOffsetReset;
 
@@ -46,9 +40,7 @@ public class KafkaConsumerConfig {
     @Bean
     public ConsumerFactory<String, Object> consumerConfigs() {
         Map<String, Object> props = new HashMap<>();
-        props.put(ConsumerConfig.CLIENT_ID_CONFIG, clientId);
         props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, servers);
-        props.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
         props.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, maxPollRecords);
         props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, autoOffsetReset);
         props.put(ConsumerConfig.ALLOW_AUTO_CREATE_TOPICS_CONFIG, false);

executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java

@@ -3,10 +3,8 @@ package cn.org.gitlink.notification.executor.service.email;
 import cn.org.gitlink.notification.common.utils.EmailUtils;
 import cn.org.gitlink.notification.model.dao.entity.EmailJob;
 import cn.org.gitlink.notification.model.dao.entity.EmailSendRecord;
-import cn.org.gitlink.notification.model.dao.entity.vo.NewEmailJobVo;
 import cn.org.gitlink.notification.model.service.notification.EmailJobsService;
 import cn.org.gitlink.notification.model.service.notification.EmailSendRecordsService;
-import com.alibaba.fastjson.JSONObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +12,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.mail.MessagingException;
-import java.beans.Transient;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

executor/src/main/resources/application.yml.example

@@ -8,27 +8,23 @@ spring:
   kafka:
     producer:
       bootstrap_servers: kafka1:9092,kafka2:9092
-      client_id: gitlink_producer_01
       retries: 5
       batch_size: 16384
       replication_factor: 1
       partitions: 3
       topic_new_email_remind: topic-gitlink-new-email-remind
-
     consumer:
       bootstrap_servers: kafka1:9092,kafka2:9092
-      client_id: gitlink_consumer
       group_id: group-gitlink-notification
       group_id_email: group-gitlink-email
       group_id_new_email_remind: group-gitlink-new-email-remind
       auto_offset_reset: earliest
       max_poll_records: 100
+      enable-auto-commit: true
+      auto-commit-interval: 1S
       topic: topic-gitlink-notification
       topic_email: topic-gitlink-email
       topic_new_email_remind: topic-gitlink-new-email-remind
-      enable-auto-commit: true
-      auto-commit-interval: 1S
-
     listener:
       concurrency: 3
       ack-mode: record

reader/src/main/resources/application.yml.example

@@ -21,7 +21,6 @@ spring:
   kafka:
     producer:
       bootstrap_servers: kafka1:9092,kafka2:9092
-      client_id: gitlink_producer_01
       retries: 5
       batch_size: 16384
 

writer/src/main/resources/application.yml.example

@@ -8,7 +8,6 @@ spring:
   kafka:
     producer:
       bootstrap_servers: kafka1:9092,kafka2:9092
-      client_id: gitlink_producer_01
       retries: 5
       batch_size: 16384
       replication_factor: 1
@@ -28,7 +27,6 @@ spring:
       min-idle: 0
     timeout: 1000
 
-
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://mysql:3306/gitlink_notification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowMultiQueries=true&useSSL=false