From d9ac35b0da60300f552abbf13c0932063bea9ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 29 Jan 2021 07:40:29 +0800
Subject: [PATCH] commit

---
 dsSso/Dao/DaoAppBase/DaoAppBase.go | 14 ++++++++++++++
 dsSso/main.go                      | 22 +++-------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/dsSso/Dao/DaoAppBase/DaoAppBase.go b/dsSso/Dao/DaoAppBase/DaoAppBase.go
index ab3c66d8..ce6d53ba 100644
--- a/dsSso/Dao/DaoAppBase/DaoAppBase.go
+++ b/dsSso/Dao/DaoAppBase/DaoAppBase.go
@@ -1,9 +1,11 @@
 package DaoAppBase
 
 import (
+	"dsSso/Const/ErrorConst"
 	"dsSso/Dao/DaoCache"
 	"dsSso/Model"
 	"dsSso/Utils/DbUtil"
+	"dsSso/Utils/LogUtil"
 )
 
 var joinModel Model.Selector
@@ -34,6 +36,18 @@ func GetAppBaseList(page int, limit int, keyword string) ([]map[string]interface
 	return list, count
 }
 
+/**
+功能：从数据库中获取，不走缓存，用于更新缓存和初始化
+*/
+func GetAppBaseListFromDb() ([]map[string]interface{}, error) {
+	baseSql := "select * from t_app_base where b_use=1"
+	list, err := db.SQL(baseSql).Query().List()
+	if err != nil {
+		LogUtil.Error(ErrorConst.SqlQueryError, err.Error())
+	}
+	return list, err
+}
+
 /**
 功能：根据appId获取接入第三方统一认证系统的信息
 作者：吴缤
diff --git a/dsSso/main.go b/dsSso/main.go
index 55c34ea7..637f0dcb 100644
--- a/dsSso/main.go
+++ b/dsSso/main.go
@@ -1,16 +1,14 @@
 package main
 
 import (
-	"dsSso/Const/ErrorConst"
 	c "dsSso/Controller"
+	"dsSso/Dao/DaoAppBase"
 	"dsSso/Handler"
 	"dsSso/Middleware"
-	"dsSso/Service/ServiceJoinApp"
 	"dsSso/Utils"
 	"dsSso/Utils/ConfigUtil"
 	"dsSso/Utils/DbUtil"
 	"dsSso/Utils/FileUtil"
-	"dsSso/Utils/LogUtil"
 	"dsSso/Utils/RedisStorage"
 	"dsSso/Utils/RedisUtil"
 	"fmt"
@@ -32,16 +30,6 @@ var db = DbUtil.Engine
 时间：2020-03-25
 */
 func startOAuth2Server() {
-	//清除系统的缓存
-	baseSql := "select app_id from t_app_base where b_use=1"
-	list, err := db.SQL(baseSql).Query().List()
-	if err != nil {
-		LogUtil.Error(ErrorConst.SqlQueryError, err.Error())
-	}
-	for i := 0; i < len(list); i++ {
-		RedisUtil.DEL("TAppBase:" + list[i]["app_id"].(string))
-	}
-
 	//声明OAuth2的Redis存储器
 	RedisStorage.OAuth2RedisStorage = &RedisStorage.RedisStorage{
 		Pool:      RedisUtil.Pool,
@@ -55,7 +43,7 @@ func startOAuth2Server() {
 	RedisStorage.OsinServer = osin.NewServer(cfg, RedisStorage.OAuth2RedisStorage)
 
 	//这里需要循环从数据库中获取数据
-	list, _ = ServiceJoinApp.GetAppBaseList(1, 1000, "")
+	list, _ := DaoAppBase.GetAppBaseListFromDb()
 	for i := 0; i < len(list); i++ {
 		appKey := list[i]["access_key"].(string)
 		secret := list[i]["secret_key"].(string)
@@ -106,11 +94,7 @@ func main() {
 
 //每隔一分钟，对redis中的app接入系统数据进行重新加载
 func SyncAppRedis() {
-	baseSql := "select * from t_app_base where b_use=1"
-	list, err := db.SQL(baseSql).Query().List()
-	if err != nil {
-		LogUtil.Error(ErrorConst.SqlQueryError, err.Error())
-	}
+	list, _ := DaoAppBase.GetAppBaseListFromDb()
 	for i := 0; i < len(list); i++ {
 		appKey := list[i]["access_key"].(string)
 		secret := list[i]["secret_key"].(string)