1.1.2

xiaobaidadada · Jan 8, 2025 · c0fdd81 · c0fdd81
1 parent 1420317
commit c0fdd81
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "filecat",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "filecat 文件管理器",
   "author": "xiaobaidadada",
   "scripts": {
@@ -46,6 +46,9 @@
     "浏览器代理",
     "简洁",
     "日志",
+    "http代理工具",
+    "http",
+    "post",
     "log",
     "filebrowser",
     "administrator",

diff --git a/src/common/req/sys.pojo.ts b/src/common/req/sys.pojo.ts
@@ -13,6 +13,7 @@ export interface staticSysPojo {
     cpu_phy_core_num:number
     cpu_speed_hz:number
     pid_ppid:string;
+    user:string;
 }
 
 // 物理信息

diff --git a/src/main/domain/net/net.service.ts b/src/main/domain/net/net.service.ts
@@ -209,7 +209,7 @@ export class NetService {
                             break;
                         case 'put':
                         case 'post': {
-                            if (pojo.form_data_list) {
+                            if (pojo.form_data_list && pojo.form_data_list.length > 0 && pojo.body_type === http_body_type.form) {
                                 option['multipart'] = true;
                                 const form = {};
                                 const files = {};

diff --git a/src/main/domain/sys/sys.service.ts b/src/main/domain/sys/sys.service.ts
@@ -16,6 +16,7 @@ export class SysService {
             cpu_phy_core_num: cpu.physicalCores,
             cpu_speed_hz: cpu.speedMax,
             pid_ppid:`${process.pid};${process.ppid}`,
+            user:process.env['USER'] ?? process.env['USERNAME'],
         })
     }
 

diff --git a/src/web/project/component/sys/Sys.tsx b/src/web/project/component/sys/Sys.tsx
@@ -201,6 +201,7 @@ export function Sys(props) {
                         <TextLine left={`cpu ${t("物理核心")}`} right={sys.cpu_phy_core_num}/>
                         <TextLine left={`cpu ${t("最大")}hz`} right={sys.cpu_speed_hz}/>
                         <TextLine left={`当前系统:pid;ppid`} right={sys.pid_ppid}/>
+                        <TextLine left={`运行用户`} right={sys.user}/>
                     </Card>
                 </Column>}
                 {disk && <Column>

diff --git a/src/web/project/component/toolbox/Http.tsx b/src/web/project/component/toolbox/Http.tsx
@@ -97,11 +97,11 @@ export function Http() {
             }
         }
         if(item.form_data_list )
-        set_form_data_list(JSON.parse(item.form_data_list as string))
+            set_form_data_list(JSON.parse(item.form_data_list as string))
         if (item.json_data)
-        http_json_value = JSON.parse(item.json_data);
+            http_json_value = JSON.parse(item.json_data);
         if(item.data)
-        http_row_value = item.data;
+            http_row_value = item.data;
         if (item.body_type) {
             set_body_type(item.body_type);
             if (item.header_type === 2) {
@@ -443,14 +443,14 @@ export function Http() {
                 </Column>
                 <Column>
                     <NavIndexContainer  getItems={getItems} save={saveItems}
-                                       clickItem={clickItem}
-                                       items={[
-                                           {key: "name", preName: t("名字")},
-                                           {key: "url", preName: "url"},
-                                           {key: "method", preName: "method"},
-                                           {key: "headers", preName: "headers"},
-                                           {key: "data", preName: "data"},
-                                           {key: "form_data_list", preName: "form_data_list"}]}/>
+                                        clickItem={clickItem}
+                                        items={[
+                                            {key: "name", preName: t("名字")},
+                                            {key: "url", preName: "url"},
+                                            {key: "method", preName: "method"},
+                                            {key: "headers", preName: "headers"},
+                                            {key: "data", preName: "data"},
+                                            {key: "form_data_list", preName: "form_data_list"}]}/>
                 </Column>
             </Row>
         </Dashboard>