Merge remote-tracking branch 'origin/master'

Author: hengboy

api-boot-samples/api-boot-sample-http-converter/src/main/java/org/minbox/framework/api/boot/sample/DateUtils.java

@@ -0,0 +1,43 @@
+package org.minbox.framework.api.boot.sample;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * Description: 时间工具类
+ *
+ * @author leo
+ * CreateTime: 2019-08-09 09:04
+ */
+public class DateUtils {
+
+    /**
+     * 获取传入日期当天的开始时间 00:00:00
+     *
+     * @param date 传入日期
+     * @return
+     */
+    public static Date getStartTime(Date date) {
+        Calendar dateStart = Calendar.getInstance();
+        dateStart.setTime(date);
+        dateStart.set(Calendar.HOUR_OF_DAY, 0);
+        dateStart.set(Calendar.MINUTE, 0);
+        dateStart.set(Calendar.SECOND, 0);
+        return dateStart.getTime();
+    }
+
+    /**
+     * 获取传入日期当天的结束时间 23:59:59
+     *
+     * @param date
+     * @return
+     */
+    public static Date getEndTime(Date date) {
+        Calendar dateEnd = Calendar.getInstance();
+        dateEnd.setTime(date);
+        dateEnd.set(Calendar.HOUR_OF_DAY, 23);
+        dateEnd.set(Calendar.MINUTE, 59);
+        dateEnd.set(Calendar.SECOND, 59);
+        return dateEnd.getTime();
+    }
+}

api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/java/org/minbox/framework/api/boot/sample/PhoneCodeOauthTokenGranter.java

@@ -45,6 +45,7 @@ public class PhoneCodeOauthTokenGranter implements ApiBootOauthTokenGranter {
      * logger instance
      */
     static Logger logger = LoggerFactory.getLogger(PhoneCodeOauthTokenGranter.class);
+
     /**
      * 获取Token时使用grant_type=phone_code授权方式
      */

api-boot-samples/api-boot-sample-swagger/src/main/java/org/minbox/framework/api/boot/sample/SampleController.java

@@ -25,7 +25,7 @@ public class SampleController {
      * 简单swagger文档示例
      *
      * @param userName 用户名
-     * @return
+     * @return @{link ApiBootResult} ApiBootResult
      */
     @GetMapping(value = "/echo")
     @ApiOperation(value = "输出用户名", response = ApiBootResult.class)