Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -95,18 +95,22 @@ spec:
           value: "1"
           value: "1"
         - name: ERROR_BASE_CODE_MULTIPLE
         - name: ERROR_BASE_CODE_MULTIPLE
           value: "1000"
           value: "1000"
+        - name: ENABLE_KAFKA_LOG
+          value: "true"
         - name: HTTP_PORT
         - name: HTTP_PORT
           value: "8082"
           value: "8082"
-        - name: REDIS_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: suplus-config
-              key: redis.ip
-        - name: REDIS_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: suplus-config
-              key: redis.port
+        - name: ALLIED_CREATION_USER_HOST
+          value: "http://allied-creation-user-dev.fjmaimaimai.com"
+#        - name: REDIS_HOST
+#          valueFrom:
+#            configMapKeyRef:
+#              name: suplus-config
+#              key: redis.ip
+#        - name: REDIS_PORT
+#          valueFrom:
+#            configMapKeyRef:
+#              name: suplus-config
+#              key: redis.port
       volumes:
       volumes:
       - name: accesslogs
       - name: accesslogs
         emptyDir: {}
         emptyDir: {}

@@ -2,7 +2,11 @@ package main
 
 
 import (
 import (
 	"github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web"
+	"github.com/linmadan/egglib-go/log/logrus"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/constant"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/cache"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/cache"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/log"
+	_ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/log"
 	_ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/port/beego"
 	_ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/port/beego"
 )
 )
 
 
@@ -11,5 +15,9 @@ func init() {
 }
 }
 
 
 func main() {
 func main() {
+	if constant.ENABLE_KAFKA_LOG {
+		w, _ := logrus.NewKafkaWriter(constant.KAFKA_HOST, constant.TOPIC_LOG_STASH, false)
+		log.Logger.AddHook(w)
+	}
 	web.Run()
 	web.Run()
 }
 }

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strconv"
 )
 )
 
 
-const SERVICE_NAME = "project"
+const SERVICE_NAME = "gateway"
 
 
 var LOG_LEVEL = "debug"
 var LOG_LEVEL = "debug"
 
 

+package constant
+
+import "os"
+
+var (
+	// kafka 地址
+	KAFKA_HOST = "192.168.0.250:9092,192.168.0.251:9092,192.168.0.252:9092"
+	// kafka  topic log stash
+	TOPIC_LOG_STASH = "go_stash_dev"
+	// 是否启用日志收集 （本地不启用）
+	ENABLE_KAFKA_LOG = false
+)
+
+func init() {
+	//if os.Getenv("KAFKA_HOST") != "" {
+	//	POSTGRESQL_HOST = os.Getenv("KAFKA_HOST")
+	//}
+	//if os.Getenv("TOPIC_LOG_STASH") != "" {
+	//	POSTGRESQL_PORT = os.Getenv("TOPIC_LOG_STASH")
+	//}
+	if os.Getenv("ENABLE_KAFKA_LOG") != "" {
+		ENABLE_KAFKA_LOG = true
+	}
+}