11 Commits

Author SHA1 Message Date
53ba8780ff update version code 2023-09-26 13:13:10 +08:00
0dc6d9bc12 solve http login issue 2023-09-26 13:11:38 +08:00
a8165c9b93 Merge remote-tracking branch 'origin/main' 2023-09-26 10:44:12 +08:00
bd83acef45 update readme 2023-09-26 10:44:01 +08:00
杨黄林
b18d06d83d remove cert 2023-09-26 00:39:24 +08:00
杨黄林
eef4390878 Merge remote-tracking branch 'origin/main' 2023-09-25 22:59:33 +08:00
杨黄林
621893872d update page color 2023-09-25 22:59:23 +08:00
8d61054332 update tips 2023-09-22 15:33:05 +08:00
7cf43c869a update tip 2023-09-22 15:31:17 +08:00
70bddc6c1b customize scrollbar background color 2023-09-21 15:00:36 +08:00
db0a36fc00 update 404 tips 2023-09-20 14:58:41 +08:00
9 changed files with 40 additions and 83 deletions

View File

@@ -85,7 +85,7 @@ dashboard_pwd = "admin"
enable = false
```
3. 运行 frps-panel指定监听地址以及 token 存储文件路径。
3. 运行 frps-panel指定配置文件路径。
`./frps-panel -c ./frps-panel.toml`

View File

@@ -1,3 +1,7 @@
::-webkit-scrollbar-thumb {
background: rgba(199, 199, 199, 0.8);
}
.layui-bg-blue {
background-color: #58b7ff !important;
}
@@ -29,6 +33,10 @@
border-color: #ff5722 !important;
}
.layui-laypage a:hover {
color: #409eff;
}
.layui-laypage .layui-laypage-curr .layui-laypage-em {
background-color: #409eff;
}
@@ -132,6 +140,10 @@ section.proxy-list .proxy-info .layui-row .layui-row > div:first-child {
}
@media (prefers-color-scheme: dark) {
::-webkit-scrollbar-thumb {
background: rgba(107, 107, 107, 0.8);
}
.login-title,
.login-title a {
color: #99a9bf !important;
@@ -164,6 +176,10 @@ section.proxy-list .proxy-info .layui-row .layui-row > div:first-child {
box-shadow: none;
}
.layui-laypage a:hover {
color: #4f80a1;
}
.layui-laypage .layui-laypage-curr .layui-laypage-em {
background-color: #4f80a1;
}

View File

@@ -1,3 +1,13 @@
::-webkit-scrollbar {
width: 8px;
height: 8px;
}
::-webkit-scrollbar-thumb {
border-radius: 4px;
transition: 0.3s ease-in-out;
}
html, body {
padding: 0;
word-break: break-all;

View File

@@ -12,7 +12,7 @@ import (
"strings"
)
const version = "1.7.0"
const version = "1.7.1"
var (
showVersion bool

View File

@@ -1,46 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIDwDCCAqigAwIBAgIIYb+7dG3vm+swDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
BhMCQ04xFzAVBgNVBAoTDktleU1hbmFnZXIub3JnMTEwLwYDVQQLEyhLZXlNYW5h
Z2VyIFRlc3QgUm9vdCAtIEZvciBUZXN0IFVzZSBPbmx5MR8wHQYDVQQDExZLZXlN
YW5hZ2VyIFRlc3QgUlNBIENBMB4XDTIzMDkxMTA5NTY0NloXDTI0MDkxMTA5NTY0
NlowJjELMAkGA1UEBhMCQ04xFzAVBgNVBAMTDmxvY2FsaG9zdDo3MjAwMIIBIjAN
BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqp/BNnNx4OGqJHNLN0GX8MDUO4PI
WJ9rq6by65i2RXd4t51yyOH68l/TNmfCXcUQ91SvBBD+P2dK2gkZOlprDOS3tO+G
sCTAAEf/tv1+N2ZqDUPKwaIH60seDJd2a3A97KtfySFVrCUrlTeB/tPL5XMBFwTT
xPvfV6RULAaK6lJGdrM9/k/vYfneE+ZY5Bo1b7kaqZLOz9LW3icarPGcFDIes/Lu
d3sCbpjza0bAKFy594vIdwqjRY4OHdubwXV3wV/AxgA0tQNyYADFwa3YeSvBsfFq
PortWOAYKrg86RJJ8ilQumNiEs6FSYnSatbjMkKh7q9EerJf/exlW1IzDQIDAQAB
o4GdMIGaMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
BQUHAwIwHQYDVR0OBBYEFJFGsaMxKCw1E2r2NC+PxdiI4p/VMB8GA1UdIwQYMBaA
FIBNaqqKRqtaWv5Us+XACf5jiY2rMCkGA1UdEQQiMCCCDmxvY2FsaG9zdDo3MjAw
gg4xMjcuMC4wLjE6NzIwMDANBgkqhkiG9w0BAQsFAAOCAQEAhuNAScvlzJKL4aAm
bPl6Yru85GZZk+QmL8tICT9rxfq5L/5RhZXuTIqBDLB+ETHq5yQdiUJTphMpq2i3
UZUzSMkUFokLROKWaENJz82RWYPUGNLqUO7vTIy2HGd4qOYjWDlHba7d9UIRTcKx
1pd4rqXRTka1rprmoBcSNgcFDcKmctgliOPFqa9V89xrWSznahNqRqdkvbzuuHFz
oZHKsTBzZ65Mk/E5+EdOYgEPg4kBfBMP7LXabUYCON1ArekRUHS1QJ0yCrzDpUxu
0XnFTHaoBtP2o7tqmRQk78/8UkqOkz8241p2Tl8n3YZDiJbrv6okTPe+c/m9xD37
2kwdDg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIID2jCCAsKgAwIBAgIIcAbJXpLHgDkwDQYJKoZIhvcNAQELBQAwezELMAkGA1UE
BhMCQ04xFzAVBgNVBAoTDktleU1hbmFnZXIub3JnMTEwLwYDVQQLEyhLZXlNYW5h
Z2VyIFRlc3QgUm9vdCAtIEZvciBUZXN0IFVzZSBPbmx5MSAwHgYDVQQDExdLZXlN
YW5hZ2VyIFRlc3QgUm9vdCBDQTAeFw0yMzA5MTEwOTEzNTFaFw0zMzA5MTEwOTEz
NTFaMHoxCzAJBgNVBAYTAkNOMRcwFQYDVQQKEw5LZXlNYW5hZ2VyLm9yZzExMC8G
A1UECxMoS2V5TWFuYWdlciBUZXN0IFJvb3QgLSBGb3IgVGVzdCBVc2UgT25seTEf
MB0GA1UEAxMWS2V5TWFuYWdlciBUZXN0IFJTQSBDQTCCASIwDQYJKoZIhvcNAQEB
BQADggEPADCCAQoCggEBANfE1y7r94k5LeDncCnOfjItWXWWuNAzJFXsd0620cON
5jXCYfVGdRqPkpHtLml1OiMtnSyxxqIASCsxn+puvXPy12FJkTq8D5GtuuLk/8oI
iiGvFTbVR1C63ZwYQ/MOjMbmlICNVNFYDZfPbALLaZbvtd2q9xc/bq0zd9P6cfW4
GKZyGNwmrNukUtXkIdPIaUiNRiseHwwyR//bJh9GFhCw5jpVK5bnDT1PZYFKww0J
qv5kA9fCY/Xm635MfRsvNI+2RMOBhKgblWGmDCaJMOglgyao3AVK8ajrNrlAoTHC
9Lcm4dQc2p0KUVfRitLio2ANKM3oh8q2qHPFrAnvjzcCAwEAAaNjMGEwDgYDVR0P
AQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIBNaqqKRqtaWv5U
s+XACf5jiY2rMB8GA1UdIwQYMBaAFEOl8mT1ZXKyUe00w/jyQQKMYUQAMA0GCSqG
SIb3DQEBCwUAA4IBAQCouCabkdzZKiGMKlrCE0y/eDNqBUwdERWD+Xrxhm/K13bg
gJJXZsWWr2/iumbWkc3N9W5J2gyFc+iO79VrVMzlq2Kfbhy5XY5gioC8n1BL4FPs
lmOGtO/8NubZhjTVrE/wH2iDcC9vfE5EAM/axnQXA1DjuEhyRnZe40lTXnA37vc1
f0hizePrPiMNpzJLZ9kj9pvOYRc7h+Oe04fz+iG5iSlJ/s4y81o0oOJkDLatfveC
+L2ZqbiagZTsBYiL68Y612n7UDH2tUpyE6hCxYlNb+hCMFLakRHfp/IHcz6oHxvV
kyJ5FwVvwn9fy4QOi/NsfASdb4AnyqRkJKNSlqWw
-----END CERTIFICATE-----

View File

@@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAqp/BNnNx4OGqJHNLN0GX8MDUO4PIWJ9rq6by65i2RXd4t51y
yOH68l/TNmfCXcUQ91SvBBD+P2dK2gkZOlprDOS3tO+GsCTAAEf/tv1+N2ZqDUPK
waIH60seDJd2a3A97KtfySFVrCUrlTeB/tPL5XMBFwTTxPvfV6RULAaK6lJGdrM9
/k/vYfneE+ZY5Bo1b7kaqZLOz9LW3icarPGcFDIes/Lud3sCbpjza0bAKFy594vI
dwqjRY4OHdubwXV3wV/AxgA0tQNyYADFwa3YeSvBsfFqPortWOAYKrg86RJJ8ilQ
umNiEs6FSYnSatbjMkKh7q9EerJf/exlW1IzDQIDAQABAoIBAFcIGBEDQAI6eYQQ
PzyXO751TYxyAv6Zit1K0jw0cDzs3Omj6UnoYw3ArUbiFDWqcKYITyGe3WFP+dFP
tMucFWDFRaOITkaI6Fr8XsZjdT8jAVN00faFBM8TSOeZVrEk1qFjJP+9/ipJ53o8
jxWByU5npBWuw6qF432b98dhKvisW5Uu1hw8z935ld7uk3nF2mWAxzrTq8GE+Mn5
Ic0yDmxnd/6rgUuAVtfGMDsKCks7P0J4bvxIG8fDnWh40SwNffrlHZ1Fz/yqJCCl
tzkbQnX7lp4JGq1NkubgIchQ5pJzoqzWSShr72tyipjpTBIKDWT6TMapp0Y+veJX
jl4fXs0CgYEA2kBFyO+/BSjOLmlftvos1YqrJD9eSy9ydSY9jRF/6qX1AWbbmH2c
rIN+kLeQtoFP87BMpMU1qDhmqbXx+WLaMYU0RTB8oNhriUbXE2hs7ndGm/FS8yzu
wG0xHBT8Bm8WA/5/bmFbjUCA7eSKYczYrHFd/aaf5HKGtGFJx8jz4t8CgYEAyCKm
vqJ1WGK2Ql/hN1Gw3/rmyzgPqMgfq0gi7cQ3bRY/txK5vWHcDQdIywpxmmMWpkzy
UX3m9hMb2ao01riFngIhBJslong0ExLSv50bi9evCAL0dZCQFPaBCgjNoMRjofGq
SE0fJMDEOqcEt2fEAH8Fa4FUw9MKAypV++H7s5MCgYEA1gZpaN8Sp/CYIJNdNYao
KNDPe8BYq8pfp9pUSd57XpRYa4N+nU+xMMvSdgBNfWvaB9M/leV+9PQ6WPr/y9vQ
tPc3hxJBZUpWSkyZ5YJmMIPvTkWdXrMVfsaVfkBl1bliEZClTo1SxnYW+TNBMR88
6/5QecnIyrI0vvcY7z51TGkCgYB8CpYEc5Z9WHkUPG7PJY+V0uE2tSFnf9m5BDW5
3jJoJzEIW8/JJB0J6ijgxzFP+fgwzGInxfvfKkrJpqenKaiPHUyvmSVDRHMqGzGJ
12saSmzOb15qe1YB2CJ0QK6J5Q7HcYwT0dDqq5szqw7OSb7+e7u1POx3jpaXDadL
PW4OhwKBgHcZWsXJUaKesNJbeGeRKmQHooSdrE69gika1HU7GYmTV3JwvAFrHSNF
EGMMTmWc6nTh63ADO/f+dpAoJVOQM/OhEVVyfvlByLEFeieGegwyREWVYajW+6Dt
Ztrafmyvn+r3yhWN9g+p1yQTeVLw23ir9cYhP8OqnL4d89c3o+r3
-----END RSA PRIVATE KEY-----

View File

@@ -9,9 +9,9 @@ plugin_port = 7200
admin_keep_time = 0
# enable tls
tls_mode = true
tls_cert_file = "cert.crt"
tls_key_file = "cert.key"
tls_mode = false
#tls_cert_file = "cert.crt"
#tls_key_file = "cert.key"
# frp dashboard info
dashboard_addr = "127.0.0.1"

View File

@@ -325,7 +325,7 @@ func (c *HandleController) MakeAddTokenFunc() func(context *gin.Context) {
if err != nil {
response.Success = false
response.Code = SaveError
response.Message = fmt.Sprintf("add failed, error : %v", err)
response.Message = fmt.Sprintf("user add failed, error : %v", err)
log.Printf(response.Message)
context.JSON(http.StatusOK, &response)
return
@@ -586,10 +586,14 @@ func (c *HandleController) MakeProxyFunc() func(context *gin.Context) {
if res.Code == http.StatusOK {
res.Success = true
res.Data = string(body)
res.Message = "Proxy to " + requestUrl + " success"
res.Message = fmt.Sprintf("Proxy to %s success", requestUrl)
} else {
res.Success = false
res.Message = "Proxy to " + requestUrl + " error: " + string(body)
if res.Code == http.StatusNotFound {
res.Message = fmt.Sprintf("Proxy to %s error: url not found", requestUrl)
} else {
res.Message = fmt.Sprintf("Proxy to %s error: %s", requestUrl, string(body))
}
}
}
log.Printf(res.Message)

View File

@@ -175,9 +175,9 @@ func (s *Server) initHTTPServer() error {
engine := gin.New()
authStore := cookie.NewStore([]byte("frps-panel"))
authStore.Options(sessions.Options{
Secure: true,
Secure: false,
HttpOnly: false,
SameSite: 4,
SameSite: http.SameSiteDefaultMode,
Path: "/",
MaxAge: s.cfg.CommonInfo.AdminKeepTime,
})