修改

es/package.json

@@ -4,18 +4,22 @@
   "description": "",
   "private": true,
   "dependencies": {
-    "@elastic/elasticsearch": "^8.12.2",
-    "@midwayjs/bootstrap": "^3.12.0",
-    "@midwayjs/core": "^3.12.0",
-    "@midwayjs/info": "^3.12.0",
-    "@midwayjs/koa": "^3.12.0",
+    "@elastic/elasticsearch": "8.12.2",
+    "@midwayjs/bootstrap": "^3.16.6",
+    "@midwayjs/core": "^3.16.2",
+    "@midwayjs/info": "^3.16.8",
+    "@midwayjs/jwt": "^3.16.8",
+    "@midwayjs/koa": "^3.16.8",
     "@midwayjs/logger": "^3.1.0",
-    "@midwayjs/validate": "^3.12.0",
+    "@midwayjs/typeorm": "^3.16.5",
+    "@midwayjs/validate": "^3.16.8",
     "dayjs": "^1.11.12",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "pg": "^8.12.0",
+    "typeorm": "^0.3.20"
   },
   "devDependencies": {
-    "@midwayjs/mock": "^3.12.0",
+    "@midwayjs/mock": "^3.16.5",
     "@types/jest": "^29.2.0",
     "@types/lodash": "^4.17.7",
     "@types/node": "14",
@@ -46,4 +50,4 @@
   },
   "author": "anonymous",
   "license": "MIT"
-}
+}

package-lock.json

