Skip to content

Commit ddaaeb3

Browse files
committed
update:test
1 parent da86341 commit ddaaeb3

File tree

3 files changed

+70
-20
lines changed

3 files changed

+70
-20
lines changed

config/config.go

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,7 @@ func LoadConfig() (err error) {
1919
}
2020
_, err = os.Stat(DefaultConfigFilePath)
2121
if err != nil {
22-
log.Println("没有找到配置文件:", DefaultConfigFilePath)
23-
log.Println("开始生成默认的空白配置文件")
24-
ConfigMode.Common.BindAddr = DefaultBindAddr
25-
ConfigMode.Common.KcpPort = DefaultKcpPort
26-
ConfigMode.Common.TcpPort = DefaultTcpPort
27-
ConfigMode.Common.TlsPort = DefaultTlsPort
28-
ConfigMode.Common.GrpcPort = DefaultGrpcPort
29-
ConfigMode.Common.HttpPort = DefaultHttpPort
30-
ConfigMode.Common.HttpsPort = DefaultHttpsPort
31-
ConfigMode.Common.UdpApiPort = DefaultUdpApiPort
32-
ConfigMode.Common.KcpApiPort = DefaultKcpApiPort
33-
ConfigMode.Security.LoginKey = DefaultLoginKey
34-
// 生成配置文件模板
35-
err = writeConfigFile(ConfigMode, DefaultConfigFilePath)
36-
if err != nil {
37-
log.Printf("写入默认的配置文件失败:%s\n", err.Error())
38-
return
39-
}
40-
log.Println("配置文件写入成功,路径为:", DefaultConfigFilePath)
41-
log.Println("你也可以修改上述配置文件后在运行")
22+
InitConfigFile()
4223
}
4324
log.Println("使用配置文件:", DefaultConfigFilePath)
4425
ConfigMode, err = GetConfig(DefaultConfigFilePath)
@@ -48,6 +29,30 @@ func LoadConfig() (err error) {
4829
return
4930
}
5031

32+
func InitConfigFile() {
33+
var err error
34+
log.Println("没有找到配置文件:", DefaultConfigFilePath)
35+
log.Println("开始生成默认的空白配置文件")
36+
ConfigMode.Common.BindAddr = DefaultBindAddr
37+
ConfigMode.Common.KcpPort = DefaultKcpPort
38+
ConfigMode.Common.TcpPort = DefaultTcpPort
39+
ConfigMode.Common.TlsPort = DefaultTlsPort
40+
ConfigMode.Common.GrpcPort = DefaultGrpcPort
41+
ConfigMode.Common.HttpPort = DefaultHttpPort
42+
ConfigMode.Common.HttpsPort = DefaultHttpsPort
43+
ConfigMode.Common.UdpApiPort = DefaultUdpApiPort
44+
ConfigMode.Common.KcpApiPort = DefaultKcpApiPort
45+
ConfigMode.Security.LoginKey = DefaultLoginKey
46+
// 生成配置文件模板
47+
err = writeConfigFile(ConfigMode, DefaultConfigFilePath)
48+
if err != nil {
49+
log.Printf("写入默认的配置文件失败:%s\n", err.Error())
50+
return
51+
}
52+
log.Println("配置文件写入成功,路径为:", DefaultConfigFilePath)
53+
log.Println("你也可以修改上述配置文件后在运行")
54+
}
55+
5156
//从配置文件路径解析配置文件的内容
5257
func GetConfig(configFilePath string) (configMode models.ServerConfig, err error) {
5358
content, err := ioutil.ReadFile(configFilePath)

main.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@ func main() {
4040
Name: "generate",
4141
Aliases: []string{"g"},
4242
Usage: "generate one token for gateway and one token for OpenIoTHub",
43+
Flags: []cli.Flag{
44+
&cli.StringFlag{
45+
Name: "config",
46+
Aliases: []string{"c"},
47+
Value: config.DefaultConfigFilePath,
48+
Usage: "config file path",
49+
EnvVars: []string{"GatewayConfigFilePath"},
50+
Destination: &config.DefaultConfigFilePath,
51+
},
52+
},
4353
Action: func(c *cli.Context) error {
4454
err := config.LoadConfig()
4555
if err != nil {
@@ -60,6 +70,25 @@ func main() {
6070
return nil
6171
},
6272
},
73+
{
74+
Name: "init",
75+
Aliases: []string{"i"},
76+
Usage: "init config file",
77+
Flags: []cli.Flag{
78+
&cli.StringFlag{
79+
Name: "config",
80+
Aliases: []string{"c"},
81+
Value: config.DefaultConfigFilePath,
82+
Usage: "config file path",
83+
EnvVars: []string{"GatewayConfigFilePath"},
84+
Destination: &config.DefaultConfigFilePath,
85+
},
86+
},
87+
Action: func(c *cli.Context) error {
88+
config.InitConfigFile()
89+
return nil
90+
},
91+
},
6392
}
6493
myApp.Action = func(c *cli.Context) error {
6594
err := run()

test/main.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package main
2+
3+
import (
4+
"fmt"
5+
"github.com/OpenIoTHub/utils/models"
6+
"log"
7+
)
8+
9+
func main() {
10+
t, err := models.DecodeToken("123abc", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJSdW5JZCI6IjBiYmM1NWRkLWNhNzAtNGRhNC1iNDAzLTRmODQ3MThkNWEyNCIsIkhvc3QiOiIzNi42My4zOS4xODUiLCJUY3BQb3J0IjozNDMyMCwiS2NwUG9ydCI6MzQzMjAsIlRsc1BvcnQiOjM0MzIxLCJHcnBjUG9ydCI6MzQzMjIsIlVEUEFwaVBvcnQiOjM0MzIxLCJLQ1BBcGlQb3J0IjozNDMyMiwiUGVybWlzc2lvbiI6MSwiZXhwIjoyMDE1OTU3NzU5OTIsIm5iZiI6MTU5NTc0NzE5Mn0.COUJwk3x6RoHZ-ajeOGqTsek9BinwLxjAlgRDriI_Wc")
11+
if err != nil {
12+
log.Println(err)
13+
return
14+
}
15+
fmt.Println(t)
16+
}

0 commit comments

Comments
 (0)