gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-28 19:14:13 +08:00
Code

feat: merge ai from dev (#7986)

Browse Source
This commit is contained in:
zhengkunwang 2025-02-25 14:16:10 +08:00 committed by GitHub
parent 90eca45347
commit ec746c021a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 105 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
agent/app/dto/ai.go
View File

@ -36,9 +36,10 @@ type OllamaBindDomainReq struct {
} }
type OllamaBindDomainRes struct { type OllamaBindDomainRes struct {
Domain string `json:"domain"` Domain string `json:"domain"`
SSLID uint `json:"sslID"` SSLID uint `json:"sslID"`
AllowIPs []string `json:"allowIPs"` AllowIPs []string `json:"allowIPs"`
WebsiteID uint `json:"websiteID"` WebsiteID uint `json:"websiteID"`
ConnUrl string `json:"connUrl"` ConnUrl string `json:"connUrl"`
AcmeAccountID uint `json:"acmeAccountID"`
} }

24
agent/app/service/ai.go
View File

@ -61,7 +61,7 @@ func (u *AIToolService) Search(req dto.SearchWithPage) (int64, []dto.OllamaModel
} }
dtoLists = append(dtoLists, item) dtoLists = append(dtoLists, item)
} }
return int64(total), dtoLists, err return total, dtoLists, err
} }
func (u *AIToolService) LoadDetail(name string) (string, error) { func (u *AIToolService) LoadDetail(name string) (string, error) {
@ -244,14 +244,18 @@ func (u *AIToolService) BindDomain(req dto.OllamaBindDomain) error {
} }
} }
createWebsiteReq := request.WebsiteCreate{ createWebsiteReq := request.WebsiteCreate{
Domains: []request.WebsiteDomain{{Domain: req.Domain}}, Domains: []request.WebsiteDomain{{Domain: req.Domain, Port: 80}},
Alias: strings.ToLower(req.Domain), Alias: strings.ToLower(req.Domain),
Type: constant.Deployment, Type: constant.Deployment,
AppType: constant.InstalledApp, AppType: constant.InstalledApp,
AppInstallID: req.AppInstallID, AppInstallID: req.AppInstallID,
} }
if req.SSLID > 0 {
createWebsiteReq.WebsiteSSLID = req.SSLID
createWebsiteReq.EnableSSL = true
}
websiteService := NewIWebsiteService() websiteService := NewIWebsiteService()
if err := websiteService.CreateWebsite(createWebsiteReq); err != nil { if err = websiteService.CreateWebsite(createWebsiteReq); err != nil {
return err return err
} }
website, err := websiteRepo.GetFirst(websiteRepo.WithAlias(strings.ToLower(req.Domain))) website, err := websiteRepo.GetFirst(websiteRepo.WithAlias(strings.ToLower(req.Domain)))
@ -263,18 +267,6 @@ func (u *AIToolService) BindDomain(req dto.OllamaBindDomain) error {
return err return err
} }
} }
if req.SSLID > 0 {
sslReq := request.WebsiteHTTPSOp{
WebsiteID: website.ID,
Enable: true,
Type: "existed",
WebsiteSSLID: req.SSLID,
HttpConfig: "HTTPSOnly",
}
if _, err = websiteService.OpWebsiteHTTPS(context.Background(), sslReq); err != nil {
return err
}
}
if err = ConfigAIProxy(website); err != nil { if err = ConfigAIProxy(website); err != nil {
return err return err
} }
@ -295,6 +287,8 @@ func (u *AIToolService) GetBindDomain(req dto.OllamaBindDomainReq) (*dto.OllamaB
res.Domain = website.PrimaryDomain res.Domain = website.PrimaryDomain
if website.WebsiteSSLID > 0 { if website.WebsiteSSLID > 0 {
res.SSLID = website.WebsiteSSLID res.SSLID = website.WebsiteSSLID
ssl, _ := websiteSSLRepo.GetFirst(repo.WithByID(website.WebsiteSSLID))
res.AcmeAccountID = ssl.AcmeAccountID
} }
res.ConnUrl = fmt.Sprintf("%s://%s", strings.ToLower(website.Protocol), website.PrimaryDomain) res.ConnUrl = fmt.Sprintf("%s://%s", strings.ToLower(website.Protocol), website.PrimaryDomain)
res.AllowIPs = GetAllowIps(website) res.AllowIPs = GetAllowIps(website)

1
frontend/src/api/interface/ai.ts
View File

@ -107,5 +107,6 @@ export namespace AI {
allowIPs: string[]; allowIPs: string[];
websiteID?: number; websiteID?: number;
connUrl: string; connUrl: string;
acmeAccountID: number;
} }
} }

