From 655665d48bbfc692ca020069a27ed9f5e30781b5 Mon Sep 17 00:00:00 2001
From: fusikai <fusikai@douyu.tv>
Date: Fri, 21 Apr 2023 16:32:28 +0800
Subject: [PATCH 1/2] fix

---
 internal/pkg/service/casbin/casbin.go  | 1 -
 internal/pkg/service/casbin/model.conf | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/internal/pkg/service/casbin/casbin.go b/internal/pkg/service/casbin/casbin.go
index eb4f93b5d..eccb00588 100644
--- a/internal/pkg/service/casbin/casbin.go
+++ b/internal/pkg/service/casbin/casbin.go
@@ -117,7 +117,6 @@ func (c *CasbinService) CheckPermission(sub, object, action string, policyType d
 	if !c.enabled {
 		return true, nil
 	}
-
 	ok, err = c.Enforce(sub, object, action, string(policyType))
 	if err != nil {
 		log.Errorf("CasbinService.CheckUserPermission: %s", err.Error())
diff --git a/internal/pkg/service/casbin/model.conf b/internal/pkg/service/casbin/model.conf
index 1352867c5..6d69cc506 100644
--- a/internal/pkg/service/casbin/model.conf
+++ b/internal/pkg/service/casbin/model.conf
@@ -13,7 +13,7 @@ g3 = _, _ # app group
 e = some(where (p.eft == allow))
 
 [matchers]
-m = g(r.sub, "group_user:admin") || g(r.sub, "group_user:default") || \
+m = g(r.sub, "group_user:admin") || \
     ( g(r.sub, p.sub) && r.type == p.type && r.act == p.act \
     && (\
         (r.type == "menu" && g2(r.obj, p.obj)) \

From d2f7d362fd3588896da94f19859fa4f57fc20447 Mon Sep 17 00:00:00 2001
From: fusikai <fusikai@douyu.tv>
Date: Sun, 23 Apr 2023 09:51:12 +0800
Subject: [PATCH 2/2] parse dep log level adjust

---
 internal/pkg/service/appDep/app_dep.go | 4 ++--
 internal/pkg/service/k8s/pod.go        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/internal/pkg/service/appDep/app_dep.go b/internal/pkg/service/appDep/app_dep.go
index 183eb0b2b..f722a58ed 100644
--- a/internal/pkg/service/appDep/app_dep.go
+++ b/internal/pkg/service/appDep/app_dep.go
@@ -22,7 +22,7 @@ const (
 	Url_Gitlab = "/api/v4/projects/%d/repository/files/%s?ref=%s"
 )
 
-//DepApp ..
+// DepApp ..
 type DepApp interface {
 	ParseDepFile(app db.AppInfo) ([]*db.AppPackage, error) // 获取依赖文件内容并解析
 	SaveToMysql(aid int, records []*db.AppPackage) error   // 解析结果存储到mysql
@@ -63,7 +63,7 @@ func (p *appDep) SyncAppVersion() error {
 
 		appPackages, err := depApp.ParseDepFile(app)
 		if err != nil {
-			xlog.Error("ParseDepFile", zap.Error(err), zap.String("appName", app.AppName))
+			xlog.Warn("ParseDepFile", zap.Error(err), zap.String("appName", app.AppName))
 		} else {
 			xlog.Info("ParseDepFile success", zap.String("appName", app.AppName))
 		}
diff --git a/internal/pkg/service/k8s/pod.go b/internal/pkg/service/k8s/pod.go
index 02eabc25d..a4eb995e2 100644
--- a/internal/pkg/service/k8s/pod.go
+++ b/internal/pkg/service/k8s/pod.go
@@ -516,6 +516,7 @@ func (i *syncPod) mysqlCreateOrUpdate(zoneCode, domain string, in *v1.Pod) (err
 		}
 		return
 	}
+
 	// 数据库中不存在对应记录进行insert操作，或者历史配置被删除了，目前只有日志记录存档
 	err = i.db.Save(&m).Error
 	if err != nil {