✨ 子域名和自定义域名可以二选一

luckjiawei · Sep 25, 2024 · 843ab85 · 843ab85
1 parent ed1f3dc
commit 843ab85
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -44,6 +44,7 @@
 执行命令：`sudo xattr -cr Frpc-Desktop.app`
 
 ## 里程碑
+- 2024-09-25: 发布v1.1.2版本 支持 http basic、子域名
 - 2024-09-07: 发布v1.1.0版本 支持批量端口、支持单条代理开关控制
 - 2024-08-24: 发布v1.0.9版本 支持镜像下载、导出导入配置
 - 2024-08-17: 发布v1.0.8版本 支持stcp代理

diff --git a/electron/api/config.ts b/electron/api/config.ts
@@ -157,6 +157,10 @@ export const initConfigApi = win => {
           localPort: m?.localPort || null,
           remotePort: m?.remotePort || null,
           customDomains: m?.customDomains || [],
+          subdomain: m.subdomain || "",
+          basicAuth: m.basicAuth || false,
+          httpUser: m.httpUser || "",
+          httpPassword: m.httpPassword || "",
           // 以下为stcp参数
           stcpModel: "visited",
           serverName: "",
@@ -180,6 +184,10 @@ export const initConfigApi = win => {
           localPort: null,
           remotePort: null,
           customDomains: [],
+          subdomain: m.subdomain || "",
+          basicAuth: m.basicAuth || false,
+          httpUser: m.httpUser || "",
+          httpPassword: m.httpPassword || "",
           // 以下为stcp参数
           stcpModel: "visitors",
           serverName: m?.serverName,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Frpc-Desktop",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "dist-electron/main/index.js",
   "description": "FRP跨平台桌面客户端，可视化配置，轻松实现内网穿透！",
   "repository": "github:luckjiawei/frpc-desktop",

diff --git a/src/views/proxy/index.vue b/src/views/proxy/index.vue
@@ -201,7 +201,7 @@ const handleGetPortCount = (portString: string) => {
 };
 
 const handleRangePort = () => {
-  if (isHttp || isHttps) {
+  if (isHttp.value || isHttps.value) {
     return false;
   }
   if (editForm.value.localPort.indexOf("-") !== -1) {
@@ -238,7 +238,9 @@ const handleSubmit = async () => {
           return;
         }
       }
+
       if (
+        (isHttp.value || isHttps.value) &&
         !(
           editForm.value.subdomain ||
           editForm.value.customDomains.filter(f => f !== "").length > 0

diff --git a/types/global.d.ts b/types/global.d.ts
@@ -18,7 +18,7 @@ declare global {
         name: string;
         type: string;
         localIp: string;
-        localPort: string;
+        localPort: any;
         remotePort: string;
         customDomains: string[];
         stcpModel: string;