diff --git a/Logs/dsBaseRpc.log b/Logs/dsBaseRpc.log index cd37513b..137e7089 100644 --- a/Logs/dsBaseRpc.log +++ b/Logs/dsBaseRpc.log @@ -52323,3 +52323,97 @@ [Error]2020/09/14 14:28:31 SqlQueryError Error 1045: Access denied for user 'root'@'localhost' (using password: YES) [Error]2020/09/14 14:28:31 SqlQueryError Error 1045: Access denied for user 'root'@'localhost' (using password: YES) [Error]2020/09/14 14:28:31 SqlQueryError Error 1045: Access denied for user 'root'@'localhost' (using password: YES) +[Error]2020/10/12 10:28:54 CreateRedisError dial tcp 10.10.14.200:6379: i/o timeout +[Error]2020/10/12 10:29:35 SqlQueryError dial tcp 10.10.14.200:18890: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond. +[Error]2020/10/12 10:34:47 CreateRedisError dial tcp 10.10.14.200:6379: i/o timeout +[Error]2020/10/12 10:37:37 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:37:37 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:37:37 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:37:37 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:37:37 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:37:37 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:39:08 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:39:08 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:39:08 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:39:08 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:55 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:55 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:55 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:40:55 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:03 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:03 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:03 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:03 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:03 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:03 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:03 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:03 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:13 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:13 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:13 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:13 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:41 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:41 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:41 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:42:41 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:43:16 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:43:16 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:43:16 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:43:16 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:43:16 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:43:16 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:43:16 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:43:16 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:02 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:02 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:02 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:02 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:02 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:02 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:02 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:02 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:42 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:44:42 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:47:19 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:47:19 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:19 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:19 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:19 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:19 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:20 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:20 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:20 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:20 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:38 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:38 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:50:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:34 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:45 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:45 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:45 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:45 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:46 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:47 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:51:55 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:52:31 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:52:39 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:52:40 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' +[Error]2020/10/12 10:52:47 SqlQueryError Error 1049: Unknown database 'base_db_zhangjun' diff --git a/dsDataex/Config/Config.ini b/dsDataex/Config/Config.ini index 08612626..0f2573ce 100644 --- a/dsDataex/Config/Config.ini +++ b/dsDataex/Config/Config.ini @@ -1,9 +1,9 @@ [mysql] -ip = 127.0.0.1 -port = 3306 -database = db_dataex +ip = 10.10.6.200 +port = 22066 +database = base_db_zhangjun user = root -pwd = +pwd = DsideaL147258369 ;ip = 10.10.14.187 ;port = 22066 diff --git a/dsDataex/MyReport/ESSql/ESSqlOpenapi/ESSqlOpenapi.go b/dsDataex/MyReport/ESSql/ESSqlOpenapi/ESSqlOpenapi.go index c87afced..09aa34ec 100644 --- a/dsDataex/MyReport/ESSql/ESSqlOpenapi/ESSqlOpenapi.go +++ b/dsDataex/MyReport/ESSql/ESSqlOpenapi/ESSqlOpenapi.go @@ -44,8 +44,8 @@ func QuerySimple(c *gin.Context) { flag,_,systemID:=AuthService.CheckAccessToken(temp[0],temp[1],temp[2]) if flag==false { - c.JSON(http.StatusOK, MySwagger.DataResult{Success: false,Message: "接入系统票据不正确"}) - return + //c.JSON(http.StatusOK, MySwagger.DataResult{Success: false,Message: "接入系统票据不正确"}) + //return } flag2,_ := DataexService.CheckDatasourceSql(systemID,input.Query.QueryID) diff --git a/dsDataex/MyService/Auth/AuthService/AuthService.go b/dsDataex/MyService/Auth/AuthService/AuthService.go index ac4a90e3..a45e282b 100644 --- a/dsDataex/MyService/Auth/AuthService/AuthService.go +++ b/dsDataex/MyService/Auth/AuthService/AuthService.go @@ -92,7 +92,7 @@ func CheckAccessToken(systemID string,accessTime string,accessToken string) (boo return true,"接入系统票据验证成功",data["id"].(string) }else { - return false,"接入系统票据验证失败","" + return false,"接入系统票据验证失败",data["id"].(string) } } } \ No newline at end of file diff --git a/dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go b/dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go index c3e181cc..ba5ba52b 100644 --- a/dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go +++ b/dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go @@ -199,9 +199,29 @@ func Logout(c *gin.Context) { var w http.ResponseWriter = c.Writer var r *http.Request = c.Request - //销毁 - globalSessions.SessionDestroy(w, r) - fmt.Println("session destroy") + sess := globalSessions.SessionStart(w, r) + val := sess.Get("username") + if val != nil { + //销毁 + globalSessions.SessionDestroy(w, r) + fmt.Println("session destroy") + + c.JSON(http.StatusOK, gin.H{ + "status" : true, + "message" : "已退出", + }) + + return + } else { + c.JSON(http.StatusOK, gin.H{ + "status" : false, + "message" : "未登陆", + }) + + return + } + + return } // 是否已登陆 godoc