"update:地图组件更新,

create:聊天chat制作中"

app-angular/package-lock.json

@@ -23,6 +23,7 @@
         "bootstrap": "^5.2.3",
         "echarts": "^5.4.3",
         "esdk-obs-browserjs": "^3.23.5",
+        "fmode-ng": "^0.0.7",
         "https-browserify": "^1.0.0",
         "https-proxy-agent": "^7.0.2",
         "ng-zorro-antd": "^16.2.2",
@@ -56,8 +57,7 @@
     "node_modules/@amap/amap-jsapi-loader": {
       "version": "1.0.1",
       "resolved": "http://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
-      "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==",
-      "dev": true
+      "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
@@ -122,7 +122,6 @@
         "esbuild-wasm": "0.18.17",
         "fast-glob": "3.3.1",
         "guess-parser": "0.4.22",
-        "http-proxy-agent": "5.0.1",
         "inquirer": "8.2.4",
         "jsonc-parser": "3.2.0",
         "karma-source-map-support": "1.4.0",
@@ -2303,6 +2302,25 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/runtime-corejs2": {
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.23.2.tgz",
+      "integrity": "sha512-lTwRWGcAUBANnxD0A4c5/wKQ0eLhgdAy9kdY2rzTmmliumBQ8u8awykMnaQAnZR3PC47jLRjGoj+hozZqy9Bww==",
+      "peer": true,
+      "dependencies": {
+        "core-js": "^2.6.12",
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime-corejs2/node_modules/regenerator-runtime": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
+      "peer": true
+    },
     "node_modules/@babel/runtime-corejs3": {
       "version": "7.21.0",
       "resolved": "http://registry.npmmirror.com/@babel/runtime-corejs3/-/runtime-corejs3-7.21.0.tgz",
@@ -3190,16 +3208,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/@popperjs/core": {
-      "version": "2.11.8",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
-      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
     "node_modules/@schematics/angular": {
       "version": "16.2.3",
       "resolved": "http://registry.npmmirror.com/@schematics/angular/-/angular-16.2.3.tgz",
@@ -4327,10 +4335,7 @@
     "node_modules/bootstrap": {
       "version": "5.3.2",
       "resolved": "http://registry.npmmirror.com/bootstrap/-/bootstrap-5.3.2.tgz",
-      "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==",
-      "peerDependencies": {
-        "@popperjs/core": "^2.11.8"
-      }
+      "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g=="
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
@@ -4914,6 +4919,14 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "hasInstallScript": true,
+      "peer": true
+    },
     "node_modules/core-js-compat": {
       "version": "3.32.2",
       "resolved": "http://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.32.2.tgz",
@@ -6173,6 +6186,37 @@
       "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
       "dev": true
     },
+    "node_modules/fmode-ng": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/fmode-ng/-/fmode-ng-0.0.7.tgz",
+      "integrity": "sha512-/GtSItFZjpmM3cuo4xJgqb7MzC1UWPZS/Egz6F/GYo8X3vqz517ouGZmaPX6uLcVqfOZWKDTH1aLfv16G7QzZA==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@amap/amap-jsapi-loader": "^1.0.1",
+        "@angular/common": "^15.0.0 || ^16.0.0 || ^17.0.0",
+        "@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0",
+        "@angular/forms": "^15.0.0 || ^16.0.0 || ^17.0.0",
+        "@ionic/angular": "^6.0.0 || ^7.0.0",
+        "esdk-obs-browserjs": "^3.23.5",
+        "markdown-it": "^13.0.2",
+        "markdown-it-abbr": "^1.0.4",
+        "markdown-it-deflist": "^2.1.0",
+        "markdown-it-footnote": "^3.0.3",
+        "markdown-it-imsize": "^2.0.1",
+        "markdown-it-ins": "^3.0.1",
+        "markdown-it-mark": "^3.0.1",
+        "markdown-it-mathjax": "^2.0.0",
+        "markdown-it-ruby": "^0.1.1",
+        "markdown-it-sub": "^1.0.0",
+        "markdown-it-sup": "^1.0.0",
+        "ng-zorro-antd": "^15.0.0 || ^16.0.0 || ^17.0.0",
+        "parse": "^3.0.0 || ^4.0.0",
+        "qiniu-js": "^3.4.1",
+        "recorder-core": "^1.2.23070100"
+      }
+    },
     "node_modules/follow-redirects": {
       "version": "1.15.3",
       "resolved": "http://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.3.tgz",
@@ -6680,19 +6724,6 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "http://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/http-proxy-middleware": {
       "version": "2.0.6",
       "resolved": "http://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
@@ -7448,7 +7479,6 @@
         "escodegen": "^2.0.0",
         "form-data": "^3.0.0",
         "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^5.0.0",
         "is-potential-custom-element-name": "^1.0.1",
         "nwsapi": "^2.2.0",
         "parse5": "6.0.1",
@@ -7841,6 +7871,15 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "node_modules/linkify-it": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
+      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+      "peer": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "http://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -8066,6 +8105,106 @@
         "node": ">=12"
       }
     },
+    "node_modules/markdown-it": {
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz",
+      "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==",
+      "peer": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~3.0.1",
+        "linkify-it": "^4.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it-abbr": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz",
+      "integrity": "sha512-ZeA4Z4SaBbYysZap5iZcxKmlPL6bYA8grqhzJIHB1ikn7njnzaP8uwbtuXc4YXD5LicI4/2Xmc0VwmSiFV04gg==",
+      "peer": true
+    },
+    "node_modules/markdown-it-deflist": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz",
+      "integrity": "sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg==",
+      "peer": true
+    },
+    "node_modules/markdown-it-footnote": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz",
+      "integrity": "sha512-YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w==",
+      "peer": true
+    },
+    "node_modules/markdown-it-imsize": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-it-imsize/-/markdown-it-imsize-2.0.1.tgz",
+      "integrity": "sha512-5SH90ademqcR8ifQCBXRCfIR4HGfZZOh5pO0j2TglulfSQH+SBXM4Iw/QlTUbSoUwVZArCYgECoMvktDS2kP3w==",
+      "peer": true
+    },
+    "node_modules/markdown-it-ins": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-it-ins/-/markdown-it-ins-3.0.1.tgz",
+      "integrity": "sha512-32SSfZqSzqyAmmQ4SHvhxbFqSzPDqsZgMHDwxqPzp+v+t8RsmqsBZRG+RfRQskJko9PfKC2/oxyOs4Yg/CfiRw==",
+      "peer": true
+    },
+    "node_modules/markdown-it-mark": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-3.0.1.tgz",
+      "integrity": "sha512-HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A==",
+      "peer": true
+    },
+    "node_modules/markdown-it-mathjax": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-it-mathjax/-/markdown-it-mathjax-2.0.0.tgz",
+      "integrity": "sha512-Fafv7TnMENccWYTNjMZzV4BzONPxpK9Mknr1iMEK6m7PI5a5UTCOFctPzx7Nhv81fFzYEY8WHDkSu9n43fTV9g==",
+      "peer": true
+    },
+    "node_modules/markdown-it-ruby": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/markdown-it-ruby/-/markdown-it-ruby-0.1.1.tgz",
+      "integrity": "sha512-ct8t/Drt7scv20VdaQtOhpBOC2SDICaW8E/WQS8kY2eUdu0eoDwW8ugXcCy8Vku4Y5CuA5qrewlHpwaFsJxbpQ==",
+      "peer": true
+    },
+    "node_modules/markdown-it-sub": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz",
+      "integrity": "sha512-z2Rm/LzEE1wzwTSDrI+FlPEveAAbgdAdPhdWarq/ZGJrGW/uCQbKAnhoCsE4hAbc3SEym26+W2z/VQB0cQiA9Q==",
+      "peer": true
+    },
+    "node_modules/markdown-it-sup": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz",
+      "integrity": "sha512-E32m0nV9iyhRR7CrhnzL5msqic7rL1juWre6TQNxsnApg7Uf+F97JOKxUijg5YwXz86lZ0mqfOnutoryyNdntQ==",
+      "peer": true
+    },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "peer": true
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+      "peer": true
+    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "http://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
@@ -9656,6 +9795,17 @@
         "node": ">=6"
       }
     },
