ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.2

Browse Source
This commit is contained in:
DEKA_123 2023-08-08 13:34:29 +08:00
commit fe7f8bd692
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
global/redis.go
View File

@ -18,8 +18,8 @@ func SetupRedisConnection() error {
a := fmt.Sprintf("%s:%d", config.RedisSettings.Host, config.RedisSettings.Port) a := fmt.Sprintf("%s:%d", config.RedisSettings.Host, config.RedisSettings.Port)
fmt.Println(a) fmt.Println(a)
Rd, err = rueidis.NewClient(rueidis.ClientOption{ Rd, err = rueidis.NewClient(rueidis.ClientOption{
InitAddress: []string{"192.168.88.129:6379"}, InitAddress: []string{"127.0.0.1:6379"},
Password: "123456", Password: "",
SelectDB: config.RedisSettings.DB, SelectDB: config.RedisSettings.DB,
DisableCache: true, DisableCache: true,
}) })

3
repository/meter.go
View File

@ -524,6 +524,9 @@ func (mr _MeterRepository) ListPooledMeterRelationsByCodes(pid string, codes []s
defer cancel() defer cancel()
var relations []*model.MeterRelation var relations []*model.MeterRelation
if len(codes) <= 0 {
return relations, nil
}
relationsSql, relationsArgs, _ := mr.ds. relationsSql, relationsArgs, _ := mr.ds.
From(goqu.T("meter_relations").As("r")). From(goqu.T("meter_relations").As("r")).
Select("r.*"). Select("r.*").

4
settings.yaml
View File

@ -12,9 +12,9 @@ Server:
ReadTimeout: 60 ReadTimeout: 60
WriteTimeout: 60 WriteTimeout: 60
Redis: Redis:
Host: 192.168.88.129 Host: 127.0.0.1
Port: 6379 Port: 6379
Password: 123456 Password:
DB: 1 DB: 1
Service: Service:
MaxSessionLife: 2h MaxSessionLife: 2h