移除全局配置workerId，datacenterId参数，推荐直接初始化identifierGenerator

mybatis-plus-boot-starter/src/main/java/com/baomidou/mybatisplus/autoconfigure/IdentifierGeneratorAutoConfiguration.java

@@ -15,7 +15,6 @@
  */
 package com.baomidou.mybatisplus.autoconfigure;
 
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -34,32 +33,10 @@ import org.springframework.context.annotation.Lazy;
 @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 public class IdentifierGeneratorAutoConfiguration {
 
-    @Configuration(proxyBeanMethods = false)
+    @Bean
     @ConditionalOnClass(InetUtils.class)
-    public static class InetUtilsAutoConfig {
-
-        private final InetUtils inetUtils;
-
-        private final MybatisPlusProperties properties;
-
-        public InetUtilsAutoConfig(InetUtils inetUtils, MybatisPlusProperties properties) {
-            this.inetUtils = inetUtils;
-            this.properties = properties;
-        }
-
-        @Bean
-        @ConditionalOnMissingBean
-        public IdentifierGenerator identifierGenerator() {
-            GlobalConfig globalConfig = properties.getGlobalConfig();
-            Long workerId = globalConfig.getWorkerId();
-            Long datacenterId = globalConfig.getDatacenterId();
-            if (workerId != null && datacenterId != null) {
-                return new DefaultIdentifierGenerator(workerId, datacenterId);
-            } else {
-                return new DefaultIdentifierGenerator(inetUtils.findFirstNonLoopbackAddress());
-            }
-        }
-
+    @ConditionalOnMissingBean
+    public IdentifierGenerator identifierGenerator(InetUtils inetUtils) {
+        return new DefaultIdentifierGenerator(inetUtils.findFirstNonLoopbackAddress());
     }
-
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisSqlSessionFactoryBuilder.java

@@ -81,18 +81,14 @@ public class MybatisSqlSessionFactoryBuilder extends SqlSessionFactoryBuilder {
     @Override
     public SqlSessionFactory build(Configuration configuration) {
         GlobalConfig globalConfig = GlobalConfigUtils.getGlobalConfig(configuration);
+
         final IdentifierGenerator identifierGenerator;
-        if (globalConfig.getIdentifierGenerator() == null) {
-            if (null != globalConfig.getWorkerId() && null != globalConfig.getDatacenterId()) {
-                identifierGenerator = new DefaultIdentifierGenerator(globalConfig.getWorkerId(), globalConfig.getDatacenterId());
-            } else {
-                identifierGenerator = new DefaultIdentifierGenerator();
-            }
+        if (null == globalConfig.getIdentifierGenerator()) {
+            identifierGenerator = new DefaultIdentifierGenerator();
             globalConfig.setIdentifierGenerator(identifierGenerator);
         } else {
             identifierGenerator = globalConfig.getIdentifierGenerator();
         }
-        //TODO 这里只是为了兼容下,并没多大重要,方法标记过时了.
         IdWorker.setIdentifierGenerator(identifierGenerator);
 
         if (globalConfig.isEnableSqlRunner()) {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/GlobalConfig.java

@@ -43,27 +43,10 @@ import java.util.concurrent.ConcurrentSkipListSet;
 @Accessors(chain = true)
 @SuppressWarnings("serial")
 public class GlobalConfig implements Serializable {
-
     /**
      * 是否开启 LOGO
      */
     private boolean banner = true;
-    /**
-     * 机器 ID 部分
-     *
-     * @see #setIdentifierGenerator(IdentifierGenerator)
-     * @deprecated 3.3.0
-     */
-    @Deprecated
-    private Long workerId;
-    /**
-     * 数据标识 ID 部分
-     *
-     * @see #setIdentifierGenerator(IdentifierGenerator)
-     * @deprecated 3.3.0
-     */
-    @Deprecated
-    private Long datacenterId;
     /**
      * 是否初始化 SqlRunner
      */

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/incrementer/DefaultIdentifierGenerator.java

@@ -27,16 +27,10 @@ import java.net.InetAddress;
  * @since 3.3.0
  */
 public class DefaultIdentifierGenerator implements IdentifierGenerator {
-
     private final Sequence sequence;
 
-    /**
-     * @see #DefaultIdentifierGenerator(InetAddress)
-     * @deprecated 3.4.3
-     */
-    @Deprecated
     public DefaultIdentifierGenerator() {
-        this.sequence = new Sequence();
+        this.sequence = new Sequence(null);
     }
 
     public DefaultIdentifierGenerator(InetAddress inetAddress) {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/Sequence.java

@@ -76,15 +76,6 @@ public class Sequence {
      */
     private InetAddress inetAddress;
 
-    /**
-     * @deprecated 3.4.3
-     */
-    @Deprecated
-    public Sequence() {
-        this.datacenterId = getDatacenterId(maxDatacenterId);
-        this.workerId = getMaxWorkerId(datacenterId, maxWorkerId);
-    }
-
     public Sequence(InetAddress inetAddress) {
         this.inetAddress = inetAddress;
         this.datacenterId = getDatacenterId(maxDatacenterId);