重构和修复命令行参数解析

Author: phpdragon

cmd/gateway-proxy/main.go

@@ -19,6 +19,8 @@ var (
 
 // 初始化方法
 func init() {
+	flag.Parse()
+
 	config.InitConf(*configPath, *debugMode)
 	config.NewLogger()
 	config.NewMySql()
@@ -28,14 +30,12 @@ func init() {
 }
 
 func main() {
-	flag.Parse()
-
 	appConfig := config.GetAppConfig()
 
 	httpServer := &server.HttpServer{
 		Server: &http.Server{
 			Addr:    fmt.Sprintf(":%d", appConfig.Server.Port),
-			Handler: router.Handler(),
+			Handler: router.WebHandler(),
 		},
 	}
 

internal/logic/limit/LimitLogic.go

@@ -34,7 +34,7 @@ func checkLimit(cacheKey string, limit int, intervalTime int) (int, bool) {
 		return 0, true
 	}
 
-	count, timeMillis := redis.GetAccessTotal(cacheKey)
+	count, timeMillis := redis.GetAccessTotalAndTimeMillis(cacheKey)
 
 	diffTime := date.GetCurrentTimeMillis() - timeMillis
 	intervalMillis := int64(intervalTime * 1000)

internal/logic/redis/RedisLogic.go

@@ -18,8 +18,8 @@ func GetAccessTotalCacheKey(routeId int, code string) string {
 	return fmt.Sprintf("%s:%s:%d", config.GetAppConfig().AppName, code, routeId)
 }
 
-// GetAccessTotal 访问数量增加一次
-func GetAccessTotal(cacheKey string) (int, int64) {
+// GetAccessTotalAndTimeMillis 获取访问总数和计数时间
+func GetAccessTotalAndTimeMillis(cacheKey string) (int, int64) {
 	cache, err := config.Redis().Get(cacheKey).Result()
 	if nil != err || 0 == len(cache) {
 		return 0, date.GetCurrentTimeMillis()

internal/router/Router.go

@@ -42,7 +42,7 @@ func buildRoutes() []routeInfo {
 	return routePath
 }
 
-func Handler() http.HandlerFunc {
+func WebHandler() http.HandlerFunc {
 	routePath := buildRoutes()
 	return func(rspWriter http.ResponseWriter, request *http.Request) {
 		for _, route := range routePath {