feat: 修改设置默认页样式

This commit is contained in:
zhengkunwang223 2023-01-03 17:54:26 +08:00 committed by zhengkunwang223
parent 981223d9bc
commit cb90cd1a10
4 changed files with 38 additions and 24 deletions

View file

@ -129,9 +129,7 @@ func (a AppInstallService) Operate(req request.AppInstalledOperate) error {
if err != nil { if err != nil {
return err return err
} }
dockerComposePath := install.GetComposePath() dockerComposePath := install.GetComposePath()
switch req.Operate { switch req.Operate {
case constant.Up: case constant.Up:
out, err := compose.Up(dockerComposePath) out, err := compose.Up(dockerComposePath)

View file

@ -804,6 +804,7 @@ func (w WebsiteService) ChangeDefaultServer(id uint) error {
return err return err
} }
} }
if id > 0 {
website, err := websiteRepo.GetFirst(commonRepo.WithByID(id)) website, err := websiteRepo.GetFirst(commonRepo.WithByID(id))
if err != nil { if err != nil {
return err return err
@ -813,4 +814,6 @@ func (w WebsiteService) ChangeDefaultServer(id uint) error {
} }
website.DefaultServer = true website.DefaultServer = true
return websiteRepo.Save(context.Background(), &website) return websiteRepo.Save(context.Background(), &website)
}
return nil
} }

View file

@ -959,8 +959,9 @@ export default {
nextYear: '一年后', nextYear: '一年后',
allGroup: '所有分组', allGroup: '所有分组',
noLog: '当前没有日志...', noLog: '当前没有日志...',
defaulServer: '默认网站', defaulServer: '默认站点',
noDefaulServer: '当前没有默认网站', noDefaulServer: '未设置',
defaulServerHelper: '设置默认站点后,所有未绑定的域名和IP都被定向到默认站点\n可有效防止恶意解析',
}, },
nginx: { nginx: {
serverNamesHashBucketSizeHelper: '服务器名字的hash表大小', serverNamesHashBucketSizeHelper: '服务器名字的hash表大小',

View file

@ -2,11 +2,14 @@
<el-dialog <el-dialog
v-model="open" v-model="open"
:title="$t('website.defaulServer')" :title="$t('website.defaulServer')"
width="20%" width="25%"
@close="handleClose" @close="handleClose"
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-row>
<el-col :offset="5">
<div style="text-align: center"> <div style="text-align: center">
<el-form-item :label="$t('website.defaulServer')">
<el-select v-model="defaultId"> <el-select v-model="defaultId">
<el-option :value="0" :key="-1" :label="$t('website.noDefaulServer')"></el-option> <el-option :value="0" :key="-1" :label="$t('website.noDefaulServer')"></el-option>
<el-option <el-option
@ -16,7 +19,16 @@
:label="website.primaryDomain" :label="website.primaryDomain"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item>
</div> </div>
</el-col>
<el-alert :closable="false">
<template #default>
<span style="white-space: pre-line">{{ $t('website.defaulServerHelper') }}</span>
</template>
</el-alert>
</el-row>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button> <el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>