Merge branch 'master' of 10.10.14.250:huanghai/dsMin

Logs/dsBaseRpc.log

@@ -52437,3 +52437,13 @@
 [Error]2020/11/27 14:19:45 SqlQueryError 	 WRONGTYPE Operation against a key holding the wrong kind of value
 [Error]2020/11/27 14:19:45 SqlQueryError 	 WRONGTYPE Operation against a key holding the wrong kind of value
 [Error]2020/11/27 14:19:45 SqlQueryError 	 WRONGTYPE Operation against a key holding the wrong kind of value
+[Error]2021/01/26 10:18:20 CreateRedisError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:18:29 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:18:30 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:18:31 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:18:41 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:18:42 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:18:43 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:19:05 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:19:06 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.
+[Error]2021/01/26 10:19:07 SqlQueryError 	 dial tcp 10.10.14.102:6379: connectex: No connection could be made because the target machine actively refused it.

Logs/dsSso.log

@@ -23,3 +23,16 @@
 [Error]2020/12/17 11:47:32 SqlQueryError 	 sql: expected 1 arguments, got 3
 [Error]2020/12/17 11:47:32 SqlQueryError 	 WRONGTYPE Operation against a key holding the wrong kind of value
 >>>>>>> 6920019c5ea5555520e96dc6a5d4efb7e9da5ef1
+[Error]2021/01/28 10:52:46 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 10:55:52 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 11:08:08 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 11:12:30 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 11:13:19 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 11:14:31 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 11:15:00 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 11:22:47 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 11:27:10 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 11:27:53 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 15:40:36 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 15:40:53 SqlQueryError 	 sql: expected 1 arguments, got 3
+[Error]2021/01/28 15:41:54 SqlQueryError 	 sql: expected 1 arguments, got 3

dsDataexV1.1/Config/Config.ini

@@ -28,11 +28,12 @@ expireTime = 86400
 ;expireTime = 86400
 
 [kafka]
-brokers = 10.10.14.237:9092,10.10.14.238:9092
+brokers = 10.10.14.238:9092,
 KafkaAccessLogTopic = log_dataex
 partition = 20
-replication = 2
+replication = 1
 process_no = 1
+enable = 1
 
 
 [elasticsearch]

dsDataexV1.1/Html/jquery.timers-1.2.js

@@ -0,0 +1,138 @@
+/**
+ * jQuery.timers - Timer abstractions for jQuery
+ * Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
+ * Licensed under the WTFPL (http://sam.zoy.org/wtfpl/).
+ * Date: 2009/10/16
+ *
+ * @author Blair Mitchelmore
+ * @version 1.2
+ *
+ **/
+
+jQuery.fn.extend({
+	everyTime: function(interval, label, fn, times) {
+		return this.each(function() {
+			jQuery.timer.add(this, interval, label, fn, times);
+		});
+	},
+	oneTime: function(interval, label, fn) {
+		return this.each(function() {
+			jQuery.timer.add(this, interval, label, fn, 1);
+		});
+	},
+	stopTime: function(label, fn) {
+		return this.each(function() {
+			jQuery.timer.remove(this, label, fn);
+		});
+	}
+});
+
+jQuery.extend({
+	timer: {
+		global: [],
+		guid: 1,
+		dataKey: "jQuery.timer",
+		regex: /^([0-9]+(?:\.[0-9]*)?)\s*(.*s)?$/,
+		powers: {
+			// Yeah this is major overkill...
+			'ms': 1,
+			'cs': 10,
+			'ds': 100,
+			's': 1000,
+			'das': 10000,
+			'hs': 100000,
+			'ks': 1000000
+		},
+		timeParse: function(value) {
+			if (value == undefined || value == null)
+				return null;
+			var result = this.regex.exec(jQuery.trim(value.toString()));
+			if (result[2]) {
+				var num = parseFloat(result[1]);
+				var mult = this.powers[result[2]] || 1;
+				return num * mult;
+			} else {
+				return value;
+			}
+		},
+		add: function(element, interval, label, fn, times) {
+			var counter = 0;
+			
+			if (jQuery.isFunction(label)) {
+				if (!times) 
+					times = fn;
+				fn = label;
+				label = interval;
+			}
+			
+			interval = jQuery.timer.timeParse(interval);
+
+			if (typeof interval != 'number' || isNaN(interval) || interval < 0)
+				return;
+
+			if (typeof times != 'number' || isNaN(times) || times < 0) 
+				times = 0;
+			
+			times = times || 0;
+			
+			var timers = jQuery.data(element, this.dataKey) || jQuery.data(element, this.dataKey, {});
+			
+			if (!timers[label])
+				timers[label] = {};
+			
+			fn.timerID = fn.timerID || this.guid++;
+			
+			var handler = function() {
+				if ((++counter > times && times !== 0) || fn.call(element, counter) === false)
+					jQuery.timer.remove(element, label, fn);
+			};
+			
+			handler.timerID = fn.timerID;
+			
+			if (!timers[label][fn.timerID])
+				timers[label][fn.timerID] = window.setInterval(handler,interval);
+			
+			this.global.push( element );
+			
+		},
+		remove: function(element, label, fn) {
+			var timers = jQuery.data(element, this.dataKey), ret;
+			
+			if ( timers ) {
+				
+				if (!label) {
+					for ( label in timers )
+						this.remove(element, label, fn);
+				} else if ( timers[label] ) {
+					if ( fn ) {
+						if ( fn.timerID ) {
+							window.clearInterval(timers[label][fn.timerID]);
+							delete timers[label][fn.timerID];
+						}
+					} else {
+						for ( var fn in timers[label] ) {
+							window.clearInterval(timers[label][fn]);
+							delete timers[label][fn];
+						}
+					}
+					
+					for ( ret in timers[label] ) break;
+					if ( !ret ) {
+						ret = null;
+						delete timers[label];
+					}
+				}
+				
+				for ( ret in timers ) break;
+				if ( !ret ) 
+					jQuery.removeData(element, this.dataKey);
+			}
+		}
+	}
+});
+
+jQuery(window).bind("unload", function() {
+	jQuery.each(jQuery.timer.global, function(index, item) {
+		jQuery.timer.remove(item);
+	});
+});

