Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
enoch
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DevOps
enoch
Commits
f4608fa0
Commit
f4608fa0
authored
Mar 14, 2019
by
Node- 门 忠鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 修改错误配置项
parent
9feca072
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
4 deletions
+6
-4
main.go
main.go
+1
-1
config.go
service/conf/config.go
+1
-0
conf.json
service/conf/dev/conf.json
+1
-1
load_conf.go
service/conf/load_conf.go
+1
-0
influxdb_conf.go
service/data/influxdb_conf.go
+1
-1
redis_conf.go
service/data/redis_conf.go
+1
-1
No files found.
main.go
View file @
f4608fa0
...
@@ -29,7 +29,7 @@ func main() {
...
@@ -29,7 +29,7 @@ func main() {
logger
:=
log
.
New
(
file
,
"[Info]"
,
log
.
LstdFlags
|
log
.
Llongfile
)
logger
:=
log
.
New
(
file
,
"[Info]"
,
log
.
LstdFlags
|
log
.
Llongfile
)
logger
.
Println
(
"项目启动"
+
port
)
logger
.
Println
(
conf
.
GlobalConfig
.
AppName
+
"项目启动, port:"
+
port
+
",环境:"
+
conf
.
GlobalConfig
.
Env
)
defer
logger
.
Println
(
"项目结束"
)
defer
logger
.
Println
(
"项目结束"
)
//初始化redis连接池
//初始化redis连接池
...
...
service/conf/config.go
View file @
f4608fa0
...
@@ -5,6 +5,7 @@ import "time"
...
@@ -5,6 +5,7 @@ import "time"
type
Config
struct
{
type
Config
struct
{
AppName
string
`json:"app_name"`
AppName
string
`json:"app_name"`
Port
string
`json:"port"`
Port
string
`json:"port"`
Env
string
Redis
Redis
`json:"redis"`
Redis
Redis
`json:"redis"`
Kafka
Kafka
`json:"kafka"`
Kafka
Kafka
`json:"kafka"`
InfluxDb
InfluxDb
`json:"influx_db"`
InfluxDb
InfluxDb
`json:"influx_db"`
...
...
service/conf/dev/conf.json
View file @
f4608fa0
...
@@ -13,6 +13,6 @@
...
@@ -13,6 +13,6 @@
},
},
"influx_db"
:
{
"influx_db"
:
{
"host"
:
"http://192.168.4.100"
,
"host"
:
"http://192.168.4.100"
,
"port"
:
"80
6
6"
"port"
:
"80
8
6"
}
}
}
}
service/conf/load_conf.go
View file @
f4608fa0
...
@@ -21,6 +21,7 @@ func Init() {
...
@@ -21,6 +21,7 @@ func Init() {
fmt
.
Println
(
"启动报错:未找到对应的环境变量配置。env: "
+
filename
)
fmt
.
Println
(
"启动报错:未找到对应的环境变量配置。env: "
+
filename
)
}
}
err
=
json
.
Unmarshal
(
bytes
,
&
GlobalConfig
)
err
=
json
.
Unmarshal
(
bytes
,
&
GlobalConfig
)
GlobalConfig
.
Env
=
denv
if
nil
!=
err
{
if
nil
!=
err
{
fmt
.
Println
(
err
)
fmt
.
Println
(
err
)
}
}
...
...
service/data/influxdb_conf.go
View file @
f4608fa0
...
@@ -8,7 +8,7 @@ import (
...
@@ -8,7 +8,7 @@ import (
func
NewClient
()
client
.
Client
{
func
NewClient
()
client
.
Client
{
var
httpConfig
=
client
.
HTTPConfig
{
var
httpConfig
=
client
.
HTTPConfig
{
Addr
:
conf
.
GlobalConfig
.
InfluxDb
.
Host
+
conf
.
GlobalConfig
.
InfluxDb
.
Port
,
Addr
:
conf
.
GlobalConfig
.
InfluxDb
.
Host
+
":"
+
conf
.
GlobalConfig
.
InfluxDb
.
Port
,
}
}
con
,
err
:=
client
.
NewHTTPClient
(
httpConfig
)
con
,
err
:=
client
.
NewHTTPClient
(
httpConfig
)
...
...
service/data/redis_conf.go
View file @
f4608fa0
...
@@ -36,7 +36,7 @@ func newPool(server, password string) *redis.Pool {
...
@@ -36,7 +36,7 @@ func newPool(server, password string) *redis.Pool {
var
(
var
(
Pool
*
redis
.
Pool
Pool
*
redis
.
Pool
redisServer
=
flag
.
String
(
"redisServer"
,
"172.30.12.2:6379"
,
""
)
redisServer
=
flag
.
String
(
"redisServer"
,
conf
.
GlobalConfig
.
Redis
.
Host
+
":"
+
conf
.
GlobalConfig
.
Redis
.
Port
,
""
)
redisPassword
=
flag
.
String
(
"redisPassword"
,
""
,
""
)
redisPassword
=
flag
.
String
(
"redisPassword"
,
""
,
""
)
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment