Explorar o código

关闭info日志

sixian %!s(int64=2) %!d(string=hai) anos
pai
achega
e94eff5825

+ 1 - 1
app/device/dao/optoSensoDao.go

@@ -131,7 +131,7 @@ func (c OptoSensor) getList(optoSensor OptoSensor) []OptoSensorVO {
 	if optoSensor.IsDefault == 1 {
 		where = "and a.is_default=1"
 	}
-	Db.Model(&c).Debug().Raw("SELECT a.*, v3.id brand, v4.id model, lamp.district_name FROM device_opto_sensor a LEFT JOIN device_vendor v3 ON v3.id = a.brand_id LEFT JOIN device_vendor v4 ON v4.id = a.model_id LEFT JOIN device_lamp_pole lamp ON lamp.id = a.lamp_pole_id WHERE a.is_deleted = 0 " + where).Scan(&optoSensorVO)
+	Db.Model(&c).Raw("SELECT a.*, v3.id brand, v4.id model, lamp.district_name FROM device_opto_sensor a LEFT JOIN device_vendor v3 ON v3.id = a.brand_id LEFT JOIN device_vendor v4 ON v4.id = a.model_id LEFT JOIN device_lamp_pole lamp ON lamp.id = a.lamp_pole_id WHERE a.is_deleted = 0 " + where).Scan(&optoSensorVO)
 
 	return optoSensorVO
 }

+ 1 - 1
app/system/dao/role.go

@@ -39,7 +39,7 @@ func (c Role) GetRoles(offset, limit int) ([]Role, int, error) {
 	}
 	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&Roles).Error
 	db1 := Db.Model(&c)
-	db1.Debug().Where("is_deleted = 0").Count(&counts)
+	db1.Where("is_deleted = 0").Count(&counts)
 	return Roles, int(counts), err
 }
 

+ 1 - 1
app/system/dao/user.go

@@ -66,7 +66,7 @@ func (c *User) GetUsers(offset, limit int) ([]User, int64, error) {
 	}
 	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&users).Error
 	db1 := Db.Model(&c)
-	db1.Debug().Where("is_deleted = 0").Count(&counts)
+	db1.Where("is_deleted = 0").Count(&counts)
 	return users, counts, err
 }
 

+ 1 - 1
app/warn/dao/platformAlarmDao.go

@@ -81,7 +81,7 @@ func (a PlatformAlarm) GetMaxIdAndUpDateTime() (int64, string) {
 }
 
 func (a PlatformAlarm) BatchCreate(his []PlatformAlarm) error {
-	db := Db.Debug()
+	db := Db
 	db = db.Clauses(clause.OnConflict{
 		Columns: []clause.Column{{Name: "ID"}}, //  这里的列必须是唯一的,比如主键或是唯一索引
 	})

+ 6 - 2
util/logger/lclog.go

@@ -30,6 +30,10 @@ func InitLog() {
 	//	rotatelogs.WithMaxAge(15*24*time.Hour),    // 文件最大保存时间
 	//	rotatelogs.WithRotationTime(24*time.Hour), // 日志切割时间间隔
 	//)
+	logLevel := logrus.ErrorLevel
+	if config.Instance().Logger.DbShowLog == 1 {
+		logLevel = logrus.InfoLevel
+	}
 	if config.Instance().Logger.Switch == 0 {
 		logFilePath := config.Instance().Logger.Path
 		logFileName := config.Instance().Logger.Name
@@ -54,7 +58,7 @@ func InitLog() {
 			TimestampFormat: "2006-01-02 15:04:05.000",
 		})
 		// 设置日志级别
-		logger.SetLevel(logrus.DebugLevel)
+		logger.SetLevel(logLevel)
 		logger.SetOutput(writer)
 		Logger = logger
 	} else {
@@ -66,7 +70,7 @@ func InitLog() {
 			TimestampFormat: "2006-01-02 15:04:05.000",
 		})
 		// 设置日志级别
-		logger.SetLevel(logrus.DebugLevel)
+		logger.SetLevel(logLevel)
 		logger.SetOutput(es.EWriter)
 		Logger = logger
 	}