dsDataexV1.1/Html/mock.html

@@ -0,0 +1,187 @@
+<!DOCTYPE html> 
+<html> 
+	<head> 
+	<title>My Page</title> 
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.css" />
+	<script src="http://code.jquery.com/jquery-1.7.1.min.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.js" type="text/javascript"></script>
+	<script src="jquery.timers-1.2.js" type="text/javascript"></script>
+	<script type="text/javascript">
+	$(document).ready(function(){
+		//请求参数
+        var list = {
+			"access_token": "TEST_009##202011300904##4bac61eee0661173d2435a58827cf683",
+			"data_source": "log_login",
+			"event_datas": [
+				{
+					"event_name": "在线提交作业",
+					"event_seqno": "事件顺序号：1/2/3",
+					"event_time": "2020/08/08 18:19:20",
+					"event_type": "1001",
+					"event_uri": "https://edusoa.com/cloud/study/do_homework",
+					"event_userid": "用户ID",
+					"properties": "{res_id:12300,res_name:初一语文一单元作业,teacher_id:123001,time_spend:100s}"
+				}
+			],
+			"user_datas": [
+				{
+					"access_id": "访客ID（用户未登录）",
+					"access_ip": "10.10.8.88",
+					"access_way": "app/web/weixin/dingding",
+					"identity": "用户身份（1：教师，2：学生，3：家长，4：管理员，5：访客）",
+					"properties": "{group_id:12300,group_name:课外学习一组,user_level:2,login_time:2020/08/08 12:13:14}",
+					"user_id": "用户ID"
+				}
+			]
+		}
+		
+
+
+		$(".button").toggle(function(){
+			var page = 1
+			var perPage = $('.per_page').val()
+			var num
+			var event_datas = []
+			var user_datas = []
+			var i, j
+			var d = new Date();
+
+			for (var i = 0; i < perPage; i++) {
+				var time = new Date().Format("yyyy/MM/dd hh:mm:ss");
+				event_datas[i] = {}
+				event_datas[i].event_name = "在线提交作业" + i
+				event_datas[i].event_seqno = "事件顺序号：" + i
+				event_datas[i].event_time = time
+				event_datas[i].event_type = "1001" + i
+				event_datas[i].event_uri = "https://edusoa.com/cloud/study/do_homework/" + i
+				event_datas[i].event_userid = "用户ID" + i
+				event_datas[i].properties = "{res_id:12300,res_name:初一语文一单元作业,teacher_id:123001,time_spend:100s}"
+			}
+
+			for (var j = 0; j < perPage; j++) {
+				var time = new Date().Format("yyyy/MM/dd hh:mm:ss");
+				user_datas[j] = {}
+				user_datas[j].access_id = "访客ID（用户未登录）" + j
+				user_datas[j].access_ip = "10.10.8.88"
+				user_datas[j].access_way = "app/web/weixin/dingding/" + j
+				user_datas[j].identity = randomNum(1, 5).toString()
+				user_datas[j].properties = "{group_id:12300,group_name:课外学习一组,user_level:2,login_time:" + time + "}"
+				user_datas[j].user_id = "用户ID" + j
+			}
+
+			list.event_datas = event_datas
+			list.user_datas = user_datas
+
+			var str
+			var cycle = 0
+			str = JSON.stringify(list)
+
+
+
+			$('body').everyTime('1s','A',function(){
+				$.ajax({
+					type : "post",	
+					url: "http://127.0.0.1:9009/dataex/dataex/DataexCollect",
+					contentType:"application/json",
+					dataType: "json",
+					data : str,
+					beforeSend : function(result) {
+						num = perPage * page
+						$(".print_box").html("正在执行" + page + "页," + num + "条数据")
+						//$(".button").text("SENDING...");
+						//$(".button").prop("value", "SENDING...");
+					},
+					//请求成功
+					success : function(result) {
+						console.log(result);
+					},
+					//请求失败，包含具体的错误信息
+					error : function(e){
+						console.log(e.status);
+						console.log(e.responseText);
+					}
+				}).done(function() {
+					num = perPage * page
+					$(".print_box").html("已执行" + page + "页," + num + "条数据")
+					page++
+					//$(".button").text("DONE");
+					//$(".button").prop("value", "DONE");
+				});
+			}, cycle);
+			
+		}, function(){
+			$("body").stopTime ("A");
+			//$(".mock").text("MOCK");
+			//$(".mock").prop("value", "MOCK");
+		});
+	});
+	
+	Date.prototype.Format = function (fmt) { //author: meizz 
+		var o = {
+			"M+": this.getMonth() + 1, //月份 
+			"d+": this.getDate(), //日 
+			"h+": this.getHours(), //小时 
+			"m+": this.getMinutes(), //分 
+			"s+": this.getSeconds(), //秒 
+			"q+": Math.floor((this.getMonth() + 3) / 3), //季度 
+			"S": this.getMilliseconds() //毫秒 
+		};
+		if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+		for (var k in o)
+		if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+		return fmt;
+	}
+	
+	// 生成从minNum到maxNum的随机数
+	function randomNum(minNum,maxNum){ 
+		switch(arguments.length){ 
+			case 1: 
+				return parseInt(Math.random()*minNum+1,10); 
+			break; 
+			case 2: 
+				return parseInt(Math.random()*(maxNum-minNum+1)+minNum,10); 
+			break; 
+				default: 
+					return 0; 
+				break; 
+		} 
+	}
+
+	// 生成len长度随机字符串
+	function randomString(len) {
+		len = len || 32;
+		var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';    /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
+		var maxPos = $chars.length;
+		var pwd = '';
+		for (i = 0; i < len; i++) {
+			pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
+		}
+		return pwd;
+	}
+	</script>
+</head> 
+<body> 
+
+<div data-role="page">
+
+	<div data-role="header">
+		<h1>My Title</h1>
+	</div><!-- /header -->
+
+	<div data-role="content">	
+		<p class="print_box">Hello world</p>
+		<select name="per_page" class="per_page">
+			<option value="100">100/Cycle</option>
+			<option value="200">200/Cycle</option>
+			<option value="300">300/Cycle</option>
+			<option value="500">500/Cycle</option>
+			<option value="1000">1000/Cycle</option>
+		</select>
+		<button class="button" type='button'>MOCK</button>
+	</div><!-- /content -->
+
+</div><!-- /page -->
+
+</body>
+</html>