+    "node_modules/qiniu-js": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/qiniu-js/-/qiniu-js-3.4.1.tgz",
+      "integrity": "sha512-8vxrLqDPlJUk3fUAaTozh3TAT3ww9B5KqGogmGuTiFHnewXDoMxTCSY5z8Ab5UNdrCo6ZxDM07G/o++CICRUFw==",
+      "peer": true,
+      "dependencies": {
+        "@babel/runtime-corejs2": "^7.10.2",
+        "querystring": "^0.2.1",
+        "spark-md5": "^3.0.0"
+      }
+    },
     "node_modules/qjobs": {
       "version": "1.2.0",
       "resolved": "http://registry.npmmirror.com/qjobs/-/qjobs-1.2.0.tgz",
@@ -9677,6 +9827,16 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/querystring": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
+      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "peer": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "http://registry.npmmirror.com/querystringify/-/querystringify-2.2.0.tgz",
@@ -9838,6 +9998,12 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/recorder-core": {
+      "version": "1.2.23070100",
+      "resolved": "https://registry.npmjs.org/recorder-core/-/recorder-core-1.2.23070100.tgz",
+      "integrity": "sha512-R9S2taKj8Q2aePJdoLzSD784WW++VIpWhOgYw+IiM03SdyOVZV2osYgGj/l6yD7BJ8uwo4bl75d3Pg+WMp3Z1A==",
+      "peer": true
+    },
     "node_modules/reflect-metadata": {
       "version": "0.1.13",
       "resolved": "http://registry.npmmirror.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
@@ -10679,6 +10845,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/spark-md5": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz",
+      "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==",
+      "peer": true
+    },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "http://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -11254,6 +11426,12 @@
         "node": "*"
       }
     },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "peer": true
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "http://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",

app-angular/package.json

@@ -25,6 +25,7 @@
     "bootstrap": "^5.2.3",
     "echarts": "^5.4.3",
     "esdk-obs-browserjs": "^3.23.5",
+    "fmode-ng": "^0.0.7",
     "https-browserify": "^1.0.0",
     "https-proxy-agent": "^7.0.2",
     "ng-zorro-antd": "^16.2.2",

app-angular/src/app/app-routing.module.ts

@@ -26,6 +26,10 @@ const routes: Routes = [
     path: 'chart',
     loadChildren: () => import('../modules/chart/chart.module').then(m => m.ChartModule)
   },
+  {
+    path: 'file',
+    loadChildren: () => import('../modules/file/file.module').then(m => m.FileModule)
+  },
 
 ];
 

app-angular/src/modules/file/file-routing.module.ts

