Compare commits

..

No commits in common. "0e31e6da8de0e3d6a438f38da035d4cda66334ef" and "19afa0fc7ce65f099f7d73a11cc35278bd814f49" have entirely different histories.

View File

@ -188,15 +188,7 @@ func (r *UserCaCertService) AddHospitalCloudCert(tx *gorm.DB) (bool, error) {
maps["type"] = 2 maps["type"] = 2
userCaCert, _ := userCaCertDao.GetUserCaCert(maps) userCaCert, _ := userCaCertDao.GetUserCaCert(maps)
if userCaCert != nil { if userCaCert != nil {
if time.Time(userCaCert.CertExpireTime).IsZero() { return false, errors.New("医院存在正常使用的云证书,请注销后重新申请")
return false, errors.New("医院云证书过期时间错误")
}
now := time.Now()
certExpireTime := time.Time(userCaCert.CertExpireTime)
if now.Before(certExpireTime) {
return false, errors.New("医院云证书还未过期")
}
} }
// 申请云证书 // 申请云证书
@ -222,13 +214,6 @@ func (r *UserCaCertService) AddHospitalCloudCert(tx *gorm.DB) (bool, error) {
return false, errors.New(err.Error()) return false, errors.New(err.Error())
} }
// 到期时间-测试180正式365
CertExpireTime := model.LocalTime(time.Now().AddDate(0, 0, 180))
if config.C.Env == "prod" {
CertExpireTime = model.LocalTime(time.Now().AddDate(0, 0, 365))
}
if userCaCert == nil {
// 新增ca监管证书表 // 新增ca监管证书表
userCaCert = &model.UserCaCert{ userCaCert = &model.UserCaCert{
UserId: &userId, UserId: &userId,
@ -249,19 +234,6 @@ func (r *UserCaCertService) AddHospitalCloudCert(tx *gorm.DB) (bool, error) {
if err != nil || userCaCert == nil { if err != nil || userCaCert == nil {
return false, errors.New(err.Error()) return false, errors.New(err.Error())
} }
} else {
// 修改ca监管证书表
data := make(map[string]interface{})
data["cert_base64"] = cloudCertResponse.CertBase64
data["cert_chain_p7"] = cloudCertResponse.CertP7
data["cert_serial_number"] = cloudCertResponse.CertSerialnumber
data["cert_application_time"] = model.LocalTime(time.Now())
data["cert_expire_time"] = CertExpireTime
err = userCaCertDao.EditUserCaCertById(tx, userCaCert.CertId, data)
if err != nil {
return false, errors.New("审核失败")
}
}
return true, nil return true, nil
} }