mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-10-16 18:36:21 +08:00
feat: 修改设置默认页样式
This commit is contained in:
parent
981223d9bc
commit
cb90cd1a10
4 changed files with 38 additions and 24 deletions
|
@ -129,9 +129,7 @@ func (a AppInstallService) Operate(req request.AppInstalledOperate) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
dockerComposePath := install.GetComposePath()
|
||||
|
||||
switch req.Operate {
|
||||
case constant.Up:
|
||||
out, err := compose.Up(dockerComposePath)
|
||||
|
|
|
@ -804,13 +804,16 @@ func (w WebsiteService) ChangeDefaultServer(id uint) error {
|
|||
return err
|
||||
}
|
||||
}
|
||||
website, err := websiteRepo.GetFirst(commonRepo.WithByID(id))
|
||||
if err != nil {
|
||||
return err
|
||||
if id > 0 {
|
||||
website, err := websiteRepo.GetFirst(commonRepo.WithByID(id))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := updateNginxConfig(constant.NginxScopeServer, []dto.NginxParam{{Name: "listen", Params: []string{"80", "default_server"}}}, &website); err != nil {
|
||||
return err
|
||||
}
|
||||
website.DefaultServer = true
|
||||
return websiteRepo.Save(context.Background(), &website)
|
||||
}
|
||||
if err := updateNginxConfig(constant.NginxScopeServer, []dto.NginxParam{{Name: "listen", Params: []string{"80", "default_server"}}}, &website); err != nil {
|
||||
return err
|
||||
}
|
||||
website.DefaultServer = true
|
||||
return websiteRepo.Save(context.Background(), &website)
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -959,8 +959,9 @@ export default {
|
|||
nextYear: '一年后',
|
||||
allGroup: '所有分组',
|
||||
noLog: '当前没有日志...',
|
||||
defaulServer: '默认网站',
|
||||
noDefaulServer: '当前没有默认网站',
|
||||
defaulServer: '默认站点',
|
||||
noDefaulServer: '未设置',
|
||||
defaulServerHelper: '设置默认站点后,所有未绑定的域名和IP都被定向到默认站点\n可有效防止恶意解析',
|
||||
},
|
||||
nginx: {
|
||||
serverNamesHashBucketSizeHelper: '服务器名字的hash表大小',
|
||||
|
|
|
@ -2,21 +2,33 @@
|
|||
<el-dialog
|
||||
v-model="open"
|
||||
:title="$t('website.defaulServer')"
|
||||
width="20%"
|
||||
width="25%"
|
||||
@close="handleClose"
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<div style="text-align: center">
|
||||
<el-select v-model="defaultId">
|
||||
<el-option :value="0" :key="-1" :label="$t('website.noDefaulServer')"></el-option>
|
||||
<el-option
|
||||
v-for="(website, key) in websites"
|
||||
:key="key"
|
||||
:value="website.id"
|
||||
:label="website.primaryDomain"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<el-row>
|
||||
<el-col :offset="5">
|
||||
<div style="text-align: center">
|
||||
<el-form-item :label="$t('website.defaulServer')">
|
||||
<el-select v-model="defaultId">
|
||||
<el-option :value="0" :key="-1" :label="$t('website.noDefaulServer')"></el-option>
|
||||
<el-option
|
||||
v-for="(website, key) in websites"
|
||||
:key="key"
|
||||
:value="website.id"
|
||||
:label="website.primaryDomain"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</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>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>
|
||||
|
|
Loading…
Add table
Reference in a new issue