bigdata
/
dsMin
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of 10.10.14.250:huanghai/dsMin

Browse Source 
# Conflicts:
#	Logs/dsSso.log
#	dsBaseWeb/Sso/Sso.go
#	dsBaseWeb/docs/docs.go
#	dsBaseWeb/docs/swagger.json
master
wubin 5 years ago
parent 3bc0b4826c 6920019c5e
commit 32348ade64
10 changed files with 9760 additions and 14573 deletions
Show Stats Download Patch File Download Diff File

11
Logs/dsSso.log
Unescape View File

@ -10,5 +10,16 @@
[Error]2020/09/09 14:31:02 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value
[Error]2020/09/16 15:14:03 SqlQueryError sql: expected 1 arguments, got 3
[Error]2020/09/16 15:14:03 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value
<<<<<<< HEAD
[Error]2020/12/17 16:50:42 SqlQueryError sql: expected 1 arguments, got 3
[Error]2020/12/17 16:50:42 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value
=======
[Error]2020/12/17 11:42:53 SqlQueryError sql: expected 1 arguments, got 3
[Error]2020/12/17 11:42:53 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value
[Error]2020/12/17 11:44:23 SqlQueryError sql: expected 1 arguments, got 3
[Error]2020/12/17 11:44:23 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value
[Error]2020/12/17 11:46:05 SqlQueryError sql: expected 1 arguments, got 3
[Error]2020/12/17 11:46:05 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value
[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

13
dsBaseWeb/Html/2019/01.html
Unescape View File

@ -0,0 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title>Untitled</title>
</head>
<body>
Hello World!
</body>
</html>

1
dsBaseWeb/Sso/Sso.go
Unescape View File

@ -99,6 +99,5 @@ func CheckSsoCode(c *gin.Context) {
RedisUtil.EXPIRE(accessToken)
//跳转到最终访问的地址
//reqCallBackURL = "/dsBaseWeb/2019/qs_01.html"
c.Redirect(http.StatusMovedPermanently, reqCallBackURL)
}

9718
dsBaseWeb/docs/docs.go
View File

File diff suppressed because it is too large Load Diff

9718
dsBaseWeb/docs/swagger.json
View File

File diff suppressed because it is too large Load Diff

4800
dsBaseWeb/docs/swagger.yaml
View File

File diff suppressed because it is too large Load Diff

1
dsSso/Tools/Distribute.go
Unescape View File

@ -35,6 +35,7 @@ func main() {
cli.Run("chmod +x /usr/local/dsMin/dsSso/start.sh")
cli.Run("chmod +x /usr/local/dsMin/dsSso/debug.sh")
cli.Run("chmod +x /usr/local/dsMin/dsSso/stop.sh")
cli.Run("cd /usr/local/dsMin/dsSso/ && dos2unix *.sh")
//启动
cli.Run("cd /usr/local/dsMin/dsSso && ./start.sh")
log.Println("恭喜，统一认证服务上传并启动成功！")

15
dsSso/docs/docs.go
Unescape View File

@ -19,7 +19,6 @@ var doc = `{
"description": "{{.Description}}",
"title": "{{.Title}}",
"contact": {},
"license": {},
"version": "{{.Version}}"
},
"host": "{{.Host}}",
@ -191,7 +190,7 @@ var doc = `{
}
}
},
"x-emptylimit": [
"X-EmptyLimit": [
"client_id",
"redirect_uri",
"device_id",
@ -267,13 +266,13 @@ var doc = `{
}
}
},
"x-emptylimit": [
"X-EmptyLimit": [
"username",
"password",
"captchaId",
"value"
],
"x-intlimit": [
"X-IntLimit": [
"device_id"
]
}
@ -409,7 +408,7 @@ var doc = `{
}
}
},
"x-lengthlimit": [
"X-LengthLimit": [
{
"captchaId": "20,20"
}
@ -478,7 +477,7 @@ var doc = `{
}
}
},
"x-emptylimit": [
"X-EmptyLimit": [
"userName"
]
}
@ -536,7 +535,7 @@ var doc = `{
}
}
},
"x-emptylimit": [
"X-EmptyLimit": [
"code"
]
}
@ -571,7 +570,7 @@ var doc = `{
}
}
},
"x-intlimit": [
"X-IntLimit": [
"app_id"
]
}

15
dsSso/docs/swagger.json
Unescape View File

@ -4,7 +4,6 @@
"description": "参考自xxl-sso",
"title": "东师理想统一认证中心(OAuth2+Sso)",
"contact": {},
"license": {},
"version": "2.0"
},
"host": "127.0.0.1:8000",
@ -175,7 +174,7 @@
}
}
},
"x-emptylimit": [
"X-EmptyLimit": [
"client_id",
"redirect_uri",
"device_id",
@ -251,13 +250,13 @@
}
}
},
"x-emptylimit": [
"X-EmptyLimit": [
"username",
"password",
"captchaId",
"value"
],
"x-intlimit": [
"X-IntLimit": [
"device_id"
]
}
@ -393,7 +392,7 @@
}
}
},
"x-lengthlimit": [
"X-LengthLimit": [
{
"captchaId": "20,20"
}
@ -462,7 +461,7 @@
}
}
},
"x-emptylimit": [
"X-EmptyLimit": [
"userName"
]
}
@ -520,7 +519,7 @@
}
}
},
"x-emptylimit": [
"X-EmptyLimit": [
"code"
]
}
@ -555,7 +554,7 @@
}
}
},
"x-intlimit": [
"X-IntLimit": [
"app_id"
]
}

41
dsSso/docs/swagger.yaml
Unescape View File

@ -36,7 +36,6 @@ host: 127.0.0.1:8000
info:
contact: {}
description: 参考自xxl-sso
license: {}
title: 东师理想统一认证中心(OAuth2+Sso)
version: "2.0"
paths:
@ -118,6 +117,11 @@ paths:
- 登录验证类
/oauth2/authorize:
get:
X-EmptyLimit:
- client_id
- redirect_uri
- device_id
- oauth_callback
consumes:
- application/x-www-form-urlencoded
description: 登录验证跳转路由
@ -152,12 +156,14 @@ paths:
summary: 登录验证跳转路由
tags:
- 登录验证类
x-emptylimit:
- client_id
- redirect_uri
- device_id
- oauth_callback
post:
X-EmptyLimit:
- username
- password
- captchaId
- value
X-IntLimit:
- device_id
consumes:
- application/x-www-form-urlencoded
description: 验证post
@ -205,13 +211,6 @@ paths:
summary: 验证post
tags:
- 登录验证类
x-emptylimit:
- username
- password
- captchaId
- value
x-intlimit:
- device_id
/oauth2/bindWxUser:
get:
consumes:
@ -281,6 +280,8 @@ paths:
- 登录验证类
/oauth2/getCaptchaPng:
get:
X-LengthLimit:
- captchaId: 20,20
consumes:
- application/x-www-form-urlencoded
description: 获取验证码图片
@ -300,8 +301,6 @@ paths:
summary: 获取验证码图片
tags:
- 登录验证类
x-lengthlimit:
- captchaId: 20,20
/oauth2/logout:
get:
consumes:
@ -325,6 +324,8 @@ paths:
- 登录验证类
/oauth2/resetRemainCount:
get:
X-EmptyLimit:
- userName
consumes:
- application/x-www-form-urlencoded
description: 重置错误重试次数限制
@ -344,8 +345,6 @@ paths:
summary: 重置错误重试次数限制
tags:
- 登录验证类
x-emptylimit:
- userName
/oauth2/unBindWxUser:
get:
consumes:
@ -363,6 +362,8 @@ paths:
- 解除登录验证类
/oauth2/wxLogin:
post:
X-EmptyLimit:
- code
consumes:
- application/x-www-form-urlencoded
description: 微信登录
@ -382,10 +383,10 @@ paths:
summary: 微信登录
tags:
- 登录验证类
x-emptylimit:
- code
/sso/getAppInfoById:
get:
X-IntLimit:
- app_id
consumes:
- application/x-www-form-urlencoded
description: 根据appId获取接入第三方统一认证系统的信息
@ -405,8 +406,6 @@ paths:
summary: 根据appId获取接入第三方统一认证系统的信息
tags:
- 接入系统维护类
x-intlimit:
- app_id
/sso/login:
get:
consumes:

Write Preview
Loading…
Cancel
Save