exhibition/exhibition-main
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: exhibition:e48d7ab6c9129a73adef0f44b4b69103f1f555f4
Branches Tags
exhibition:main
exhibition:sxy
exhibition:dev
exhibition:wp
..
compare: exhibition:6d2537671298e9eab25259c1241926314c71db5e
Branches Tags
exhibition:sxy
exhibition:dev
exhibition:main
exhibition:wp

No commits in common. "e48d7ab6c9129a73adef0f44b4b69103f1f555f4" and "6d2537671298e9eab25259c1241926314c71db5e" have entirely different histories.
e48d7ab6c9 ... 6d25376712

4 changed files with 11 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
conf/test/config.yaml
View File

@ -11,8 +11,8 @@ system:
cert_path: "" cert_path: ""
redis: redis:
db: 3 db: 3
addr: "172.16.100.114:6379" addr: redis:6379
password: "kP6tW4tS3qB2dW4aE6uI5cX2" password:
jaeger: jaeger:
addr: "172.16.100.93:9031" addr: "172.16.100.93:9031"
open: true open: true

2
conf/test/dubbogo.yaml
View File

@ -3,7 +3,7 @@ dubbo:
demoZK: demoZK:
protocol: zookeeper protocol: zookeeper
timeout: 3s timeout: 3s
address: zookeeper-test.szjixun.cn:2181 address: zookeeper:2181
consumer: consumer:
filter: tracing filter: tracing
request-timeout: 30s request-timeout: 30s

4
internal/config/app_config.go
View File

@ -128,11 +128,11 @@ type AppConfig struct {
func GetConf() (iniConf string, err error) { func GetConf() (iniConf string, err error) {
if os.Getenv(model.MODE_ENV) != "" { if os.Getenv(model.MODE_ENV) != "" {
if err = os.Setenv(constant.ConfigFileEnvKey, fmt.Sprintf("./conf/%s%s", os.Getenv(model.MODE_ENV), model.SERVER_DUBBOGO_CONFIG)); err != nil { if err = os.Setenv(constant.ConfigFileEnvKey, fmt.Sprintf("./conf/%s/%s", os.Getenv(model.MODE_ENV), model.SERVER_DUBBOGO_CONFIG)); err != nil {
return return
} }
} }
iniConf = fmt.Sprintf("./conf/%s", model.SERVER_CONFIG) iniConf = fmt.Sprintf("./conf/%s/%s", os.Getenv(model.MODE_ENV), model.SERVER_CONFIG)
return return
} }

11
pkg/service/account.go
View File

@ -2,6 +2,7 @@ package service
import ( import (
"github.com/exhibition-main/api/account" "github.com/exhibition-main/api/account"
appconfig "github.com/exhibition-main/internal/config"
"github.com/exhibition-main/internal/msg" "github.com/exhibition-main/internal/msg"
"github.com/exhibition-main/internal/response" "github.com/exhibition-main/internal/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -17,10 +18,10 @@ func OnlySend(c *gin.Context) {
response.ResponseQuickMsg(c, msg.Fail, msg.INVALID_PARAMS, nil) response.ResponseQuickMsg(c, msg.Fail, msg.INVALID_PARAMS, nil)
return return
} }
//req.Domain = appconfig.Data.System.Domain req.Domain = appconfig.Data.System.Domain
//req.Scope = "exhibition" req.Scope = "exhibition"
res, err := AccountProvider.SendMsg(c, &req) res, err := AccountProvider.OnlySendMsg(c, &req)
if err != nil { if err != nil {
response.ResponseQuickMsg(c, msg.Fail, err.Error(), nil) response.ResponseQuickMsg(c, msg.Fail, err.Error(), nil)
return return
@ -40,8 +41,8 @@ func OnlyCheck(c *gin.Context) {
return return
} }
//req.Domain = appconfig.Data.System.Domain req.Domain = appconfig.Data.System.Domain
//req.Scope = "exhibition" req.Scope = "exhibition"
res, err := AccountProvider.OnlyCheckMsg(c, &req) res, err := AccountProvider.OnlyCheckMsg(c, &req)
if err != nil { if err != nil {