11
frontend/src/components/app-status/index.vue
View File

@ -116,7 +116,15 @@ let refresh = ref(1);
const httpPort = ref(0); const httpPort = ref(0);
const httpsPort = ref(0); const httpsPort = ref(0);
const em = defineEmits(['setting', 'isExist', 'before', 'after', 'update:loading', 'update:maskShow']); const em = defineEmits([
'setting',
'isExist',
'before',
'after',
'update:loading',
'update:maskShow',
'update:appInstallID',
]);
const setting = () => { const setting = () => {
em('setting', false); em('setting', false);
}; };
@ -128,6 +136,7 @@ const onCheck = async (key: any, name: any) => {
em('isExist', res.data); em('isExist', res.data);
em('update:maskShow', res.data.status !== 'Running'); em('update:maskShow', res.data.status !== 'Running');
operateReq.installId = res.data.appInstallId; operateReq.installId = res.data.appInstallId;
em('update:appInstallID', res.data.appInstallId);
httpPort.value = res.data.httpPort; httpPort.value = res.data.httpPort;
httpsPort.value = res.data.httpsPort; httpsPort.value = res.data.httpsPort;
refresh.value++; refresh.value++;

176
frontend/src/views/ai/model/domain/index.vue
View File

@ -1,98 +1,81 @@
<template> <template>
<DrawerPro v-model="open" :title="$t('aiTools.proxy.proxy')" :back="handleClose" size="large"> <DrawerPro v-model="open" :header="$t('aiTools.proxy.proxy')" :back="handleClose" size="large">
<div v-loading="loading"> <div v-loading="loading">
<el-form ref="formRef" label-position="top" @submit.prevent :model="req" :rules="rules"> <el-form ref="formRef" label-position="top" @submit.prevent :model="req" :rules="rules">
<el-row type="flex" justify="center"> <el-alert class="common-prompt" :closable="false" type="warning">
<el-col :span="22"> <template #default>
<el-alert class="common-prompt" :closable="false" type="warning"> <ul>
<template #default> <li>{{ $t('aiTools.proxy.proxyHelper1') }}</li>
<ul> <li>{{ $t('aiTools.proxy.proxyHelper2') }}</li>
<li>{{ $t('aiTools.proxy.proxyHelper1') }}</li> <li>{{ $t('aiTools.proxy.proxyHelper3') }}</li>
<li>{{ $t('aiTools.proxy.proxyHelper2') }}</li> </ul>
<li>{{ $t('aiTools.proxy.proxyHelper3') }}</li> </template>
</ul> </el-alert>
</template> <el-form-item :label="$t('website.domain')" prop="domain">
</el-alert> <el-input v-model.trim="req.domain" :disabled="operate === 'update'" />
<el-form-item :label="$t('website.domain')" prop="domain"> <span class="input-help">
<el-input v-model.trim="req.domain" :disabled="operate === 'update'" /> {{ $t('aiTools.proxy.proxyHelper4') }}
<span class="input-help"> </span>
{{ $t('aiTools.proxy.proxyHelper4') }} <span class="input-help">
</span> {{ $t('aiTools.proxy.proxyHelper6') }}
<span class="input-help"> <el-link class="pageRoute" icon="Position" @click="toWebsite(req.websiteID)" type="primary">
{{ $t('aiTools.proxy.proxyHelper6') }} {{ $t('firewall.quickJump') }}
<el-link </el-link>
class="pageRoute" </span>
icon="Position" </el-form-item>
@click="toWebsite(req.websiteID)" <el-form-item :label="$t('xpack.waf.whiteList') + ' IP'" prop="ipList">
type="primary" <el-input
> :rows="3"
{{ $t('firewall.quickJump') }} type="textarea"
</el-link> clearable
</span> v-model="req.ipList"
</el-form-item> :placeholder="$t('xpack.waf.ipGroupHelper')"
<el-form-item :label="$t('xpack.waf.whiteList') + ' IP'" prop="ipList"> />
<el-input <span class="input-help">
:rows="3" {{ $t('aiTools.proxy.whiteListHelper') }}
type="textarea" </span>
clearable </el-form-item>
v-model="req.ipList" <el-form-item>
:placeholder="$t('xpack.waf.ipGroupHelper')" <el-checkbox v-model="req.enableSSL" @change="changeSSL">
/> {{ $t('website.enable') + ' ' + 'HTTPS' }}
<span class="input-help"> </el-checkbox>
{{ $t('aiTools.proxy.whiteListHelper') }} </el-form-item>
</span> <el-form-item :label="$t('website.acmeAccountManage')" prop="acmeAccountID" v-if="req.enableSSL">
</el-form-item> <el-select v-model="req.acmeAccountID" :placeholder="$t('website.selectAcme')" @change="loadSSL">
<el-form-item> <el-option :key="0" :label="$t('website.imported')" :value="0"></el-option>
<el-checkbox v-model="req.enableSSL" @change="changeSSL"> <el-option
{{ $t('website.enable') + ' ' + 'HTTPS' }} v-for="(acme, index) in acmeAccounts"
</el-checkbox> :key="index"
</el-form-item> :label="acme.email"
<el-form-item :value="acme.id"
:label="$t('website.acmeAccountManage')"
prop="acmeAccountID"
v-if="req.enableSSL"
> >
<el-select <span>
v-model="req.acmeAccountID" {{ acme.email }}
:placeholder="$t('website.selectAcme')" <el-tag class="ml-5">{{ getAccountName(acme.type) }}</el-tag>
@change="listSSL" </span>
> </el-option>
<el-option :key="0" :label="$t('website.imported')" :value="0"></el-option> </el-select>
<el-option </el-form-item>
v-for="(acme, index) in acmeAccounts" <el-form-item :label="$t('website.ssl')" prop="sslID" v-if="req.enableSSL">
:key="index" <el-select
:label="acme.email" v-model="req.sslID"
:value="acme.id" :placeholder="$t('website.selectSSL')"
> @change="changeSSl(req.sslID)"
<span> >
{{ acme.email }} <el-option
<el-tag class="ml-5">{{ getAccountName(acme.type) }}</el-tag> v-for="(ssl, index) in ssls"
</span> :key="index"
</el-option> :label="ssl.primaryDomain"
</el-select> :value="ssl.id"
</el-form-item> ></el-option>
<el-form-item :label="$t('website.ssl')" prop="sslID" v-if="req.enableSSL"> </el-select>
<el-select </el-form-item>
v-model="req.sslID" <el-alert :closable="false">
:placeholder="$t('website.selectSSL')" {{ $t('aiTools.proxy.proxyHelper5') }}
@change="changeSSl(req.sslID)" <el-link class="pageRoute" icon="Position" @click="toInstalled()" type="primary">
> {{ $t('firewall.quickJump') }}
<el-option </el-link>
v-for="(ssl, index) in ssls" </el-alert>
:key="index"
:label="ssl.primaryDomain"
:value="ssl.id"
></el-option>
</el-select>
</el-form-item>
<el-alert :closable="false">
{{ $t('aiTools.proxy.proxyHelper5') }}
<el-link class="pageRoute" icon="Position" @click="toInstalled()" type="primary">
{{ $t('firewall.quickJump') }}
</el-link>
</el-alert>
</el-col>
</el-row>
</el-form> </el-form>
</div> </div>
<template #footer> <template #footer>
@ -134,6 +117,9 @@ const req = ref({
appInstallID: 0, appInstallID: 0,
websiteID: 0, websiteID: 0,
}); });
const sslReq = reactive({
acmeAccountID: '',
});
const rules = reactive<FormRules>({ const rules = reactive<FormRules>({
domain: [Rules.domainWithPort], domain: [Rules.domainWithPort],
sslID: [Rules.requiredSelectBusiness], sslID: [Rules.requiredSelectBusiness],
@ -167,9 +153,7 @@ const changeSSL = () => {
}; };
const loadSSL = () => { const loadSSL = () => {
const sslReq = { sslReq.acmeAccountID = String(req.value.acmeAccountID);
acmeAccountID: String(req.value.acmeAccountID),
};
listSSL(sslReq).then((res) => { listSSL(sslReq).then((res) => {
ssls.value = res.data || []; ssls.value = res.data || [];
if (ssls.value.length > 0) { if (ssls.value.length > 0) {
@ -193,9 +177,6 @@ const loadSSL = () => {
const listAcmeAccount = () => { const listAcmeAccount = () => {
searchAcmeAccount({ page: 1, pageSize: 100 }).then((res) => { searchAcmeAccount({ page: 1, pageSize: 100 }).then((res) => {
acmeAccounts.value = res.data.items || []; acmeAccounts.value = res.data.items || [];
if (acmeAccounts.value.length > 0) {
req.value.acmeAccountID = acmeAccounts.value[0].id;
}
loadSSL(); loadSSL();
}); });
}; };
@ -229,6 +210,7 @@ const search = async (appInstallID: number) => {
if (res.data.sslID > 0) { if (res.data.sslID > 0) {
req.value.enableSSL = true; req.value.enableSSL = true;
req.value.sslID = res.data.sslID; req.value.sslID = res.data.sslID;
req.value.acmeAccountID = res.data.acmeAccountID;
listAcmeAccount(); listAcmeAccount();
} }
} }