fix: namespace bug and polygate configmap

quanxiang-cloud · May 5, 2022 · 2cb7f8d · 2cb7f8d
1 parent 5e0f7eb
commit 2cb7f8d
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 166 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/api/restful/restful.go b/api/restful/restful.go
@@ -2,7 +2,6 @@ package restful
 
 import (
 	"github.com/gin-gonic/gin"
-	"git.internal.yunify.com/qxp/misc/logger"
 )
 type Router struct {
 	engine *gin.Engine
@@ -13,8 +12,7 @@ func newRouter() (*gin.Engine, error) {
 	gin.SetMode(gin.ReleaseMode)
 	engine := gin.New()
 
-	engine.Use(logger.GinLogger(),
-		logger.GinRecovery())
+	engine.Use()
 
 	return engine, nil
 }

diff --git a/deployment/quanxiang_charts/entrepot/templates/configmap.yaml b/deployment/quanxiang_charts/entrepot/templates/configmap.yaml
@@ -2,7 +2,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: entrepot
-  namespace: lowcode
+  namespace: {{ .Values.namespace }}
   annotations:
     kubesphere.io/creator: zhenlinding
 data:

diff --git a/deployment/quanxiang_charts/message/templates/configmap.yaml b/deployment/quanxiang_charts/message/templates/configmap.yaml
@@ -2,7 +2,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: message
-  namespace: lowcode
+  namespace: {{ .Values.namespace }}
   annotations:
     kubesphere.io/creator: zhenlinding
 data:

diff --git a/deployment/quanxiang_charts/persona/templates/configmap.yaml b/deployment/quanxiang_charts/persona/templates/configmap.yaml
@@ -2,7 +2,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: persona
-  namespace: lowcode
+  namespace: {{ .Values.namespace }}
   annotations:
     kubesphere.io/creator: zhenlinding
 data:

diff --git a/deployment/quanxiang_charts/polygate/templates/configmap.yaml b/deployment/quanxiang_charts/polygate/templates/configmap.yaml
@@ -2,7 +2,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: polygate
-  namespace: lowcode
+  namespace: {{ .Values.namespace }}
   annotations:
     kubesphere.io/creator: zhenlinding
 data:
@@ -63,20 +63,17 @@ data:
 
     apiFilter:
       white:
-        - /api/v1/oauth2c/login
-        - /api/v1/oauth2c/in/refresh
-        - /api/v1/org/login/code
-        - /api/v1/org/forget/code
-        - /api/v1/nurturing/userForgetResetPWD
+        - /api/v1/warden/login
+        - /api/v1/warden/auth
+        - /api/v1/warden/refresh
+        - /api/v1/warden/org/h/account/forget/reset
+        - /api/v1/org/h/account/login/code
+        - /api/v1/org/h/account/forget/code
+        - /api/v1/org/h/account/user/forget
+        - /api/v1/org/h/user/register
+        - /api/v1/org/h/account/register/code
         - /api/v1/message/ws
         - /api/v1/message/ws/
-        - /api/v1/oauth2s/jwt/login
-        - /api/v1/oauth2s/jwt/refresh
-        - /api/v1/oauth2s/jwt/auth
-        - /api/v1/jwt/login
-        - /api/v1/jwt/auth
-        - /api/v1/jwt/refresh
-        - /api/v1/fileserver/domain
       black:
 
     #  -------------------- log --------------------
@@ -100,3 +97,4 @@ data:
       {{- end }}
       username: {{ .Values.config.redis.username }}
       password: {{ .Values.config.redis.password }}
+
diff --git a/deployment/quanxiang_charts/transaction/templates/configmap.yaml b/deployment/quanxiang_charts/transaction/templates/configmap.yaml
@@ -2,7 +2,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: transaction
-  namespace: lowcode
+  namespace: {{ .Values.namespace }}
   annotations:
     kubesphere.io/creator: zhenlinding
 data:

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module quanxiang
 go 1.16
 
 require (
-	git.internal.yunify.com/qxp/misc v0.0.0-20211222120821-aade7ddbc0bb
 	github.com/containerd/containerd v1.6.2 // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
 	github.com/docker/docker v20.10.14+incompatible