@@ -1272,11 +1272,11 @@
       }
     },
     "node_modules/@midwayjs/bootstrap": {
-      "version": "3.16.6",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/bootstrap/-/bootstrap-3.16.6.tgz",
-      "integrity": "sha512-/VhhQMqXmE/0/JlgQs2ECY0GZKmIJxQRVkxf0cx8U19JN1ZyuHf179GEQucamFN6ZJuGtDTNNoOpWUeYrngskw==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/bootstrap/-/bootstrap-3.17.1.tgz",
+      "integrity": "sha512-HlBpWtmINUoZzgiYzIqUlXUbqECZCWr7obA49SkUggHXD4HYTz2TZKJmDEvEjcoRueTIfa0Y+0mjFY/wnqAMgw==",
       "dependencies": {
-        "@midwayjs/async-hooks-context-manager": "^3.16.2",
+        "@midwayjs/async-hooks-context-manager": "^3.17.1",
         "@midwayjs/event-bus": "1.10.0"
       },
       "engines": {
@@ -1296,9 +1296,9 @@
       }
     },
     "node_modules/@midwayjs/core": {
-      "version": "3.16.2",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/core/-/core-3.16.2.tgz",
-      "integrity": "sha512-ucJzCjL3kvTW4iLmPbYWPeDAaIrbU0G63Lw4nz4AOz4+3NIUCmD/Ezgj8m4K0VKJ0usqM72Vdg6ySYXgreYkfg==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/core/-/core-3.17.1.tgz",
+      "integrity": "sha512-kdUeX7/BjgP88Q1ry/80kqW8BG75OwJfmOqgTgVvYI/YIl56W5FlPXwOWYWGEYEfTRuE/8Oupk5fWmLEEmhLmw==",
       "dependencies": {
         "@midwayjs/glob": "^1.0.2",
         "class-transformer": "0.5.1",
@@ -1337,9 +1337,9 @@
       }
     },
     "node_modules/@midwayjs/info": {
-      "version": "3.16.8",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/info/-/info-3.16.8.tgz",
-      "integrity": "sha512-So0xyhTF0DxrUKrLqVz+Ghg78HzIG74otcBIIumG6WWuZMmncjG3NP/gxdWoM2TosownyDVfFL99mbq35JRqVg==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/info/-/info-3.17.1.tgz",
+      "integrity": "sha512-e2j5QKpXq0yncmU7UFTwTD4NNyWnUVN8Nx86Ikcspoq09RCpX2a892VToYW48DGAGjK1OoKSAzDVQQaaYTBApw==",
       "dependencies": {
         "picomatch": "2.3.1"
       },
@@ -1348,9 +1348,9 @@
       }
     },
     "node_modules/@midwayjs/jwt": {
-      "version": "3.16.8",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/jwt/-/jwt-3.16.8.tgz",
-      "integrity": "sha512-igP6X9UZexPraqIyhEa58hu7XD+pHyOD/6nGD9sG4j8s6LTT/amSzTPC7kQ3MgbC9hOosQOadt5sNVhUo24qwA==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/jwt/-/jwt-3.17.1.tgz",
+      "integrity": "sha512-ZsVkJfB90P1MIlia8Ibe+GPcH58LXoZG1u4gcHdHko7Dy/fVfUo7sQLJ3mZn25xUqQH3pqJdv7egpeKnlEqMdg==",
       "dependencies": {
         "@types/jsonwebtoken": "9.0.6",
         "jsonwebtoken": "9.0.2"
@@ -1360,14 +1360,14 @@
       }
     },
     "node_modules/@midwayjs/koa": {
-      "version": "3.16.8",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/koa/-/koa-3.16.8.tgz",
-      "integrity": "sha512-WM4zvvDZ630KFS/IfhHo+URP/xbAnNd4YI5pUFLwZmCm3ASS1HisvhC6pCKBrQrMDoArJ9Y15APgJzb+xTO0+w==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/koa/-/koa-3.17.1.tgz",
+      "integrity": "sha512-rFPYNcPBOJmpDrCo+hUditAFEnpgCdiIgUJuKWtIV7YFRiPqgrUG+QTMhx4d9UPXEgPZMM0tkybcbOuHovX4jQ==",
       "dependencies": {
         "@koa/router": "^12.0.0",
         "@midwayjs/cookies": "^1.0.2",
-        "@midwayjs/core": "^3.16.2",
-        "@midwayjs/session": "^3.16.5",
+        "@midwayjs/core": "^3.17.1",
+        "@midwayjs/session": "^3.17.1",
         "@types/koa": "2.15.0",
         "@types/qs": "6.9.15",
         "koa": "2.15.3",
@@ -1379,9 +1379,9 @@
       }
     },
     "node_modules/@midwayjs/logger": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/logger/-/logger-3.4.0.tgz",
