|
|
@@ -126,7 +126,7 @@ func VerifyTimeLimitCode(data string, minutes int, code string) bool {
|
|
|
retCode := CreateTimeLimitCode(data, minutes, start)
|
|
|
if retCode == code && minutes > 0 {
|
|
|
// check time is expired or not
|
|
|
- before, _ := DateParse(start, "YmdHi")
|
|
|
+ before, _ := time.ParseInLocation("200601021504", start, time.Local)
|
|
|
now := time.Now()
|
|
|
if before.Add(time.Minute*time.Duration(minutes)).Unix() > now.Unix() {
|
|
|
return true
|
|
|
@@ -141,7 +141,7 @@ const TimeLimitCodeLength = 12 + 6 + 40
|
|
|
// create a time limit code
|
|
|
// code format: 12 length date time string + 6 minutes string + 40 sha1 encoded string
|
|
|
func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string {
|
|
|
- format := "YmdHi"
|
|
|
+ format := "200601021504"
|
|
|
|
|
|
var start, end time.Time
|
|
|
var startStr, endStr string
|
|
|
@@ -149,16 +149,16 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string
|
|
|
if startInf == nil {
|
|
|
// Use now time create code
|
|
|
start = time.Now()
|
|
|
- startStr = DateFormat(start, format)
|
|
|
+ startStr = start.Format(format)
|
|
|
} else {
|
|
|
// use start string create code
|
|
|
startStr = startInf.(string)
|
|
|
- start, _ = DateParse(startStr, format)
|
|
|
- startStr = DateFormat(start, format)
|
|
|
+ start, _ = time.ParseInLocation(format, startStr, time.Local)
|
|
|
+ startStr = start.Format(format)
|
|
|
}
|
|
|
|
|
|
end = start.Add(time.Minute * time.Duration(minutes))
|
|
|
- endStr = DateFormat(end, format)
|
|
|
+ endStr = end.Format(format)
|
|
|
|
|
|
// create sha1 encode string
|
|
|
sh := sha1.New()
|
|
|
@@ -420,58 +420,3 @@ func Subtract(left interface{}, right interface{}) interface{} {
|
|
|
return fleft + float64(rleft) - (fright + float64(rright))
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-// DateFormat pattern rules.
|
|
|
-var datePatterns = []string{
|
|
|
- // year
|
|
|
- "Y", "2006", // A full numeric representation of a year, 4 digits Examples: 1999 or 2003
|
|
|
- "y", "06", //A two digit representation of a year Examples: 99 or 03
|
|
|
-
|
|
|
- // month
|
|
|
- "m", "01", // Numeric representation of a month, with leading zeros 01 through 12
|
|
|
- "n", "1", // Numeric representation of a month, without leading zeros 1 through 12
|
|
|
- "M", "Jan", // A short textual representation of a month, three letters Jan through Dec
|
|
|
- "F", "January", // A full textual representation of a month, such as January or March January through December
|
|
|
-
|
|
|
- // day
|
|
|
- "d", "02", // Day of the month, 2 digits with leading zeros 01 to 31
|
|
|
- "j", "2", // Day of the month without leading zeros 1 to 31
|
|
|
-
|
|
|
- // week
|
|
|
- "D", "Mon", // A textual representation of a day, three letters Mon through Sun
|
|
|
- "l", "Monday", // A full textual representation of the day of the week Sunday through Saturday
|
|
|
-
|
|
|
- // time
|
|
|
- "g", "3", // 12-hour format of an hour without leading zeros 1 through 12
|
|
|
- "G", "15", // 24-hour format of an hour without leading zeros 0 through 23
|
|
|
- "h", "03", // 12-hour format of an hour with leading zeros 01 through 12
|
|
|
- "H", "15", // 24-hour format of an hour with leading zeros 00 through 23
|
|
|
-
|
|
|
- "a", "pm", // Lowercase Ante meridiem and Post meridiem am or pm
|
|
|
- "A", "PM", // Uppercase Ante meridiem and Post meridiem AM or PM
|
|
|
-
|
|
|
- "i", "04", // Minutes with leading zeros 00 to 59
|
|
|
- "s", "05", // Seconds, with leading zeros 00 through 59
|
|
|
-
|
|
|
- // time zone
|
|
|
- "T", "MST",
|
|
|
- "P", "-07:00",
|
|
|
- "O", "-0700",
|
|
|
-
|
|
|
- // RFC 2822
|
|
|
- "r", time.RFC1123Z,
|
|
|
-}
|
|
|
-
|
|
|
-// Parse Date use PHP time format.
|
|
|
-func DateParse(dateString, format string) (time.Time, error) {
|
|
|
- replacer := strings.NewReplacer(datePatterns...)
|
|
|
- format = replacer.Replace(format)
|
|
|
- return time.ParseInLocation(format, dateString, time.Local)
|
|
|
-}
|
|
|
-
|
|
|
-// Date takes a PHP like date func to Go's time format.
|
|
|
-func DateFormat(t time.Time, format string) string {
|
|
|
- replacer := strings.NewReplacer(datePatterns...)
|
|
|
- format = replacer.Replace(format)
|
|
|
- return t.Format(format)
|
|
|
-}
|
无闻