Feature/spring boot starter dailysegment

README_CN.md

@@ -16,6 +16,56 @@ Leaf 最早期需求是各个业务线的订单ID生成需求。在美团早期
 
 ## Quick Start
 
+### 使用leaf-starter注解来启动leaf
+
+```shell script
+git clone git@github.com:Meituan-Dianping/Leaf.git
+git checkout feature/spring-boot-starter
+cd leaf
+mvn clean install -Dmaven.test.skip=true 
+```
+#### 引入依赖
+```xml
+<dependency>
+	<artifactId>leaf-boot-starter</artifactId>
+    <groupId>com.sankuai.inf.leaf</groupId>
+    <version>1.0.1-RELEASE</version>
+</dependency>
+```
+#### 配置leaf.properties到你的classpath下面
+```properties
+leaf.name=com.sankuai.leaf.opensource.test
+leaf.segment.enable=false
+#leaf.segment.url=
+#leaf.segment.username=
+#leaf.segment.password=
+
+leaf.snowflake.enable=false
+#leaf.snowflake.address=
+#leaf.snowflake.port=
+```
+#### 利用注解启动leaf，并使用api
+```java
+//EnableLeafServer 开启leafserver
+@SpringBootApplication
+@EnableLeafServer
+public class LeafdemoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(LeafdemoApplication.class, args);
+	}
+}
+//直接使用 spring注入
+public class T {
+    @Autowired
+    private SegmentService segmentService;
+    @Autowired
+    private SnowflakeService snowflakeService;
+}
+```
+
+TIPS:后续会将jar包上传的maven仓库
+
 ### 使用注解启动leaf
 https://github.com/Meituan-Dianping/Leaf/blob/feature/spring-boot-starter/README_CN.md
 

daily_leaf.md

@@ -0,0 +1,48 @@
+```sql
+
+CREATE TABLE `leaf_alloc`
+(
+    `biz_tag`     varchar(128) NOT NULL DEFAULT '',
+    `max_id`      bigint(20) NOT NULL DEFAULT '1',
+    `step`        int(11) NOT NULL,
+    `description` varchar(256)          DEFAULT NULL,
+    `update_time` timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    PRIMARY KEY (`biz_tag`)
+) ENGINE=InnoDB;
+
+```
+
+
+```sql
+
+CREATE TABLE `daily_leaf_alloc`
+(
+    `biz_tag`     varchar(128) NOT NULL DEFAULT '',
+    `max_id`      bigint(20) NOT NULL DEFAULT '1',
+    `step`        int(11) NOT NULL,
+    `description` varchar(256)          DEFAULT NULL,
+    `update_time` timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    PRIMARY KEY (`biz_tag`)
+) ENGINE=InnoDB;
+
+```
+
+```sql
+
+
+INSERT INTO daily_leaf_alloc (
+	biz_tag,
+	max_id,
+	step,
+	description
+)
+VALUES
+	(
+		'TEST',
+		1,
+		2000,
+		'Test leaf Segment Mode Get Id'
+	)
+
+
+```

leaf-core/pom.xml

@@ -4,15 +4,15 @@
     <parent>
         <groupId>com.sankuai.inf.leaf</groupId>
         <artifactId>leaf-parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.1-RELEASE</version>
     </parent>
     <groupId>com.sankuai.inf.leaf</groupId>
     <artifactId>leaf-core</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.1</version>
+    <version>1.0.1-RELEASE</version>
     <name>leaf-core</name>
     <properties>
-        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
+<!--        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>-->
         <commons-io.version>2.4</commons-io.version>
         <log4j.version>2.7</log4j.version>
         <mybatis-spring.version>1.2.5</mybatis-spring.version>
@@ -73,7 +73,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
@@ -104,12 +103,31 @@
             <artifactId>mybatis-spring</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>16.0.1</version>
+        </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

leaf-server/src/main/java/com/sankuai/inf/leaf/server/Constants.java → leaf-core/src/main/java/com/sankuai/inf/leaf/Constants.java

@@ -1,4 +1,4 @@
-package com.sankuai.inf.leaf.server;
+package com.sankuai.inf.leaf;
 
 public class Constants {
     public static final String LEAF_SEGMENT_ENABLE = "leaf.segment.enable";

leaf-core/src/main/java/com/sankuai/inf/leaf/common/DateUtils.java

@@ -0,0 +1,32 @@
+package com.sankuai.inf.leaf.common;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/***
+ *
+ *
+ * @author <a href="mailto:1934849492@qq.com">Darian</a> 
+ * @date 2021/7/1  21:56
+ */
+public class DateUtils {
+
+    public static String formatyyyyMMdd(Date date) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        return simpleDateFormat.format(date);
+    }
+
+    /**
+     * 在输入日期上增加（+）或减去（-）天数
+     *
+     * @param date 输入日期
+     * @param days 要增加或减少的天数
+     */
+    public static Date addDay(Date date, int days) {
+        Calendar cd = Calendar.getInstance();
+        cd.setTime(date);
+        cd.add(Calendar.DAY_OF_MONTH, days);
+        return cd.getTime();
+    }
+}

leaf-core/src/main/java/com/sankuai/inf/leaf/common/ListUtils.java

@@ -0,0 +1,52 @@
+package com.sankuai.inf.leaf.common;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/***
+ *
+ *
+ * @author <a href="mailto:1934849492@qq.com">Darian</a> 
+ * @date 2021/7/1  22:27
+ */
+public class ListUtils {
+
+    /**
+     * 将数据按照固定大小进行切割
+     *
+     * @param stringList
+     * @param maxSend
+     * @return
+     */
+    public static List<List<String>> splitList(List<String> stringList, Integer maxSend) {
+        int limit = countStep(stringList.size(), maxSend);
+        return Stream.iterate(0, n -> n + 1)
+                .limit(limit)
+                .parallel()
+                .map(a -> stringList.stream()
+                        .skip(a * maxSend)
+                        .limit(maxSend)
+                        .parallel()
+                        .collect(Collectors.toList()))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 计算切分次数
+     */
+    private static Integer countStep(Integer size, Integer maxSend) {
+        return (size + maxSend - 1) / maxSend;
+    }
+
+    public static void main(String[] args) {
+        List<String> strings = Arrays.asList("a", "c", "b", "a");
+        System.out.println(splitList(strings, 1));
+        System.out.println();
+        System.out.println(splitList(strings, 2));
+        System.out.println();
+        System.out.println(splitList(strings, 3));
+    }
+
+}

leaf-core/src/main/java/com/sankuai/inf/leaf/common/PropertyFactory.java

@@ -1,22 +1,8 @@
 package com.sankuai.inf.leaf.common;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Properties;
-
 public class PropertyFactory {
-    private static final Logger logger = LoggerFactory.getLogger(PropertyFactory.class);
-    private static final Properties prop = new Properties();
-    static {
-        try {
-            prop.load(PropertyFactory.class.getClassLoader().getResourceAsStream("leaf.properties"));
-        } catch (IOException e) {
-            logger.warn("Load Properties Ex", e);
-        }
-    }
-    public static Properties getProperties() {
-        return prop;
+    public static String leafname;
+    public static void setLeafName(String leafName){
+        PropertyFactory.leafname=leafName;
     }
 }

leaf-server/src/main/java/com/sankuai/inf/leaf/server/exception/InitException.java → leaf-core/src/main/java/com/sankuai/inf/leaf/exception/InitException.java

@@ -1,4 +1,4 @@
-package com.sankuai.inf.leaf.server.exception;
+package com.sankuai.inf.leaf.exception;
 
 public class InitException extends Exception{
     public InitException(String msg) {