-      "integrity": "sha512-Ee2njZddF2JAvz3og4JGLoGk5XHm5c7edZOjctMSoBp+pNe3VvrQvBd29cQQxKUB8TnAYVRgeBYvTlBQOmv3dg==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/logger/-/logger-3.4.2.tgz",
+      "integrity": "sha512-BxSdSMog4jxeqpHwgauuKZT6iAiu/Vr1HDjO9l81iqU+l8c9veAJVeLT08nTqKdjUiQXnxTaW6nYlvnzF2HdMA==",
       "dependencies": {
         "dayjs": "^1.10.7",
         "safe-stable-stringify": "^2.4.3"
@@ -1391,12 +1391,12 @@
       }
     },
     "node_modules/@midwayjs/mock": {
-      "version": "3.16.5",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/mock/-/mock-3.16.5.tgz",
-      "integrity": "sha512-BBfqA0voaV2G5D420HkIc6df7WruOFN1x2xi6ts7g0pRzv7NWxue6l4J+m2sl3UJZ76mhPbXRAzrMEUSeqsb8w==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/mock/-/mock-3.17.1.tgz",
+      "integrity": "sha512-ZPZdbsgKZnLQ8jmO7/JfhgrphRXCDkzXWOCJy2vAYHU4ryR7HLOwkzVLH1W9xCeEH9L42GkzemuyzvT6UQyY7Q==",
       "dev": true,
       "dependencies": {
-        "@midwayjs/async-hooks-context-manager": "^3.16.2",
+        "@midwayjs/async-hooks-context-manager": "^3.17.1",
         "@types/superagent": "4.1.14",
         "@types/supertest": "2.0.16",
         "js-yaml": "4.1.0",
@@ -1419,9 +1419,9 @@
       }
     },
     "node_modules/@midwayjs/typeorm": {
-      "version": "3.16.5",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/typeorm/-/typeorm-3.16.5.tgz",
-      "integrity": "sha512-beZUv5EOZXIYpTmFuW88LZHG8WPN2Gkab7rzMBmHly23HIiMWn5PjW1kAFaa58yfk9JZ6d0wmRzD+jstfuvkKw==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/typeorm/-/typeorm-3.17.1.tgz",
+      "integrity": "sha512-fWuOcPVmM5xWrU98dMx9YH7nyy/Cq82hEnbc3YwDLAU4AUCSaZRdfx6JaVgEvStlvGMwucgdMtP0HHCNPGGEww==",
       "bin": {
         "mwtypeorm": "cli.js"
       },
@@ -1430,11 +1430,11 @@
       }
     },
     "node_modules/@midwayjs/validate": {
-      "version": "3.16.8",
-      "resolved": "https://registry.npmmirror.com/@midwayjs/validate/-/validate-3.16.8.tgz",
-      "integrity": "sha512-7NFhWD36hntP6sHbBefEi5dxYok94S4j/WaIAglX+9EEgHXAwt+IRtukkt6o/+PeMskBsv2aVasCYmYFLouQcw==",
+      "version": "3.17.1",
+      "resolved": "https://registry.npmmirror.com/@midwayjs/validate/-/validate-3.17.1.tgz",
+      "integrity": "sha512-mtUAXqpl5gjM3ZA6F6CQBnMad7zPyOuoKPXjmWQ6JvudC8FMVyijo28M06Aom2w3cY00uF/k6sdfIKq/NvGayQ==",
       "dependencies": {
-        "@midwayjs/i18n": "^3.16.8",
+        "@midwayjs/i18n": "^3.17.1",
         "joi": "17.13.3"
       },
       "engines": {
@@ -2706,9 +2706,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001655",
-      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
-      "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+      "version": "1.0.30001657",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001657.tgz",
+      "integrity": "sha512-DPbJAlP8/BAXy3IgiWmZKItubb3TYGP0WscQQlVGIfT4s/YlFYVuJgyOsQNP7rJRChx/qdMeLJQJP0Sgg2yjNA==",
       "dev": true,
       "funding": [
         {
@@ -3164,11 +3164,11 @@
       "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
     },
     "node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -3179,11 +3179,6 @@
         }
       }
     },
-    "node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
     "node_modules/decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