dsDataexV1.1/MiddleWare/Middleware.go

@@ -36,34 +36,39 @@ func stringEndWith(input string) bool {
 }
 
 func init() {
-	var err error
-	var hook *kafkalogrus.KafkaLogrusHook
+	// add by wangshuai 2020-12-15
+	// 增加判断是否启用Kafka
+	if ConfigUtil.KafkaEnable == 1 {
+		var err error
+		var hook *kafkalogrus.KafkaLogrusHook
 
-	//add by zhangjun 2020-08-03
-	//初始化 topic，多个 partition，提高数据批处理性能。
-	KafkaUtil.InitTopic(ConfigUtil.KafkaAccessLogTopic)
-
-	if hook, err = kafkalogrus.NewKafkaLogrusHook(
-		"kh",
-		logrus.AllLevels,
-		&logrus.JSONFormatter{},
-		//change by zhangjun 2020-08-03
-		//[]string{ConfigUtil.KafkaAddress},
-		ConfigUtil.KafkaBrokers,
-		ConfigUtil.KafkaAccessLogTopic,
-		true,
-		nil); err != nil {
-		panic(err)
-	}
+		//add by zhangjun 2020-08-03
+		//初始化 topic，多个 partition，提高数据批处理性能。
+
+		KafkaUtil.InitTopic(ConfigUtil.KafkaAccessLogTopic)
+
+		if hook, err = kafkalogrus.NewKafkaLogrusHook(
+			"kh",
+			logrus.AllLevels,
+			&logrus.JSONFormatter{},
+			//change by zhangjun 2020-08-03
+			//[]string{ConfigUtil.KafkaAddress},
+			ConfigUtil.KafkaBrokers,
+			ConfigUtil.KafkaAccessLogTopic,
+			true,
+			nil); err != nil {
+			panic(err)
+		}
 
-	//设置日志格式
-	logrus.SetFormatter(CSTFormatter{&logrus.JSONFormatter{}})
+		//设置日志格式
+		logrus.SetFormatter(CSTFormatter{&logrus.JSONFormatter{}})
 
-	//add by zhangjun 2020-08-03
-	src, _:= os.OpenFile("./gin_server.log", os.O_APPEND|os.O_WRONLY, os.ModeAppend)
-	logrus.SetOutput(src)
+		//add by zhangjun 2020-08-03
+		src, _:= os.OpenFile("./gin_server.log", os.O_APPEND|os.O_WRONLY, os.ModeAppend)
+		logrus.SetOutput(src)
 
-	logrus.AddHook(hook)
+		logrus.AddHook(hook)
+	}
 }
 
 // 日志记录到 Kafka

