diff --git a/weather/apps/initialize.go b/weather/apps/initialize.go index 3aa67a2..d6f0c77 100755 --- a/weather/apps/initialize.go +++ b/weather/apps/initialize.go @@ -29,8 +29,8 @@ func initLogs() { logs.SetLogger(logs.AdapterConsole, `{"level":7}`) } else if beego.BConfig.RunMode == beego.PROD { wd, _ := os.Getwd() - //dir := wd + "/logs/" - dir := wd + "\\logs\\" + dir := wd + "/logs/" + //dir := wd + "\\logs\\" _, err := os.Stat(dir) if os.IsNotExist(err) { os.Mkdir(dir, os.ModePerm) diff --git a/weather/conf/app.conf b/weather/conf/app.conf index faa1be2..c7f64ce 100755 --- a/weather/conf/app.conf +++ b/weather/conf/app.conf @@ -21,7 +21,7 @@ syncFrequencyWeather = "0 16 * * * *" mysqluser = "root" mysqlpass = "Skyinno251," mysqlurls = "192.168.2.18:3306" -mysqldb = "weather" +mysqldb = "gorm" mysqlparams = "charset=utf8mb4&parseTime=True&loc=Local" #连接池空闲 mysqlmaxIdle = 10 diff --git a/weather/logs/sesame.info.log b/weather/logs/sesame.info.log index 23e9c35..5dffde5 100644 --- a/weather/logs/sesame.info.log +++ b/weather/logs/sesame.info.log @@ -1,2 +1,5 @@ 2025/03/01 09:16:03.273 [I] [asm_amd64.s:1650] http server Running on http://:8082 2025/03/01 09:16:19.037 [I] [asm_amd64.s:1650] http server Running on http://:8082 +2025/03/03 13:37:36.152 [I] [asm_amd64.s:1650] http server Running on http://:8082 +2025/03/03 13:41:54.166 [I] [asm_amd64.s:1650] http server Running on http://:8082 +2025/03/03 13:44:25.608 [I] [asm_amd64.s:1650] http server Running on http://:8082 diff --git a/weather/logs/sesame.log b/weather/logs/sesame.log index 6bf7efe..f6db0b4 100644 --- a/weather/logs/sesame.log +++ b/weather/logs/sesame.log @@ -2,3 +2,9 @@ 2025/03/01 09:16:03.273 [I] [asm_amd64.s:1650] http server Running on http://:8082 2025/03/01 09:16:19.032 [N] [initialize.go:21] 数据库注册成功: weather@192.168.2.18:3306 2025/03/01 09:16:19.037 [I] [asm_amd64.s:1650] http server Running on http://:8082 +2025/03/03 13:37:36.148 [N] [initialize.go:21] 数据库注册成功: gorm@192.168.2.18:3306 +2025/03/03 13:37:36.152 [I] [asm_amd64.s:1650] http server Running on http://:8082 +2025/03/03 13:41:54.161 [N] [initialize.go:21] 数据库注册成功: gorm@192.168.2.18:3306 +2025/03/03 13:41:54.166 [I] [asm_amd64.s:1650] http server Running on http://:8082 +2025/03/03 13:44:25.602 [N] [initialize.go:21] 数据库注册成功: gorm@192.168.2.18:3306 +2025/03/03 13:44:25.608 [I] [asm_amd64.s:1650] http server Running on http://:8082 diff --git a/weather/logs/sesame.notice.log b/weather/logs/sesame.notice.log index 6a14207..937e154 100644 --- a/weather/logs/sesame.notice.log +++ b/weather/logs/sesame.notice.log @@ -1,2 +1,5 @@ 2025/03/01 09:16:03.266 [N] [initialize.go:21] 数据库注册成功: weather@192.168.2.18:3306 2025/03/01 09:16:19.032 [N] [initialize.go:21] 数据库注册成功: weather@192.168.2.18:3306 +2025/03/03 13:37:36.148 [N] [initialize.go:21] 数据库注册成功: gorm@192.168.2.18:3306 +2025/03/03 13:41:54.161 [N] [initialize.go:21] 数据库注册成功: gorm@192.168.2.18:3306 +2025/03/03 13:44:25.602 [N] [initialize.go:21] 数据库注册成功: gorm@192.168.2.18:3306 diff --git a/weather/models/NmcCity.go b/weather/models/NmcCity.go index cc44e7b..09b6ab0 100755 --- a/weather/models/NmcCity.go +++ b/weather/models/NmcCity.go @@ -24,3 +24,4 @@ func GetNmcCityList() []*NmcCity { orm.NewOrm().QueryTable(new(NmcCity)).All(&items) return items } + diff --git a/weather/models/NmcProvince.go b/weather/models/NmcProvince.go new file mode 100644 index 0000000..8cf5a0d --- /dev/null +++ b/weather/models/NmcProvince.go @@ -0,0 +1,26 @@ +package models + +import ( + "github.com/astaxie/beego/orm" + "time" +) + +type NmcProvince struct { + Code string `json:"code" orm:"pk;column(code);size(50)"` + Name string `json:"name" orm:"column(name);size(50)"` + Url string `json:"url" orm:"column(url);size(50)"` + CreateDate time.Time `json:"createDate" orm:"column(create_date);auto_now_add;type(datetime)"` + LastUpdateDate time.Time `json:"lastUpdateDate" orm:"column(last_update_date);auto_now;type(datetime)"` +} + +func init() { + orm.RegisterModel(new(NmcProvince)) +} + + +func GetNmcProvinceList() []*NmcProvince { + items := make([]*NmcProvince, 0) + orm.NewOrm().QueryTable(new(NmcCity)).All(&items) + return items +} + diff --git a/weather/service/HttpWeatherService.go b/weather/service/HttpWeatherService.go index b9d6cf7..12ba13a 100755 --- a/weather/service/HttpWeatherService.go +++ b/weather/service/HttpWeatherService.go @@ -12,10 +12,17 @@ import ( type HttpWeatherService struct { } +func SyncNmcCityAndNmcProvince() { + +} + func (s *HttpWeatherService) GetNmcNowWeather() { citys := models.GetNmcCityList() fmt.Println(citys) fmt.Println(len(citys)) + if len(citys)==0 { + SyncNmcCityAndNmcProvince() + } var wg sync.WaitGroup for _, item := range citys { time.Sleep(time.Millisecond * 300) diff --git a/weather/weather b/weather/weather new file mode 100755 index 0000000..5b16bd8 Binary files /dev/null and b/weather/weather differ