@@ -3441,9 +3436,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.13",
-      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
-      "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
+      "version": "1.5.15",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.15.tgz",
+      "integrity": "sha512-Z4rIDoImwEJW+YYKnPul4DzqsWVqYetYVN3XqDmRpgV0mjz0hYTaeeh+8/9CL1bk3AHYmF4freW/NTiVoXA2gA==",
       "dev": true
     },
     "node_modules/emittery": {
@@ -6511,6 +6506,10 @@
       "dev": true,
       "engines": {
         "node": ">=12.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/raouldeheer"
       }
     },
     "node_modules/mz": {

src/config/config.local.ts

@@ -10,13 +10,13 @@ const dbUsername = 'system';
 /**数据库密码 */
 const dbPwd = '1234qwer!@#$';
 /**elasticsearch ip */
-const esIp = '10.120.114.6'
+const esIp = '10.120.114.6';
 /**elasticsearch 端口 */
-const esPort= '9200'
+const esPort = '9200';
 /**elasticsearch 用户名 */
-const esUserName = 'elastic'
+const esUserName = 'elastic';
 /**elasticsearch 密码 */
-const esPassword = 'NAjqFz_7tS2DkdpU7p*x'
+const esPassword = 'NAjqFz_7tS2DkdpU7p*x';
 export default {
   // use for cookie sign key, should change to your own and keep security
   keys: '1697684406848_4978',

src/config/config.self.ts

@@ -10,13 +10,13 @@ const dbUsername = 'system';
 /**数据库密码 */
 const dbPwd = '1234qwer!@#$';
 /**elasticsearch ip */
-const esIp = '127.0.0.1'
+const esIp = '127.0.0.1';
 /**elasticsearch 端口 */
-const esPort= '9200'
+const esPort = '9200';
 /**elasticsearch 用户名 */
-const esUserName = 'elastic'
+const esUserName = 'elastic';
 /**elasticsearch 密码 */
-const esPassword = 'NAjqFz_7tS2DkdpU7p*x'
+const esPassword = 'NAjqFz_7tS2DkdpU7p*x';
 export default {
   // use for cookie sign key, should change to your own and keep security
   keys: '1697684406848_4978',

src/service/search.service.ts

@@ -14,7 +14,7 @@ export class SearchService {
     this.esClient = esClient;
   }
   /**信息检索-企业查询 */
-  async company(keyword: string, skip: number = 0, limit: number = 10, others: object) {
+  async company(keyword: string, skip = 0, limit = 10, others: object) {
     const index = 'company';
     const fields = ['industry', 'tags', 'name', 'pattern', 'scale', 'type', 'area', 'email', 'address', 'brief', 'products'];
     return this.oneIndexSearch(keyword, index, fields, skip, limit, others);
@@ -27,25 +27,25 @@ export class SearchService {
   //   return this.oneIndexSearch(keyword, index, fields, skip, limit);
   // }
   /**信息检索-项目查询 */
-  async project(keyword: string, skip: number = 0, limit: number = 10, others: object) {
+  async project(keyword: string, skip = 0, limit = 10, others: object) {
     const index = 'project';
     const fields = ['tags', 'name', 'maturity', 'skill', 'type', 'area', 'field', 'cooperate', 'brief', 'main', 'progress', 'track_unit', 'source', 'industry'];
     return this.oneIndexSearch(keyword, index, fields, skip, limit, others);
   }
   /**信息检索-需求查询 */
-  async demand(keyword: string, skip: number = 0, limit: number = 10, others: object) {
+  async demand(keyword: string, skip = 0, limit = 10, others: object) {
     const index = 'demand';
     const fields = ['industry', 'tags', 'name', 'field', 'urgent', 'method', 'area', 'brief', 'demand_status', 'company', 'company_brief', 'contacts', 'tec_name', 'question'];
     return this.oneIndexSearch(keyword, index, fields, skip, limit, others);
   }
   /**信息检索-供给查询 */
-  async supply(keyword: string, skip: number = 0, limit: number = 10, others: object) {
+  async supply(keyword: string, skip = 0, limit = 10, others: object) {
     const index = 'supply';
     const fields = ['industry', 'tags', 'name', 'field', 'urgent', 'method', 'area', 'brief', 'demand_status'];
     return this.oneIndexSearch(keyword, index, fields, skip, limit, others);
   }
   /**信息检索-成果查询 */
-  async achievement(keyword: string, skip: number = 0, limit: number = 10, others: object) {
+  async achievement(keyword: string, skip = 0, limit = 10, others: object) {
     const index = 'achievement';
     const fields = ['industry', 'tags', 'name', 'patent', 'attribute', 'sell', 'mature', 'field', 'technology', 'area', 'brief', 'achievement_status', 'source'];
     return this.oneIndexSearch(keyword, index, fields, skip, limit, others);
@@ -71,7 +71,7 @@ export class SearchService {
           fields,
         },
       };
-      must.push(obj)
+      must.push(obj);
     }
 
     if (Object.keys(params).length > 0) {