Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zentaoatf
提交
ac4cb15c
Z
zentaoatf
项目概览
易企天创
/
zentaoatf
11 个月 前同步成功
通知
11
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
3
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Z
zentaoatf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
3
Issue
3
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ac4cb15c
编写于
10月 24, 2022
作者:
雨
雨爱无痕
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue
上级
c32fd36d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
21 deletion
+21
-21
internal/pkg/helper/zentao/zentao.go
internal/pkg/helper/zentao/zentao.go
+15
-1
internal/server/modules/v1/service/proxy.go
internal/server/modules/v1/service/proxy.go
+2
-2
internal/server/modules/v1/service/server.go
internal/server/modules/v1/service/server.go
+2
-2
internal/server/modules/v1/service/site.go
internal/server/modules/v1/service/site.go
+2
-16
未找到文件。
internal/pkg/helper/zentao/zentao.go
浏览文件 @
ac4cb15c
...
...
@@ -2,6 +2,7 @@ package zentaoHelper
import
(
"fmt"
"net/url"
"regexp"
"strings"
...
...
@@ -86,7 +87,7 @@ func ListLang() (langs []serverDomain.ZentaoLang, err error) {
return
}
func
Fix
Site
Url
(
url
string
)
(
ret
string
)
{
func
FixUrl
(
url
string
)
(
ret
string
)
{
regx
:=
regexp
.
MustCompile
(
`(http|https):\/\/.+`
)
result
:=
regx
.
FindStringSubmatch
(
url
)
if
result
==
nil
{
...
...
@@ -108,3 +109,16 @@ func FixSiteUrl(url string) (ret string) {
return
}
func
FixSiteUrl
(
orginUrl
string
)
(
ret
string
)
{
u
,
_
:=
url
.
Parse
(
orginUrl
)
ret
=
fmt
.
Sprintf
(
"%s://%s"
,
u
.
Scheme
,
u
.
Host
)
if
u
.
Port
()
!=
""
{
ret
+=
":"
+
u
.
Port
()
}
ret
+=
"/"
if
u
.
Path
[
:
8
]
==
"/zentao/"
{
ret
=
ret
+
"zentao/"
}
return
}
internal/server/modules/v1/service/proxy.go
浏览文件 @
ac4cb15c
...
...
@@ -29,7 +29,7 @@ func (s *ProxyService) Get(id uint) (proxy model.Proxy, err error) {
}
func
(
s
*
ProxyService
)
Create
(
proxy
model
.
Proxy
)
(
id
uint
,
err
error
)
{
proxy
.
Path
=
zentaoHelper
.
Fix
Site
Url
(
proxy
.
Path
)
proxy
.
Path
=
zentaoHelper
.
FixUrl
(
proxy
.
Path
)
if
proxy
.
Path
==
""
{
err
=
errors
.
New
(
i118Utils
.
Sprintf
(
"wrong_url_format"
))
return
...
...
@@ -44,7 +44,7 @@ func (s *ProxyService) Create(proxy model.Proxy) (id uint, err error) {
}
func
(
s
*
ProxyService
)
Update
(
proxy
model
.
Proxy
)
(
err
error
)
{
proxy
.
Path
=
zentaoHelper
.
Fix
Site
Url
(
proxy
.
Path
)
proxy
.
Path
=
zentaoHelper
.
FixUrl
(
proxy
.
Path
)
if
proxy
.
Path
==
""
{
err
=
errors
.
New
(
i118Utils
.
Sprintf
(
"wrong_url_format"
))
return
...
...
internal/server/modules/v1/service/server.go
浏览文件 @
ac4cb15c
...
...
@@ -29,7 +29,7 @@ func (s *ServerService) Get(id uint) (server model.Server, err error) {
}
func
(
s
*
ServerService
)
Create
(
server
model
.
Server
)
(
id
uint
,
err
error
)
{
server
.
Path
=
zentaoHelper
.
Fix
Site
Url
(
server
.
Path
)
server
.
Path
=
zentaoHelper
.
FixUrl
(
server
.
Path
)
if
server
.
Path
==
""
{
err
=
errors
.
New
(
i118Utils
.
Sprintf
(
"wrong_url_format"
))
return
...
...
@@ -44,7 +44,7 @@ func (s *ServerService) Create(server model.Server) (id uint, err error) {
}
func
(
s
*
ServerService
)
Update
(
server
model
.
Server
)
(
err
error
)
{
server
.
Path
=
zentaoHelper
.
Fix
Site
Url
(
server
.
Path
)
server
.
Path
=
zentaoHelper
.
FixUrl
(
server
.
Path
)
if
server
.
Path
==
""
{
err
=
errors
.
New
(
i118Utils
.
Sprintf
(
"wrong_url_format"
))
return
...
...
internal/server/modules/v1/service/site.go
浏览文件 @
ac4cb15c
...
...
@@ -51,16 +51,10 @@ func (s *SiteService) Create(site model.Site) (id uint, isDuplicate bool, err er
}
site
.
Url
=
fileUtils
.
AddUrlPathSepIfNeeded
(
site
.
Url
)
config
:=
configHelper
.
LoadBySite
(
site
)
err
=
zentaoHelper
.
Login
(
config
)
if
err
!=
nil
{
config
.
Url
+=
"zentao/"
site
.
Url
+=
"zentao/"
err
=
zentaoHelper
.
Login
(
config
)
if
err
!=
nil
{
return
}
return
}
id
,
isDuplicate
,
err
=
s
.
SiteRepo
.
Create
(
&
site
)
...
...
@@ -74,18 +68,10 @@ func (s *SiteService) Update(site model.Site) (isDuplicate bool, err error) {
err
=
errors
.
New
(
"url not right"
)
return
}
site
.
Url
=
fileUtils
.
AddUrlPathSepIfNeeded
(
site
.
Url
)
config
:=
configHelper
.
LoadBySite
(
site
)
err
=
zentaoHelper
.
Login
(
config
)
if
err
!=
nil
{
config
.
Url
+=
"zentao/"
site
.
Url
+=
"zentao/"
err
=
zentaoHelper
.
Login
(
config
)
if
err
!=
nil
{
return
}
return
}
isDuplicate
,
err
=
s
.
SiteRepo
.
Update
(
site
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录