@@ -0,0 +1,17 @@
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {PageHwobsManagerComponent} from "./page-hwobs-manager/page-hwobs-manager.component";
+
+
+const routes: Routes = [
+  {
+    path: "huawei/manager", component: PageHwobsManagerComponent
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class FileRoutingModule {
+}

app-angular/src/modules/file/file.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { FileRoutingModule } from './file-routing.module';
+import { PageHwobsManagerComponent } from './page-hwobs-manager/page-hwobs-manager.component';
+import {IonicModule} from "@ionic/angular";
+
+
+@NgModule({
+  declarations: [
+    PageHwobsManagerComponent
+  ],
+  imports: [
+    CommonModule,
+    FileRoutingModule,
+    IonicModule.forRoot({mode: "ios"})
+  ]
+})
+export class FileModule { }

app-angular/src/modules/file/hwobs.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { HwobsService } from './hwobs.service';
+
+describe('HwobsService', () => {
+  let service: HwobsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(HwobsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

app-angular/src/modules/file/hwobs.service.ts

@@ -0,0 +1,148 @@
+import {Injectable} from '@angular/core';
+import * as Parse from "parse";
+//@ts-ignore
+import ObsClient from 'esdk-obs-browserjs'
+
+export interface HwobsDir {
+  Prefix: string  // "storage/2023/"
+
+}
+
+export interface HwobsFile {
+  ETag: "\"f0ec968fe51ab48348307e06476122eb\""
+  Key: string  //"storage/3mkf41033623275.png"
+  LastModified: string //"2023-11-08T12:03:13.008Z"
+  Owner: object // {ID: '09971a1979800fb60fbbc00ada51f7e0'}
+  Size: string //"25839"
+  StorageClass: string //"STANDARD"
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class HwobsService {
+
+  obsClient: ObsClient
+  bucketName: string
+  host: any
+
+  constructor() {
+    this.host = "https://web3-test.obs.cn-south-1.myhuaweicloud.com/"
+    this.bucketName = "web3-test"
+    this.obsClient = new ObsClient({
+      access_key_id: '6UIET20WHUI5TLXWOVNA',
+      secret_access_key: 'YaoY8Kj3TeGZHEcBzplTMZiPGNL13Y3frEavC1kF',
+      // 这里以华南-广州为例，其他地区请按实际情况填写
+      server: 'https://obs.cn-south-1.myhuaweicloud.com'
+    });
+  }
+
+  /**
+   * 目录及检索相关函数
+   */
+  listDir(prefix: any): Promise<{
+    dirs: Array<HwobsDir>,
+    files: Array<HwobsFile>
+  }> {
+    return new Promise((resolve, reject) => {
+      this.obsClient.listObjects({
+        Bucket: this.bucketName,
+        Prefix: prefix,
+        Delimiter: '/'
+      }, (err: any, result: any) => {
+        if (err) {
+          console.error('Error-->' + err);
+          reject(err)
+        } else {
+          console.log('Status-->' + result.CommonMsg.Status);
+          console.log(result)
+          if (result.CommonMsg.Status < 300 && result.InterfaceResult) {
+            for (var j in result.InterfaceResult.Contents) {
+              console.log('Contents[' + j + ']:');
+              console.log('Key-->' + result.InterfaceResult.Contents[j]['Key']);
+              console.log('Owner[ID]-->' + result.InterfaceResult.Contents[j]['Owner']['ID']);
+            }
+          }
+          let dirs: HwobsDir[] = result.InterfaceResult.CommonPrefixes
+          let files: HwobsFile[] = result.InterfaceResult.Contents
+          resolve({dirs: dirs, files: files})
+        }
+      });
+    })
+
+  }
+
+  /**
+   * 文件上传相关函数
+   * @param file
+   * @param key
+   * @returns
+   */
+  async uploadFile(file: File, key: string): Promise<unknown> {
+    // key 文件上传后的全部路径
+    // /storage/<公司账套>/<应用名称>/年月日/<文件名>.<文件后缀>
+    // /storage/web2023/<学号>/年月日/<文件名>.<文件后缀>
+    let attach = await this.checkFileExists(file);
+    if (attach?.id) return attach
+    return new Promise((resolve, reject) => {
+      this.obsClient.putObject({
+        Bucket: this.bucketName,
+        Key: key,
+        SourceFile: file
+      }, async (err: any, result: any) => {
+        if (err) {
+          console.error('Error-->' + err);
+          reject(err)
+        } else {
+          console.log('Status-->' + result.CommonMsg.Status);
+          let attach = await this.saveAttachment(file, key)
+          resolve(attach)
+        }
+      });
+    })
+  }
+
+  Attachment = Parse.Object.extend("Attachment")
+
+  async checkFileExists(file: any): Promise<Parse.Object> {
+    let hash = await this.getFileHash(file)
+    // 文件HASH查重,避免重复上传
+    let attach: Parse.Object
+    let query = new Parse.Query("Attachment")
+    query.equalTo("hash", hash);
+    query.equalTo("size", file.size);
+    let exists: any = await query.first();
+    if (!exists?.id) exists = new this.Attachment()
+    attach = exists
+    return attach
+  }
+
+  async saveAttachment(file: any, key: any) {
+    let hash: any = await this.getFileHash(file)
+    let attach = await this.checkFileExists(file)
+    attach.set("name", file.name)
+    attach.set("size", file.size)
+    attach.set("mime", file.type)
+    attach.set("url", this.host + key)
+    attach.set("hash", hash)
+    attach = await attach.save()
+    return attach
+  }
+
+  async getFileHash(file: any) {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.onload = async (event: any) => {
+        const buffer = event.target.result;
+        const hashBuffer = await crypto.subtle.digest('SHA-256', buffer);
+        const hashArray = Array.from(new Uint8Array(hashBuffer));
+        const hashHex = hashArray.map(byte => byte.toString(16).padStart(2, '0')).join('');
+        resolve(hashHex);
+      };
+      reader.onerror = (event: any) => {
+        reject(event.target.error);
+      };
+      reader.readAsArrayBuffer(file);
+    });
+  }
+}

app-angular/src/modules/file/page-hwobs-manager/page-hwobs-manager.component.html

@@ -0,0 +1,24 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>
+      File Manager
+    </ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <ion-list>
+    <ion-item (click)="openDir(null,'pre')">
+      <ion-icon [name]="'folder'" slot="start"></ion-icon>
+      <ion-label>../</ion-label>
+    </ion-item>
+    <ion-item *ngFor="let item of dirs" (click)="openDir(item)">
+      <ion-icon [name]="'folder'" slot="start"></ion-icon>
+      <ion-label>{{ showName(item.Prefix) }}</ion-label>
+    </ion-item>
+    <ion-item *ngFor="let item of files" (click)="openFile(item)">
+      <ion-icon [name]="'document'" slot="start"></ion-icon>
+      <ion-label>{{ showName(item.Key) }}</ion-label>
+    </ion-item>
+  </ion-list>
+</ion-content>

app-angular/src/modules/file/page-hwobs-manager/page-hwobs-manager.component.scss

@@ -0,0 +1,8 @@
+ion-list {
+  ion-item {
+    ion-icon {
+      font-size: 24px;
+      margin-right: 8px;
+    }
+  }
+}

app-angular/src/modules/file/page-hwobs-manager/page-hwobs-manager.component.spec.ts

@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PageHwobsManagerComponent } from './page-hwobs-manager.component';
+
+describe('PageHwobsManagerComponent', () => {
+  let component: PageHwobsManagerComponent;
+  let fixture: ComponentFixture<PageHwobsManagerComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [PageHwobsManagerComponent]
+    });
+    fixture = TestBed.createComponent(PageHwobsManagerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

app-angular/src/modules/file/page-hwobs-manager/page-hwobs-manager.component.ts

@@ -0,0 +1,52 @@
+import {Component} from '@angular/core';
+import {HwobsDir, HwobsFile, HwobsService} from "../hwobs.service";
+
+@Component({
+  selector: 'app-page-hwobs-manager',
+  templateUrl: './page-hwobs-manager.component.html',
+  styleUrls: ['./page-hwobs-manager.component.scss']
+})
+export class PageHwobsManagerComponent {
+  dirs: HwobsDir[] = [];
+  files: HwobsFile[] = [];
+  prefix: string = "storage/"
+
+  openFile(file: any) {
+    console.log('Opening file:', file);
+    // Add your logic to open the file details here
+  }
+
+  openDir(dir?: HwobsDir | null, type: string = "pre") {
+    if (dir) {
+      this.prefix = dir.Prefix
+      this.listDir(dir.Prefix)
+    } else {
+      if (type == "pre") {
+        let list = this.prefix.split("/")
+        if (list.length > 1) {
+          let prefix = list.splice(0, list.length - 1).join("/")
+          console.log(prefix)
+          this.prefix = prefix
+          this.listDir(prefix)
+        }
+      }
+    }
+  }
+
+  showName(name: string) {
+    return name.replaceAll(this.prefix, "")
+  }
+
+  constructor(
+    private hwobs: HwobsService
+  ) {
+    this.listDir(this.prefix)
+  }
+
+  async listDir(prefix: string) {
+    let {dirs, files} = await this.hwobs.listDir(prefix)
+    this.dirs = dirs
+    this.files = files
+  }
+
+}

app-angular/src/modules/home/nav-menu/nav-menu.component.ts

@@ -1,5 +1,5 @@
 import {Component, ViewChild, ElementRef} from '@angular/core';
-import {HwobsService} from "../hwobs/hwobs.service";
+import {HwobsService} from "../../file/hwobs.service";
 
 @Component({
   selector: 'app-nav-menu',
@@ -33,7 +33,7 @@ export class NavMenuComponent {
     this.fileInput.nativeElement.click();
   }
 
-  file: File
+  file!: File
   fileData: any = ""
   fileList: File[] = []
 

app-angular/src/modules/home/page-mine/page-mine.component.html

@@ -6,7 +6,7 @@
         <nz-tab [nzTitle]="'账号'">
           <div nz-row [nzGutter]="16">
             <ion-title>可用余额:{{userServ.currentUser.availableBalance || '未填写'}} <a href="">充值</a></ion-title>
-            <ion-title>账号:{{userServ.currentUser.account || '未填写'}}</ion-title>
+            <ion-title>账号:{{userServ.currentUser.username || '未填写'}}</ion-title>
             <ion-title>手机号:{{userServ.currentUser.phoneNumber || '未填写'}}<a href="">修改</a></ion-title>
           </div>
         </nz-tab>
@@ -116,7 +116,7 @@
         </nz-tab>
         <nz-tab [nzTitle]="'设置'">
 
-          <div *ngIf="isFirstRegister===1">
+          <div *ngIf="isFirstRegister==='1'">
             <nz-steps [nzCurrent]="current">
               <nz-step nzTitle="完善信息"></nz-step>
               <nz-step nzTitle="性格测试"></nz-step>
@@ -127,11 +127,11 @@
               <!-- 完善信息 -->
               <form [formGroup]="myForm" (ngSubmit)="submitForm()" class="form-container">
                 <div class="form-row">
-                  <label for="phone">电话:</label>
-                  <input type="text" id="phone" formControlName="phone"/>
-                  <div *ngIf="myForm.get('phone')?.invalid && myForm.get('phone')?.touched">
-                    <div *ngIf="myForm.get('phone')?.errors?.['required']">Phone number is required.</div>
-                    <div *ngIf="myForm.get('phone')?.errors?.['pattern']">Invalid phone number.</div>
+                  <label for="phoneNumber">电话:</label>
+                  <input type="text" id="phoneNumber" formControlName="phoneNumber"/>
+                  <div *ngIf="myForm.get('phoneNumber')?.invalid && myForm.get('phoneNumber')?.touched">
+                    <div *ngIf="myForm.get('phoneNumber')?.errors?.['required']">Phone number is required.</div>
+                    <div *ngIf="myForm.get('phoneNumber')?.errors?.['pattern']">Invalid phoneNumber number.</div>
                   </div>
                 </div>
                 <div class="form-row">
@@ -253,10 +253,14 @@
               <button nz-button nzType="default" (click)="pre()" *ngIf="current > 0">
                 <span>Previous</span>
               </button>
-              <button nz-button nzType="default" (click)="next()" *ngIf="current < 2"
-                      [disabled]="current === 0 && myForm.invalid">
+              <button nz-button nzType="default" (click)="next()" *ngIf="current < 2&&current!=0"
+                      [disabled]=" myForm.invalid">
                 <span>Next</span>
               </button>
+              <button nz-button nzType="default" (click)="submitForm()" *ngIf="current === 0"
+                      [disabled]=" myForm.invalid">
+                <span>填写完成</span>
+              </button>
               <button nz-button nzType="primary" (click)="done()" *ngIf="current === 2">
                 <span>Done</span>
               </button>
@@ -284,8 +288,8 @@
   </nz-content>
   <nz-footer>
     <ion-list [inset]="true">
-      <ion-button *ngIf="!userServ.currentUser?.account" expand="block" routerLink="/user/login">登录</ion-button>
-      <ion-button *ngIf="userServ.currentUser?.account" fill="clear" expand="block" (click)="logout()">登出</ion-button>
+      <ion-button *ngIf="!userServ.currentUser?.username" expand="block" routerLink="/user/login">登录</ion-button>
+      <ion-button *ngIf="userServ.currentUser?.username" fill="clear" expand="block" (click)="logout()">登出</ion-button>
     </ion-list>
   </nz-footer>
 </nz-layout>

app-angular/src/modules/home/page-mine/page-mine.component.ts

@@ -1,6 +1,8 @@
 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {ToastController} from '@ionic/angular';
 import {UserService} from 'src/modules/user/service-user/user.service';
+// import {FmodeChatCompletion} from "fmode-ng";
+
 import {
   AbstractControl, AsyncValidatorFn,
   FormBuilder,
@@ -13,13 +15,10 @@ import {
 import Parse from 'parse';
 import {AlertController} from "@ionic/angular";
 import {Router} from "@angular/router";
-import {Observable, Observer} from "rxjs";
 
 Parse.serverURL = "https://web2023.fmode.cn/parse" // 配置服务器地址
 Parse.initialize("dev") // 配置应用名称
 
-const userQuery = new Parse.Query("LjUser");
-
 
 @Component({
   selector: 'app-page-mine',
@@ -27,20 +26,18 @@ const userQuery = new Parse.Query("LjUser");
   styleUrls: ['./page-mine.component.scss']
 })
 export class PageMineComponent {
-  validateForm: FormGroup;
   account = this.userServ.currentUser.account;
   password = this.userServ.currentUser.password;
 
   isFirstRegister = this.userServ.currentUser.isFirstRegister;
-  private readonly result: Promise<Parse.Object<Parse.Attributes>>;
+  private readonly result: Promise<Parse.Object<Parse.Attributes>> | undefined;
   selectedTabIndex: number = 0; // 默认选中第一个标签页
+  currentUser = Parse.User.current();
 
 
-  constructor(private fb: FormBuilder, private toastCtrl: ToastController, public userServ: UserService, private alertCtrl: AlertController, private router: Router, private refine: NonNullableFormBuilder) {
-    console.log(this.userServ.currentUser)
-
-    this.myForm = new FormGroup({
-      phone: new FormControl('', [Validators.required, Validators.pattern(/^\d{10}$/)]),
+  constructor(private fb: FormBuilder, private toastCtrl: ToastController, public userServ: UserService, private alertCtrl: AlertController, private router: Router) {
+    this.myForm = this.fb.group({
+      phoneNumber: new FormControl('', [Validators.required, Validators.pattern(/^\d{10}$/)]),
       name: new FormControl('', [Validators.required]),
       employmentStatus: new FormControl('', Validators.required),
       educationLevel: new FormControl('', Validators.required),
@@ -55,31 +52,50 @@ export class PageMineComponent {
       removePassword: '',
 
     });
-    userQuery.equalTo("account", this.account);
-    this.result = userQuery.first().then(result => {
-      if (result !== undefined) {
-        return result as Parse.Object<Parse.Attributes>;
-      } else {
-        // 处理结果为 undefined 的情况
-        throw new Error("Result is undefined");
-      }
-    });
-    console.log(this.isFirstRegister)
+
+
     if (this.isFirstRegister === 1) {
       this.selectedTabIndex = this.getTabIndexFromUrl();
     } else {
 
     }
-    console.log(this.selectedTabIndex)
+    console.log(this.currentUser)
+    console.log(this.myForm.valid)
   }
 
-  // 完善信息
+  ngOnInit() {
+
+  }
+
+  validateForm: FormGroup;
   myForm: FormGroup;
 
-  submitForm() {
+  // 完善信息
+
+
+  async submitForm() {
+
     if (this.myForm.valid) {
-      // Form submission logic
+      const params = {
+        phoneNumber: this?.myForm.controls['phoneNumber'].value,
+        employmentStatus: this?.myForm.controls['employmentStatus'].value,
+        educationLevel: this?.myForm.controls['educationLevel'].value,
+        gender: this?.myForm.controls['gender'].value,
+        name: this?.myForm.controls['name'].value,
+      };
+      const user: any = Parse.User.current();
+      user.set("phoneNumber", params.phoneNumber);
+      user.set("employmentStatus", params.employmentStatus)
+      user.set("educationLevel", params.educationLevel)
+      user.set("gender", params.gender)
+      user.set("name", params.name);
+      user.save().then((updatedUser: any) => {
+        console.log("---", updatedUser)
+      }).catch((error: any) => {
+        console.log("---", error)
+      })
     }
+    this.current += 1;
   }
 
 
@@ -221,7 +237,7 @@ export class PageMineComponent {
   }
 
 
-//  聊天框逻辑
+  // 聊天框逻辑
   messages = [
     {avatar: 'assets/images/page-mine/myAvatar.png', content: 'Hello', isReceived: false},
     // 这是左边的内容
@@ -230,12 +246,14 @@ export class PageMineComponent {
     //  这是右边的内容
   ];
 
+
   inputMessages: any[] = [];
 
 
   inputText = '';
 
   @ViewChild('chatMessages') chatMessages!: ElementRef;
+  newMessage: string = ""
 
   sendMessage() {
     if (this.inputText.trim() !== '') {
@@ -244,8 +262,19 @@ export class PageMineComponent {
         content: this.inputText,
         isReceived: true,
       };
+      let messageList = [
+        {role: "user", content: "填写你发送过的历史消息：可用于Prompt定义AI扮演的角色细节"},
+        {role: "assistant", content: "填写AI回复的历史消息"},
+        {role: "user", content: "FmodeAiTest测试问题"}, // 填写你要发送的消息
+      ]
       this.messages.push(newMessage);
       this.inputText = '';
+      // let completion = new FmodeChatCompletion(messageList);
+      // completion.sendCompletion().subscribe((message: any) => {
+      //   this.newMessage = message;
+      //   console.log(newMessage)
+      //   console.log(this.messages)
+      // })
 
       // Scroll to the bottom of the chat window
       setTimeout(() => {

app-angular/src/modules/map/page-plan-route/page-plan-route.component.ts

@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 
 import * as  AMapLoader from '@amap/amap-jsapi-loader';
 
@@ -12,52 +12,59 @@ import * as  AMapLoader from '@amap/amap-jsapi-loader';
   templateUrl: './page-plan-route.component.html',
   styleUrls: ['./page-plan-route.component.scss']
 })
-export class PagePlanRouteComponent {
+export class PagePlanRouteComponent implements OnInit {
+  @Input() keyword_destination: string
+  @Input() city_destination: string
 
   AMap: any;
   map: any;
+  location_pos: any
 
   constructor() {
+    this.keyword_destination = '';
+    this.city_destination = ''
+  }
+
+  ngOnInit() {
+    this.getCurrentCity();
     this.createMap()
   }
 
   async createMap() {
     try {
       this.AMap = await AMapLoader.load({
-        "key": "473b52010df7d3a32db0a2f5db245c8e",              // 申请好的Web端开发者Key，首次调用 load 时必填
-        "version": "2.0",   // 指定要加载的 JS API 的版本，缺省时默认为 1.4.15
-        "plugins": [],           // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        "key": "473b52010df7d3a32db0a2f5db245c8e",
+        "version": "2.0",
+        "plugins": [],
       });
-      this.map = new this.AMap.Map('container', {
+
+      this.map = new this.AMap.Map('AMap.Driving', {
         resizeEnable: true,
-        viewMode: "3D", // 是否为3D地图模式
-        zoom: 13, // 初始化地图级别
+        viewMode: "3D",
+        zoom: 13,
         zooms: [4, 18],
-        center: [116.397428, 39.90923], // 初始化地图中心点位置
-        layers: [//使用多个图层
-          // new AMap.TileLayer.Satellite(),
-          // new AMap.TileLayer.RoadNet(),
-          // new AMap.TileLayer.Traffic({
-          //   zIndex: 10
-          // })
-        ],
+        center: [116.397428, 39.90923],
+        layers: [],
+        policy: this.AMap.DrivingPolicy.LEAST_TIME
       });
+
       this.AMap.plugin(['AMap.ToolBar', 'AMap.Driving'], () => {
         var toolbar = new this.AMap.ToolBar();
         this.map.addControl(toolbar);
+
         var driving = new this.AMap.Driving({
           map: this.map,
           panel: "panel",
         });
-        driving.search([
-          {keyword: '江西脑控科技有限公司', city: '南昌'},
-          {keyword: '江西财经大学(枫林园)', city: '南昌'}
-        ], (status: string, result: any) => {
-          // result 即是对应的驾车导航信息，相关数据结构文档请参考  http://lbs.amap.com/api/javascript-api/reference/route-search#m_DrivingResult
+        console.log(this.keyword_destination)
+        console.log(this.city_destination)
+        console.log(this.location_pos)
+
+        driving.search([], (status: string, result: any) => {
           if (status === 'complete') {
-            console.log(1)
+            console.log(1);
           } else {
-            console.log(result)
+            console.log(result);
           }
         });
       });
@@ -65,5 +72,39 @@ export class PagePlanRouteComponent {
       console.log(error);
     }
   }
+
+  async getCurrentCity() {
+    this.AMap = await AMapLoader.load({
+      "key": "473b52010df7d3a32db0a2f5db245c8e",
+      "version": "2.0",
+      "plugins": [],
+    });
+    this.map = new this.AMap.Map('container', {
+      resizeEnable: true
+    })
+    this.AMap.plugin('AMap.Geolocation', async () => {
+      var geolocation = new this.AMap.Geolocation({
+        enableHighAccuracy: true,
+        timeout: 10000,
+        buttonPosition: 'RB',
+        buttonOffset: new this.AMap.Pixel(10, 20),
+        zoomToAccuracy: true,
+      });
+      this.map.addControl(geolocation);
+      await geolocation.getCurrentPosition(<PositionCallback>(status: any, result: any) => {
+          if (status === 'complete') {
+            console.log(result[0].formattedAddress)
+            console.log(result)
+            this.location_pos = result.position;
+          } else {
+            alert(result)
+          }
+        }
+      )
+      ;
+    });
+
+  }
+
 }
 

app-angular/src/modules/user/page-register/page-register.component.ts

@@ -10,11 +10,14 @@ import {Observable, Observer} from 'rxjs';
 import Parse from "parse";
 import {Router} from "@angular/router";
 import {HttpClient, HttpParams} from "@angular/common/http";
+import * as url from "url";
 
-Parse.serverURL = "https://web2023.fmode.cn/parse" // 配置服务器地址
-Parse.initialize("dev") // 配置应用名称
+(Parse as any).serverURL = "https://web2023.fmode.cn/parse";
+// https://web2023.fmode.cn/s0210490/api/user/login
+Parse.initialize("dev")
 
-const userQuery = new Parse.Query("LjUser");
+
+// const userQuery = new Parse.Query("LjUser");
 
 
 @Component({
@@ -34,37 +37,37 @@ export class PageRegisterComponent {
   //                  stuno: userId,
   //                  availableBalance: '2.00',
   //                })
-  async submitForm(): Promise<void> {
-    const url_stuno = 'https://web2023.fmode.cn/s0210490/api/user/stuno';
-    let stuno: string = '';
-
-    try {
-      const result = await this.http.get<{ stuno: string }>(url_stuno).toPromise();
-      if (result && result.stuno) {
-        stuno = result.stuno;
-      } else {
-        throw new Error('Invalid result');
-      }
-    } catch (error) {
-      console.error('Error fetching stuno:', error);
-      return;
-    }
-
-    const url = 'https://web2023.fmode.cn/s0210490/api/user/register';
-
-    function generateRandomString(): string {
-      const characters: string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-      let randomString: string = '';
-
-      for (let i: number = 0; i < 10; i++) {
-        const randomIndex: number = Math.floor(Math.random() * characters.length);
-        randomString += characters.charAt(randomIndex);
-      }
-
-      return randomString;
-    }
-
-    console.log(stuno)
+  async submitForm() {
+    // const url_stuno = 'https://web2023.fmode.cn/s0210490/api/user/stuno';
+    // let stuno: string = '';
+    //
+    // try {
+    //   const result = await this.http.get<{ stuno: string }>(url_stuno).toPromise();
+    //   if (result && result.stuno) {
+    //     stuno = result.stuno;
+    //   } else {
+    //     throw new Error('Invalid result');
+    //   }
+    // } catch (error) {
+    //   console.error('Error fetching stuno:', error);
+    //   return;
+    // }
+    //
+    // const url = 'https://web2023.fmode.cn/s0210490/api/user/register';
+    //
+    // function generateRandomString(): string {
+    //   const characters: string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    //   let randomString: string = '';
+    //
+    //   for (let i: number = 0; i < 10; i++) {
+    //     const randomIndex: number = Math.floor(Math.random() * characters.length);
+    //     randomString += characters.charAt(randomIndex);
+    //   }
+    //
+    //   return randomString;
+    // }
+
+    // console.log(stuno)
 
     const params = {
       account: this.validateForm.controls['account'].value,
@@ -73,20 +76,38 @@ export class PageRegisterComponent {
       email: this.validateForm.controls['email'].value,
       skills: this.validateForm.controls['comment'].value,
       availableBalance: '2.00',
-      stuno: stuno,
-      objectId: generateRandomString()
+      // stuno: stuno,
+      // objectId: generateRandomString()
     };
-
-    if (stuno) {
-      try {
-        const isAccount = await this.http.put(url, params).toPromise();
-        if (isAccount) {
-          localStorage.setItem("USER_AUTH", JSON.stringify(params));
-        }
-      } catch (error) {
-        console.error('Error registering user:', error);
+    const user = new Parse.User();
+    user.setUsername(params.account);
+    user.setPassword(params.password);
+    user.setEmail(params.email);
+    user.set("age", this.age.toString())
+    user.set("isFirstRegister", "1")
+    user.set("availableBalance", '2.00')
+    user.set("skills", params.skills)
+    try {
+      let isRegister = await user.signUp();
+      if (isRegister?.id) {
+        alert("注册成功");
+        this.router.navigate(['user/login'])
       }
+
+    } catch (error: any) {
+      alert(error.code + " " + error.message)
     }
+
+    // if (stuno) {
+    //   try {
+    //     const isAccount = await this.http.put(url, params).toPromise();
+    //     if (isAccount) {
+    //       localStorage.setItem("USER_AUTH", JSON.stringify(params));
+    //     }
+    //   } catch (error) {
+    //     console.error('Error registering user:', error);
+    //   }
+    // }
   }
 
 
@@ -95,28 +116,43 @@ export class PageRegisterComponent {
   }
 
   // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-  accountValidator = (control: FormControl) =>
-    new Observable((observer: Observer<ValidationErrors | null>) => {
-      const url = 'https://web2023.fmode.cn/user/register';
-      const params = new HttpParams().set('account', control.value);
-
-      this.http.get(url, {params}).subscribe(
-        (isAccount) => {
-          setTimeout(() => {
-            if (!isAccount) {
-              observer.next({error: true, duplicated: true});
-            } else {
-              observer.next(null);
-            }
-            observer.complete();
-          }, 1000);
-        },
-        (error) => {
-          console.error(error);
-          observer.error(error);
-        }
-      );
-    });
+  // accountValidator = (control: FormControl) => {
+  //   const query = new Parse.Query("_User");
+  //   query.equalTo("username", control.value);
+  //
+  //   return new Observable((observer: Observer<ValidationErrors | null>) => {
+  //     query.find({
+  //       success: (result: any) => {
+  //         if (result.count() > 0) {
+  //           observer.next(null);
+  //         } else {
+  //           observer.next({error: true, duplicated: true});
+  //         }
+  //         observer.complete();
+  //       },
+  //       error: (error: any) => {
+  //         observer.error(error);
+  //       }
+  //     });
+  //   });
+  // };
+
+  // this.http.get(url, {params}).subscribe(
+  //   (isAccount) => {
+  //     setTimeout(() => {
+  //       if (!isAccount) {
+  //         observer.next({error: true, duplicated: true});
+  //       } else {
+  //         observer.next(null);
+  //       }
+  //       observer.complete();
+  //     }, 1000);
+  //   },
+  //   (error) => {
+  //     console.error(error);
+  //     observer.error(error);
+  //   }
+  // );
 
 
   //判断当前年龄是否在18-60之间
@@ -159,8 +195,9 @@ export class PageRegisterComponent {
               private router: Router,
               private http: HttpClient) {
     this.validateForm = this.fb.group({
-      account: ['', [Validators.required,]],
-      // Validators.pattern('^[0-9]{6,12}$')], this.accountValidator
+      account: ['', [Validators.required,],],
+      // this.accountValidator
+      // Validators.pattern('^[0-9]{6,12}$')],]
       email: ['', [Validators.required]],
       // Validators.email,
       password: ['', [Validators.required,],],

node_modules/.package-lock.json

@@ -3,6 +3,60 @@
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
+    "node_modules/@angular/common": {
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.12.tgz",
+      "integrity": "sha512-B+WY/cT2VgEaz9HfJitBmgdk4I333XG/ybC98CMC4Wz8E49T8yzivmmxXB3OD6qvjcOB6ftuicl6WBqLbZNg2w==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "16.2.12",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/core": {
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.12.tgz",
+      "integrity": "sha512-GLLlDeke/NjroaLYOks0uyzFVo6HyLl7VOm0K1QpLXnYvW63W9Ql/T3yguRZa7tRkOAeFZ3jw+1wnBD4O8MoUA==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0",
+        "zone.js": "~0.13.0"
+      }
+    },
+    "node_modules/@angular/platform-browser": {
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.12.tgz",
+      "integrity": "sha512-NnH7ju1iirmVEsUq432DTm0nZBGQsBrU40M3ZeVHMQ2subnGiyUs3QyzDz8+VWLL/T5xTxWLt9BkDn65vgzlIQ==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "16.2.12",
+        "@angular/common": "16.2.12",
+        "@angular/core": "16.2.12"
+      },
+      "peerDependenciesMeta": {
+        "@angular/animations": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@ant-design/colors": {
       "version": "7.0.0",
       "resolved": "http://registry.npmmirror.com/@ant-design/colors/-/colors-7.0.0.tgz",
@@ -196,6 +250,15 @@
       "resolved": "http://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
+    "node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/safari-14-idb-fix": {
       "version": "3.0.0",
       "resolved": "http://registry.npmmirror.com/safari-14-idb-fix/-/safari-14-idb-fix-3.0.0.tgz",
@@ -290,6 +353,15 @@
       "engines": {
         "node": ">=0.4"
       }
+    },
+    "node_modules/zone.js": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz",
+      "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      }
     }
   }
 }

package-lock.json

@@ -14,6 +14,60 @@
         "esdk-obs-browserjs": "^3.23.5"
       }
     },
+    "node_modules/@angular/common": {
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.12.tgz",
+      "integrity": "sha512-B+WY/cT2VgEaz9HfJitBmgdk4I333XG/ybC98CMC4Wz8E49T8yzivmmxXB3OD6qvjcOB6ftuicl6WBqLbZNg2w==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "16.2.12",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/core": {
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.12.tgz",
+      "integrity": "sha512-GLLlDeke/NjroaLYOks0uyzFVo6HyLl7VOm0K1QpLXnYvW63W9Ql/T3yguRZa7tRkOAeFZ3jw+1wnBD4O8MoUA==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0",
+        "zone.js": "~0.13.0"
+      }
+    },
+    "node_modules/@angular/platform-browser": {
+      "version": "16.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.12.tgz",
+      "integrity": "sha512-NnH7ju1iirmVEsUq432DTm0nZBGQsBrU40M3ZeVHMQ2subnGiyUs3QyzDz8+VWLL/T5xTxWLt9BkDn65vgzlIQ==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "16.2.12",
+        "@angular/common": "16.2.12",
+        "@angular/core": "16.2.12"
+      },
+      "peerDependenciesMeta": {
+        "@angular/animations": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@ant-design/colors": {
       "version": "7.0.0",
       "resolved": "http://registry.npmmirror.com/@ant-design/colors/-/colors-7.0.0.tgz",
@@ -207,6 +261,15 @@
       "resolved": "http://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
+    "node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/safari-14-idb-fix": {
       "version": "3.0.0",
       "resolved": "http://registry.npmmirror.com/safari-14-idb-fix/-/safari-14-idb-fix-3.0.0.tgz",
@@ -301,6 +364,15 @@
       "engines": {
         "node": ">=0.4"
       }
+    },
+    "node_modules/zone.js": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz",
+      "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      }
     }
   }
 }