diff --git a/gui/src/components/modalSetting.vue b/gui/src/components/modalSetting.vue index 03886748..ce59eec7 100644 --- a/gui/src/components/modalSetting.vue +++ b/gui/src/components/modalSetting.vue @@ -477,7 +477,7 @@ export default { parent: this, component: ModalConfigurePac, hasModalCard: true, - canCancel: false + canCancel: true }); }, handleClickPortWhiteList() { diff --git a/service/service/siteDatFiles.go b/service/service/siteDatFiles.go index d20ac2b7..fafba4b0 100644 --- a/service/service/siteDatFiles.go +++ b/service/service/siteDatFiles.go @@ -22,6 +22,10 @@ func GetSiteDatFiles() (siteDats []siteDat.SiteDat) { continue } if path.Ext(strings.ToLower(f.Name())) == ".dat" { + if f.Name() == "geoip.dat" { + //暂不支持IPDat + continue + } var sd siteDat.SiteDat sd.Filename = f.Name() b, err := ioutil.ReadFile(path.Join(dir, f.Name()))