Merge branch 'hotfix/app-driver' into 'main'

修复应用多驱动时，鉴权失效多问题

See merge request goku/apinto!236

drivers/app/manager/app.go

@@ -97,15 +97,15 @@ func (a *AppData) All() []string {
 	a.locker.RLock()
 	defer a.locker.RUnlock()
 	idMap := make(map[string]bool)
-	
+
 	for _, v := range a.data {
 		for _, id := range v {
 			if _, ok := idMap[id]; !ok {
 				idMap[id] = true
 			}
 		}
 	}
-	
+
 	ids := make([]string, 0, len(idMap))
 	for key := range idMap {
 		ids = append(ids, key)

drivers/app/manager/manager.go

@@ -105,17 +105,21 @@ func (m *Manager) Set(app application.IApp, filters []application.IAuth, users m
 		}
 		idMap[filter.Driver()] = append(idMap[filter.Driver()], filter.ID())
 	}
+	idArr := make([]string, 0, len(idMap))
 	for driver, ids := range idMap {
-		old := m.appManager.GetByAppID(app.Id())
 		m.appManager.Set(app.Id(), driver, ids)
-		cs := compareArray(old, ids)
-		for id := range cs {
-			filter, has := m.Untyped.Get(id)
-			if has {
-				filter.Del(app.Id())
-				if filter.UserCount() == 0 {
-					m.Untyped.Del(id)
-				}
+		idArr = append(idArr, ids...)
+	}
+
+	// 比较新旧id，删除旧配置
+	old := m.appManager.GetByAppID(app.Id())
+	cs := compareArray(old, idArr)
+	for id := range cs {
+		filter, has := m.Untyped.Get(id)
+		if has {
+			filter.Del(app.Id())
+			if filter.UserCount() == 0 {
+				m.Untyped.Del(id)
 			}
 		}
 	}