dsDataexV1.1/MyService/Auth/AuthService/AuthService.go

@@ -67,7 +67,7 @@ func CheckToken(systemID string,authToken string) (bool, string,string){
 
 		if myToken==authToken{
 
-			return true,"接入系统票据验证成功",data["id"].(string)
+			return true,"接入系统票据验证成功",data["app_code"].(string)
 		}else {
 
 			return false,"接入系统票据验证失败",""

dsDataexV1.1/MyTask/Kafka2ES/Kafka2ESService/Kafka2ESService.go

@@ -53,13 +53,10 @@ func ServiceStart() {
 	KafkaUtil.CountTopicProc = make(map[string]int)
 
 	ChanTopic = make(chan []string, 100)
-
 	for topics := range ChanTopic {
 		for no := 0; no < len(topics); no++ {
-
 			topic := topics[no]
 			_, f := KafkaUtil.CountTopicProc[topic]
-
 			if f == false  {
 
 				//change by zhangjun 2020-08-02
@@ -171,7 +168,6 @@ func KafkaProcess(topic string) {
  * @return
  **/
 func LogProcess() {
-
 	for k, v := range KafkaUtil.CountTopicProc {
 		fmt.Println("[Kafka] ["+k+"] "+time.Now().Format("2006/01/02 15:04:05")+" Process message total:", v)
 	}
@@ -185,7 +181,6 @@ func LogProcess() {
  * @return
  **/
 func ESRefreshProcess() {
-
 	for k,_:=range KafkaUtil.CountTopicProc {
 
 		ES7Util.IndexRefresh( k )

dsDataexV1.1/Utils/ConfigUtil/ConfigUtil.go

@@ -56,6 +56,8 @@ var (
 
 	KafkaProcNo int64
 
+	KafkaEnable int64
+
 	//ES Nodes 地址
 	ESNodes string
 
@@ -131,6 +133,7 @@ func init() {
 	KafkaReply =iniParser.GetInt64("kafka", "replication")
 	KafkaProcNo=iniParser.GetInt64("kafka", "process_no")
 	KafkaParts=iniParser.GetInt64("kafka", "partition")
+	KafkaEnable=iniParser.GetInt64("kafka", "enable")
 
 	//add by zhangjun 2020-08-03
 	KafkaAccessLogTopic= iniParser.GetString("kafka", "KafkaAccessLogTopic")

dsDataexV1.1/Utils/KafkaUtil/KafkaUtil.go

@@ -32,20 +32,23 @@ var loc sync.Mutex
 var CountTopicProc map[string]int
 
 func init() {
+	// add by wangshuai 2020-12-15
+	// 增加判断是否启用Kafka
+	if ConfigUtil.KafkaEnable == 1 {
+		KafkaClient, _ := kafka.DialLeader(context.Background(), "tcp", ConfigUtil.KafkaBrokers[0], "__consumer_offsets", 0)
+
+		brokers, _ := KafkaClient.Brokers()
+		//change by zhangjun 2020-08-14
+		for no:=0;no< len(brokers);no++{
+			KafkaBroker += brokers[no].Host + ":" + strconv.Itoa(brokers[no].Port) + "【" + strconv.Itoa(brokers[no].ID) + "】,"
+		}
+		//KafkaBroker = brokers[0].Host + ":" + strconv.Itoa(brokers[0].Port) + "【" + strconv.Itoa(brokers[0].ID) + "】"
 
-	KafkaClient, _ := kafka.DialLeader(context.Background(), "tcp", ConfigUtil.KafkaBrokers[0], "__consumer_offsets", 0)
+		writerPool = make(map[string]*kafka.Writer)
 
-	brokers, _ := KafkaClient.Brokers()
-	//change by zhangjun 2020-08-14
-	for no:=0;no< len(brokers);no++{
-		KafkaBroker += brokers[no].Host + ":" + strconv.Itoa(brokers[no].Port) + "【" + strconv.Itoa(brokers[no].ID) + "】,"
+		kafkaPool = make(map[string]map[int]*kafka.Conn)
+		kafkaParts = make(map[string]int)
 	}
-	//KafkaBroker = brokers[0].Host + ":" + strconv.Itoa(brokers[0].Port) + "【" + strconv.Itoa(brokers[0].ID) + "】"
-
-	writerPool = make(map[string]*kafka.Writer)
-
-	kafkaPool = make(map[string]map[int]*kafka.Conn)
-	kafkaParts = make(map[string]int)
 }
 
 /**

dsDataexV1.1/main.go

@@ -88,7 +88,12 @@ func main() {
 
 	fmt.Println("ES Server :" + ES7Util.ServerVersion)
 	//fmt.Println("ES Server :" + ES7SqlUtil.ServerVersion)
-	fmt.Println("Kafka Server :" + KafkaUtil.KafkaBroker )
+
+	// add by wangshuai 2020-12-15
+	// 增加判断是否启用Kafka
+	if ConfigUtil.KafkaEnable == 1 {
+		fmt.Println("Kafka Server :" + KafkaUtil.KafkaBroker)
+	}
 
 	//KafkaUtil.CreateTopic2("log_test")
 	//var token=MD5Util.MD5V1("TEST_007" + "20200707" + "DSDataex_Token_7ee1f0f76243449f8d75f40fdcc2b93d")

dsSso/Controller/ControllerOauth2/ControllerOauth2.go

@@ -5,6 +5,7 @@ import (
 	"dsSso/Const/DefaultConst"
 	"dsSso/Controller/ControllerRecaptcha"
 	"dsSso/Dao/DaoBaseGlobal"
+	"dsSso/Dao/DaoSysLoginPerson"
 	"dsSso/Model"
 	"dsSso/Service/ServiceJoinApp"
 	"dsSso/Service/ServiceLoginPerson"
@@ -268,11 +269,19 @@ func accessToken(context *gin.Context) {
 		k := ConfigUtil.OAuth2RedisKeyPrefix + ":refresh_token_vs_person:" + refreshToken
 		RedisUtil.SET(k, personStr, time.Hour*24*30) //30天的有效期
 
+		personName, err := DaoSysLoginPerson.GetPersonName(identityId, personId)
+		if err != nil {
+			context.JSON(http.StatusOK, Model.Res{
+				Code: http.StatusNotImplemented,
+				Msg:  "获取人员姓名信息失败！" + err.Error(),
+			})
+			return
+		}
 		//返回json数据
 		context.JSON(http.StatusOK,
 			gin.H{
 				"access_token": accessToken, "expires_in": expiresIn, "refresh_token": refreshToken,
-				"token_type": tokenType, "identity_id": identityIdInt, "person_id": personId, "code": 200})
+				"token_type": tokenType, "identity_id": identityIdInt, "person_id": personId, "person_name": personName, "code": 200})
 		return
 	} else {
 		//刷新token
@@ -451,7 +460,7 @@ func authorizeGet(context *gin.Context) {
 		return
 	}
 	var sysUrl = client.GetRedirectUri()
-	if strings.Index(sysUrl, redirectUri) < 0 {
+	if sysUrl != redirectUri {
 		msg := "回调地址与系统中保存的不一致！"
 		context.JSON(http.StatusOK, map[string]interface{}{"success": false, "msg": msg})
 		return

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
@@ -23,15 +25,29 @@ func init() {
 func GetAppBaseList(page int, limit int, keyword string) ([]map[string]interface{}, int32) {
 	//基础查询语句
 	baseSql := "select app_id from t_app_base where app_name like ? and b_use=1"
+
 	//使用通用方法，获取简单表的分页查询SQL语句和求总数SQL语句
 	keyword = "%" + keyword + "%"
 	//偏移量
 	var offset = (page - 1) * limit
+
 	//一键加载,最后两个参数：每页多少个+从哪个位置开始,中间的参数为sql语句中的查询参数
 	list, count := DaoCache.PageData(baseSql, joinModel, keyword, limit, offset)
 	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获取接入第三方统一认证系统的信息
 作者：吴缤

dsSso/Dao/DaoSysLoginPerson/DaoSysLoginPerson.go

@@ -269,3 +269,16 @@ func BindWxUser(identityId string, personId string, openid string) (bool, error)
 func UnBindWxUser(identityId string, personId string) (bool, error) {
 	return BindWxUser(identityId, personId, "")
 }
+
+//通过人员身份ID和人员编号，获取人员的信息
+func GetPersonName(identityId string, personId string) (string, error) {
+	sql := `select person_name from t_sys_loginperson where identity_id=? and person_id=?`
+	list, err := db.SQL(sql, identityId, personId).Query().List()
+	if err != nil {
+		return "", err
+	}
+	if len(list) == 0 {
+		return "", err
+	}
+	return list[0]["person_name"].(string), nil
+}

dsSso/docs/docs.go

@@ -663,7 +663,7 @@ type swaggerInfo struct {
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = swaggerInfo{
 	Version:     "2.0",
-	Host:        "127.0.0.1:8000",
+	Host:        "10.10.14.187:8000",
 	BasePath:    "",
 	Schemes:     []string{},
 	Title:       "东师理想统一认证中心(OAuth2+Sso)",

dsSso/docs/swagger.json

@@ -6,7 +6,7 @@
         "contact": {},
         "version": "2.0"
     },
-    "host": "127.0.0.1:8000",
+    "host": "10.10.14.187:8000",
     "paths": {
         "/oauth2/AddClient": {
             "post": {

dsSso/docs/swagger.yaml

@@ -32,7 +32,7 @@ definitions:
         description: 个数
         type: object
     type: object
-host: 127.0.0.1:8000
+host: 10.10.14.187:8000
 info:
   contact: {}
   description: 参考自xxl-sso

dsSso/go.mod

@@ -18,18 +18,19 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/garyburd/redigo v1.6.0
-	github.com/gin-gonic/gin v1.5.0
+	github.com/gin-gonic/gin v1.6.3
 	github.com/go-openapi/spec v0.19.6 // indirect
 	github.com/go-openapi/swag v0.19.7 // indirect
 	github.com/go-playground/universal-translator v0.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.4.1 // indirect
 	github.com/go-redis/redis/v7 v7.2.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-xorm/cmd/xorm v0.0.0-20190426080617-f87981e709a1 // indirect
-	github.com/golang/protobuf v1.3.3 // indirect
-	github.com/json-iterator/go v1.1.9 // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/klauspost/compress v1.10.2 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/leodido/go-urn v1.2.0 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0 // indirect
 	github.com/oklog/ulid v1.3.1
@@ -47,15 +48,17 @@ require (
 	github.com/tidwall/gjson v1.6.0
 	github.com/tidwall/pretty v1.0.1 // indirect
 	github.com/tracer0tong/kafkalogrus v0.0.0-20180816014403-290bb4d4d549
+	github.com/ugorji/go v1.2.3 // indirect
 	github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be // indirect
 	github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31
 	github.com/xormplus/xorm v0.0.0-20200529061552-7d0d26c6f81c
-	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
-	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
+	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
 	golang.org/x/tools v0.0.0-20200213050514-49b8ac185c84 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect
 	gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
 	gopkg.in/ini.v1 v1.42.0
-	gopkg.in/yaml.v2 v2.3.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

dsSso/go.sum

@@ -42,6 +42,7 @@ github.com/bluesky335/IDCheck v0.0.0-20200103080159-bc528ea71642/go.mod h1:PD4Js
 github.com/bndr/gotabulate v1.1.2 h1:yC9izuZEphojb9r+KYL4W9IJKO/ceIO8HDwxMA24U4c=
 github.com/bndr/gotabulate v1.1.2/go.mod h1:0+8yUgaPTtLRTjf49E8oju7ojpU11YmXyvq1LbPAb3U=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
 github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,6 +63,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
@@ -86,6 +89,8 @@ github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
 github.com/gin-gonic/gin v1.5.0 h1:fi+bqFAx/oLK54somfCtEZs9HeH1LHVoEPUgARpTqyc=
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
+github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
+github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
@@ -105,6 +110,7 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.7 h1:VRuXN2EnMSsZdauzdss6JBC29YotDqG59BZ+tdlIL1s=
 github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.12.1 h1:2FITxuFt/xuCNP1Acdhv62OzaCiviiE4kotfhkmOqEc=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
@@ -113,6 +119,10 @@ github.com/go-playground/universal-translator v0.16.0 h1:X++omBR/4cE2MNg91AoC3rm
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
+github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-redis/redis/v7 v7.2.0 h1:CrCexy/jYWZjW0AyVoHlcJUeZN19VWlbepTh1Vq6dJs=
 github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
 github.com/go-sql-driver/mysql v0.0.0-20180719071942-99ff426eb706/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -141,14 +151,24 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -177,6 +197,8 @@ github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62F
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
@@ -203,6 +225,8 @@ github.com/leodido/go-urn v1.1.0 h1:Sm1gr51B1kKyfD2BlRcLSiEkffoG96g6TPv6eRoEiB8=
 github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
+github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/lib/pq v0.0.0-20180523175426-90697d60dd84 h1:it29sI2IM490luSc3RAhp5WuCYnc6RtbfLVAB7nmC5M=
 github.com/lib/pq v0.0.0-20180523175426-90697d60dd84/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de h1:nyxwRdWHAVxpFcDThedEgQ07DbcRc5xgNObtbTp76fk=
@@ -258,6 +282,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 h1:dY6ETXrvDG7Sa4vE8ZQG4yqWg6UnOcbqTAahkV813vQ=
@@ -307,6 +332,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
 github.com/swaggo/gin-swagger v1.2.0 h1:YskZXEiv51fjOMTsXrOetAjrMDfFaXD79PEoQBOe2W0=
 github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI=
@@ -332,10 +358,14 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
 github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go v1.2.3 h1:WbFSXLxDFKVN69Sk8t+XHGzVCD7R8UoAATR8NqZgTbk=
+github.com/ugorji/go v1.2.3/go.mod h1:5l8GZ8hZvmL4uMdy+mhCO1LjswGRYco9Q3HfuisB21A=
 github.com/ugorji/go/codec v0.0.0-20181022190402-e5e69e061d4f/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/ugorji/go/codec v1.2.3 h1:/mVYEV+Jo3IZKeA5gBngN0AvNnQltEDkR+eQikkWQu0=
+github.com/ugorji/go/codec v1.2.3/go.mod h1:5FxzDJIgeiWJZslYHPj+LS1dq1ZBQVelZFnjsFGI/Uc=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
@@ -361,10 +391,15 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -410,9 +445,13 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
@@ -424,7 +463,9 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -445,10 +486,25 @@ google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoA
 google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
 google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
@@ -487,9 +543,13 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

dsSso/main.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	c "dsSso/Controller"
+	"dsSso/Dao/DaoAppBase"
 	"dsSso/Handler"
 	"dsSso/Middleware"
-	"dsSso/Service/ServiceJoinApp"
 	"dsSso/Utils"
 	"dsSso/Utils/ConfigUtil"
 	"dsSso/Utils/FileUtil"
@@ -15,6 +15,8 @@ import (
 	"github.com/gin-gonic/gin"
 	ginSwagger "github.com/swaggo/gin-swagger"
 	"github.com/swaggo/gin-swagger/swaggerFiles"
+	"time"
+
 	//http://www.freesion.com/article/3571182257/
 	_ "dsSso/docs"
 )
@@ -38,7 +40,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)
@@ -56,7 +58,7 @@ func startOAuth2Server() {
 // @title 东师理想统一认证中心(OAuth2+Sso)
 // @version 2.0
 // @description  参考自xxl-sso
-// @host 127.0.0.1:8000
+// @host 10.10.14.187:8000
 func main() {
 	// 发布模式
 	//gin.SetMode(gin.ReleaseMode)
@@ -77,6 +79,8 @@ func main() {
 	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 	//注册启动OAuth2服务器
 	startOAuth2Server()
+	//开启一个协程，用于每1分钟更新一下REDIS中接入系统的信息
+	go SyncAppRedis()
 	//注册登录验证拦截器
 	r.Use(Handler.AuthorizeHandler())
 	//主路由
@@ -84,3 +88,22 @@ func main() {
 	// 监听并在 0.0.0.0:8000 上启动服务
 	r.Run(":" + ConfigUtil.ServerPort)
 }
+
+//每隔一分钟，对redis中的app接入系统数据进行重新加载
+func SyncAppRedis() {
+	list, _ := DaoAppBase.GetAppBaseListFromDb()
+	for i := 0; i < len(list); i++ {
+		appKey := list[i]["access_key"].(string)
+		secret := list[i]["secret_key"].(string)
+		redirectUri := list[i]["redirect_uri"].(string)
+		RedisStorage.OAuth2RedisStorage.CreateClient(
+			&osin.DefaultClient{
+				Id:          appKey,
+				Secret:      secret,
+				RedirectUri: redirectUri,
+			},
+		)
+	}
+	// 每1分钟执行一次
+	time.AfterFunc(1*time.Minute, SyncAppRedis)
+}

dsSso/升级Gin.txt

@@ -0,0 +1 @@
+go get -u github.com/gin-gonic/gin

dsSupport/MyModel/AccessSystem/AccessSystemDao/AccessSystemDao.go

@@ -23,7 +23,7 @@ var db = DbUtil.Engine
 /**
 功能：增加一个接入系统
 */
-func AddApp(appCode string, appName string, sortId int32) (string,error) {
+func AddApp(appCode string, appName string, sortId int32) (string, error) {
 	//生成AK+SK
 	ak := xid.New()
 	appKey := ak.String() //新增就生成一个secret
@@ -35,7 +35,7 @@ func AddApp(appCode string, appName string, sortId int32) (string,error) {
 	list, _ := db.SQL(sql, appCode).Query().List()
 	count := list[0]["c"].(int64)
 	if count > 0 {
-		return "",errors.New("系统代码已存在，请重新输入！")
+		return "", errors.New("系统代码已存在，请重新输入！")
 	}
 	//插入数据库数据
 	model := new(models.TAppBase)
@@ -47,7 +47,7 @@ func AddApp(appCode string, appName string, sortId int32) (string,error) {
 	if sortId == 0 {
 		c, err := getMaxSortId()
 		if err != nil {
-			return model.AppId,err
+			return model.AppId, err
 		}
 		sortId = int32(c)
 	}
@@ -55,11 +55,11 @@ func AddApp(appCode string, appName string, sortId int32) (string,error) {
 	model.BUse = 1
 	_, err := db.Insert(model)
 	if err != nil {
-		return model.AppId,err
+		return model.AppId, err
 	}
 	//插入REDIS缓存
 	err = insertRedisCache(model.AccessKey, model.SecretKey, model.RedirectUri)
-	return model.AppId,err
+	return model.AppId, err
 }
 
 /**
@@ -460,11 +460,7 @@ func insertRedisCache(accessKey string, secretKey string, redirectUri string) er
 	}
 
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
-	fmt.Println(string(body))
+	_, _ = ioutil.ReadAll(resp.Body)
 	return nil
 }