master
zhangjun 5 years ago
parent 8d4036bee9
commit 1d37bb870b

@ -6,16 +6,16 @@ user = root
pwd = DsideaL147258369
[redis]
;ip = 127.0.0.1
;port = 6379
;db = 1
;expireTime = 86400
ip = 10.10.14.187
port = 18890
db = 0
ip = 127.0.0.1
port = 6379
db = 1
expireTime = 86400
;ip = 10.10.14.187
;port = 18890
;db = 0
;expireTime = 86400
[kafka]
brokers = 10.10.14.238:9092,
KafkaAccessLogTopic = log_dataex

@ -1,7 +1,7 @@
package GPSqlOpenapi
import (
"dsDataex/MyReport/ESSql/ESSqlService"
"dsDataex/MyReport/GPSql/GPSqlService"
"dsDataex/MyReport/MySwagger"
"dsDataex/MyService/Auth/AuthService"
"dsDataex/MyService/DataEX/DataexService"
@ -65,7 +65,7 @@ func QuerySimpleGP(c *gin.Context) {
}
res, msg, data := ESSqlService.QuerySimple(input.Query.QueryID, input.Query.QueryParam, input.QueryGroup, input.QueryCount, input.QueryFormat)
res, msg, data := GPSqlService.QuerySimple(input.Query.QueryID, input.Query.QueryParam, input.QueryGroup, input.QueryCount, input.QueryFormat)
if res {
c.JSON(http.StatusOK, MySwagger.DataResult{

@ -29,13 +29,11 @@ func QuerySimple(queryCode string, queryParam []string, queryGroup []string, que
break
case "echarts":
result := ES7SqlUtil.SqlQueryObj(gpSql, queryParam)
echarts := ConvEcharts(result, queryGroup, queryCount)
_, result := GPUtil.SqlQuery(gpSql, queryParam)
if len(queryGroup) <= 2 {
bytes, _ := json.Marshal(echarts)
bytes, _ := json.Marshal(result)
return true, "查询成功,格式转换成功", string(bytes)
} else {
@ -44,13 +42,9 @@ func QuerySimple(queryCode string, queryParam []string, queryGroup []string, que
break
case "antd":
result := ES7SqlUtil.SqlQueryObj(gpSql, queryParam)
antd := ConvAntd(result)
bytes, _ := json.Marshal(antd)
flag, result := GPUtil.SqlQueryJson(gpSql, queryParam)
return true, "查询成功,格式转换成功", string(bytes)
return flag, "查询成功", result
break
default:

@ -5,10 +5,7 @@ import (
"dsDataex/Utils/ConfigUtil"
"fmt"
_ "github.com/lib/pq"
"github.com/xormplus/core"
"github.com/xormplus/xorm"
"github.com/xormplus/xorm/log"
"os"
"time"
)
@ -28,11 +25,12 @@ func init() {
user := ConfigUtil.GreenPlumUser
dbname := ConfigUtil.GreenPlumDataBase
password := ConfigUtil.GreenPlumPwd
//mysql
master := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", host, port, user, password, dbname)
master := fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable", user, password, host, port, dbname)
var err error
Engine, err = xorm.NewEngine("postgres", master)
Engine, err = xorm.NewPostgreSQL(master)
if err != nil {
fmt.Println(err)
}
@ -52,20 +50,6 @@ func init() {
fmt.Println("\n[xorm] [info] " + CommonUtil.GetCurrentTime() + " PING DATABASE greenplum")
}
}()
//设置数据时区
var location *time.Location
location, err = time.LoadLocation("Asia/Shanghai")
Engine.TZLocation = location
//与 struct的映射方式这里采用蛇型方法默认是蛇形
Engine.SetTableMapper(core.SnakeMapper{})
//显示+记录SQL日志
f, _ := os.Create("./Logs/sql.log")
Engine.SetLogger(log.NewSimpleLogger(f))
Engine.ShowSQL(true) // 则会在控制台打印出生成的SQL语句
Engine.Logger().SetLevel(log.LOG_DEBUG) //则会在控制台打印info及以上的信息
}
/**
@ -77,11 +61,13 @@ func init() {
**/
func SqlQuery(sql string, param []string) (bool, []map[string]interface{}) {
result, err := Engine.SQL(sql, param).QueryInterface()
if len(param) > 0 {
result, _ := Engine.SQL(sql, param).QueryInterface()
if err != nil {
return false, result
return true, result
} else {
result, _ := Engine.SQL(sql).QueryInterface()
return true, result
}
}
@ -95,11 +81,13 @@ func SqlQuery(sql string, param []string) (bool, []map[string]interface{}) {
**/
func SqlQueryJson(sql string, param []string) (bool, string) {
result, err := Engine.SQL(sql, param).Query().Json()
if len(param) > 0 {
result, _ := Engine.SQL(sql, param).Query().Json()
if err != nil {
return false, err.Error()
return true, result
} else {
result, _ := Engine.SQL(sql).Query().Json()
return true, result
}
}
@ -113,11 +101,13 @@ func SqlQueryJson(sql string, param []string) (bool, string) {
**/
func SqlQueryXml(sql string, param []string) (bool, string) {
result, err := Engine.SQL(sql, param).Query().Xml()
if len(param) > 0 {
result, _ := Engine.SQL(sql, param).Query().Xml()
if err != nil {
return false, err.Error()
return true, result
} else {
result, _ := Engine.SQL(sql).Query().Xml()
return true, result
}
}

@ -28,7 +28,7 @@ require (
github.com/imdario/mergo v0.3.9
github.com/klauspost/compress v1.10.4 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/lib/pq v1.1.1
github.com/lib/pq v1.9.0
github.com/mailru/easyjson v0.7.2 // indirect
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

@ -412,6 +412,8 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx
github.com/lib/pq v0.0.0-20180523175426-90697d60dd84/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8=
github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de/go.mod h1:3q8WtuPQsoRbatJuy3nvq/hRSvuBJrHHr+ybPPiNvHQ=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mailgun/mailgun-go v0.0.0-20171127222028-17e8bd11e87c/go.mod h1:NWTyU+O4aczg/nsGhQnvHL6v2n5Gy6Sv5tNDVvC6FbU=

@ -8,6 +8,7 @@ import (
"dsDataex/Utils"
"dsDataex/Utils/CacheUtil"
"dsDataex/Utils/ConfigUtil"
"dsDataex/Utils/ES7SqlUtil"
"dsDataex/Utils/ES7Util"
"dsDataex/Utils/GPUtil"
"dsDataex/Utils/KafkaUtil"
@ -85,7 +86,7 @@ func main() {
fmt.Println("DsDataEX GO ! GO !! GO !!!")
fmt.Println("ES Server :" + ES7Util.ServerVersion)
//fmt.Println("ES Server :" + ES7SqlUtil.ServerVersion)
fmt.Println("ES Server :" + ES7SqlUtil.ServerVersion)
fmt.Println("GreenPlum Server :", GPUtil.ServerVersion)
// add by wangshuai 2020-12-15

Loading…
Cancel
Save