庄逸洲 преди 5 години
родител
ревизия
af2db05e02
променени са 3 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 4 4
      conf/app.conf
  2. 2 2
      controllers/login/login_controller.go
  3. 1 1
      routers/router.go

+ 4 - 4
conf/app.conf Целия файл

@@ -39,9 +39,9 @@ key = "e4SHrkiZu0pQEwVoGBapDBTf9N1Q6MxV"
39 39
 appsecret="61ee2e6268497d5aa9de0b0187c39aea"
40 40
 
41 41
 [prod]
42
-httpdomain = http://api.xt.kuyicloud.com
42
+httpdomain = http://api.jk.kuyicloud.com
43 43
 sso_domain = http://sso.kuyicloud.com
44
-front_end_domain = "http://xt.kuyicloud.com/#"
44
+front_end_domain = "http://jk.kuyicloud.com/#"
45 45
 
46 46
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
47 47
 readmysqlport = 3306
@@ -73,9 +73,9 @@ redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP
73 73
 redisdb = 0
74 74
 
75 75
 [dev]
76
-httpdomain = http://api.xt.test.sgjyun.com
76
+httpdomain = http://api.test1.sgjyun.com
77 77
 sso_domain = http://testsso.sgjyun.com
78
-front_end_domain = "http://xt.test.sgjyun.com/#"
78
+front_end_domain = "http://test1.sgjyun.com/#"
79 79
 
80 80
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
81 81
 readmysqlport = 3306

+ 2 - 2
controllers/login/login_controller.go Целия файл

@@ -36,7 +36,7 @@ func (this *LoginViewController) Login() {
36 36
 		relogin, _ := this.GetBool("relogin", false)
37 37
 		returnURL := url.QueryEscape(fmt.Sprintf("%v%v", beego.AppConfig.String("httpdomain"), this.Ctx.Request.RequestURI))
38 38
 		ssoDomain := beego.AppConfig.String("sso_domain")
39
-		ssoLoginURL := fmt.Sprintf("%v/login?returnurl=%v&app_type=3&relogin=%v", ssoDomain, returnURL, relogin)
39
+		ssoLoginURL := fmt.Sprintf("%v/login?returnurl=%v&app_type=1&relogin=%v", ssoDomain, returnURL, relogin)
40 40
 		this.Redirect302(ssoLoginURL)
41 41
 	}
42 42
 }
@@ -71,7 +71,7 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
71 71
 
72 72
 		ip := utils.GetIP(this.Ctx.Request)
73 73
 		sessionID := this.Ctx.GetCookie("s")
74
-		this.TraceLog("cookie session id: %v", sessionID)
74
+		utils.TraceLog("cookie session id: %v %v", ip, sessionID)
75 75
 		adminUserInfo, err, errCode := admin_service.VerifyToken(token, ip, sessionID)
76 76
 		if err != nil {
77 77
 			if errCode == 903 { // 未创建应用

+ 1 - 1
routers/router.go Целия файл

@@ -11,7 +11,7 @@ import (
11 11
 
12 12
 func init() {
13 13
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
14
-		AllowOrigins:     []string{"http://jk.kuyicloud.com", "http://localhost:9533", "http://test1.sgjyun.com", "https://www.ucpaas.com"},
14
+		AllowOrigins:     []string{"http://jk.kuyicloud.com", "http://localhost:8090", "http://test1.sgjyun.com", "https://www.ucpaas.com"},
15 15
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
16 16
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
17 17
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},