diff --git a/dsSso/Controller/ControllerOauth2/ControllerOauth2.go b/dsSso/Controller/ControllerOauth2/ControllerOauth2.go index 7a70bf91..6c1b1fe1 100644 --- a/dsSso/Controller/ControllerOauth2/ControllerOauth2.go +++ b/dsSso/Controller/ControllerOauth2/ControllerOauth2.go @@ -663,13 +663,9 @@ func checkOpenId(context *gin.Context) { //3、写cookie context.SetCookie(ConfigUtil.AccessToken, encodeString, 0, "/", "", false, true) //4、跳转到XXX页面,比如集成页,或者管理员的首页 - if identityId == 1 { - context.Redirect(301, "/dsBaseWeb/#/organization/bureau") - } else { - context.Redirect(301, "/dsBaseWeb/pages/personPortal/") - } + context.JSON(http.StatusOK, map[string]interface{}{"success": true, "openId": openId}) } else { //2、如果此OpenId没有实现过挂接,应该跳转到绑定用户页面 - context.Redirect(301, "/sso/static/bindUser.html?openId="+openId) + context.JSON(http.StatusOK, map[string]interface{}{"success": false, "openId": openId}) } } diff --git a/dsSso/docs/docs.go b/dsSso/docs/docs.go index 7dbcd755..500ea4f2 100644 --- a/dsSso/docs/docs.go +++ b/dsSso/docs/docs.go @@ -738,7 +738,7 @@ type swaggerInfo struct { // SwaggerInfo holds exported Swagger Info so clients can modify it var SwaggerInfo = swaggerInfo{ Version: "2.0", - Host: "10.10.14.187:8000", + Host: "127.0.0.1:8000", BasePath: "", Schemes: []string{}, Title: "东师理想统一认证中心(OAuth2+Sso)", diff --git a/dsSso/docs/swagger.json b/dsSso/docs/swagger.json index 40a0a557..ea832a93 100644 --- a/dsSso/docs/swagger.json +++ b/dsSso/docs/swagger.json @@ -7,7 +7,7 @@ "license": {}, "version": "2.0" }, - "host": "10.10.14.187:8000", + "host": "127.0.0.1:8000", "paths": { "/oauth2/access_token": { "post": { diff --git a/dsSso/docs/swagger.yaml b/dsSso/docs/swagger.yaml index f700c68e..a74ef14e 100644 --- a/dsSso/docs/swagger.yaml +++ b/dsSso/docs/swagger.yaml @@ -32,7 +32,7 @@ definitions: description: 个数 type: object type: object -host: 10.10.14.187:8000 +host: 127.0.0.1:8000 info: contact: {} description: 参考自xxl-sso diff --git a/dsSso/main.go b/dsSso/main.go index 2b257b82..72b22ec9 100644 --- a/dsSso/main.go +++ b/dsSso/main.go @@ -67,7 +67,7 @@ func startOAuth2Server() { // @title 东师理想统一认证中心(OAuth2+Sso) // @version 2.0 // @description 参考自xxl-sso -// @host 10.10.14.187:8000 +// @host 127.0.0.1:8000 func main() { // 发布模式 //gin.SetMode(gin.ReleaseMode) diff --git a/dsSso/static/jumpWx.html b/dsSso/static/jumpWx.html index 2d4e770a..793d4fd0 100644 --- a/dsSso/static/jumpWx.html +++ b/dsSso/static/jumpWx.html @@ -34,6 +34,12 @@ }, async: false, success: function (result) { + //if identityId == 1 { + // context.Redirect(301, "/dsBaseWeb/#/organization/bureau") + //} else { + // context.Redirect(301, "/dsBaseWeb/pages/personPortal/") + //} + //context.Redirect(301, "/sso/static/bindUser.html?openId="+openId) } });