0902

src/main/java/com/izouma/imt/security/WebSecurityConfig.java

@@ -62,6 +62,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 //swagger-ui放行路径
                 .antMatchers("/v2/api-docs", "/swagger-ui.html", "/swagger-resources/**", "/webjars/**").permitAll()
                 .antMatchers("/user/register").permitAll()
+                .antMatchers("/user/regUser").permitAll()
+                .antMatchers("/productTag/all").permitAll()
                 .antMatchers("/upload/**").permitAll()
                 .antMatchers("/files/**").permitAll()
                 .antMatchers("/static/**").permitAll()

src/main/pc/package-lock.json

@@ -2159,7 +2159,6 @@
       "version": "6.12.4",
       "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.4.tgz?cache=0&sync_timestamp=1597480799381&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.4.tgz",
       "integrity": "sha1-BhT6zEUiEn+nE0Rca/0+vTduIjQ=",
-      "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2303,7 +2302,6 @@
       "version": "0.2.4",
       "resolved": "https://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz",
       "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=",
-      "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
       }
@@ -2358,8 +2356,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -2399,8 +2396,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.2",
@@ -2426,14 +2422,12 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.10.1",
       "resolved": "https://registry.npm.taobao.org/aws4/download/aws4-1.10.1.tgz?cache=0&sync_timestamp=1597238704875&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faws4%2Fdownload%2Faws4-1.10.1.tgz",
-      "integrity": "sha1-4eguTz6Zniz9YbFhKA0WoRH4ZCg=",
-      "dev": true
+      "integrity": "sha1-4eguTz6Zniz9YbFhKA0WoRH4ZCg="
     },
     "axios": {
       "version": "0.20.0",
@@ -2491,11 +2485,39 @@
         }
       }
     },
+    "baidu-aip-sdk": {
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/baidu-aip-sdk/-/baidu-aip-sdk-2.4.6.tgz",
+      "integrity": "sha512-1P5PkrEylOm5RycXnu2KDgbSO38hgATHZxUGJJ29cYKAgHTBwQaLE2T5/gXcvbhJiNExLPKPgkCQ2R4JsWTuvQ==",
+      "requires": {
+        "debug": "^2.6.0",
+        "iconv-lite": "^0.4.15",
+        "keep-alive-agent": "0.0.1",
+        "mocha": "^4.0.1",
+        "request": "^2.79.0",
+        "should": "^13.2.0",
+        "underscore": "^1.8.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -2568,7 +2590,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -2692,7 +2713,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
       "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2733,6 +2753,12 @@
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
+    "browser-stdout": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+      "optional": true
+    },
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npm.taobao.org/browserify-aes/download/browserify-aes-1.2.0.tgz",
@@ -3090,8 +3116,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chalk": {
       "version": "2.4.2",
@@ -3453,7 +3478,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz",
       "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=",
-      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -3526,8 +3550,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -3730,8 +3753,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
       "version": "5.2.1",
@@ -4058,7 +4080,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -4330,8 +4351,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "depd": {
       "version": "1.1.2",
@@ -4361,6 +4381,12 @@
       "integrity": "sha1-AU7o+PZpxcWAI9pkuBecCDooxGw=",
       "dev": true
     },
+    "diff": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
+      "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
+      "optional": true
+    },
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npm.taobao.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz",
@@ -4529,7 +4555,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -4717,8 +4742,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint-scope": {
       "version": "4.0.3",
@@ -4929,8 +4953,7 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
-      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
-      "dev": true
+      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
     },
     "extend-shallow": {
       "version": "3.0.2",
@@ -5021,14 +5044,12 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz?cache=0&sync_timestamp=1591599675178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-3.1.3.tgz",
-      "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",
-      "dev": true
+      "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU="
     },
     "fast-glob": {
       "version": "2.2.7",
@@ -5070,8 +5091,7 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM=",
-      "dev": true
+      "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM="
     },
     "faye-websocket": {
       "version": "0.10.0",
@@ -5210,14 +5230,12 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz",
       "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
-      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -5290,8 +5308,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
       "version": "2.1.3",
@@ -5337,7 +5354,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -5413,6 +5429,12 @@
       "integrity": "sha1-Ila94U02MpWMRl68ltxGfKB6Kfs=",
       "dev": true
     },
+    "growl": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
+      "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
+      "optional": true
+    },
     "gzip-size": {
       "version": "5.1.1",
       "resolved": "https://registry.npm.taobao.org/gzip-size/download/gzip-size-5.1.1.tgz",
@@ -5432,14 +5454,12 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.5",
       "resolved": "https://registry.npm.taobao.org/har-validator/download/har-validator-5.1.5.tgz?cache=0&sync_timestamp=1596082653557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhar-validator%2Fdownload%2Fhar-validator-5.1.5.tgz",
       "integrity": "sha1-HwgDufjLIMD6E4It8ezds2veHv0=",
-      "dev": true,
       "requires": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
@@ -5811,7 +5831,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -5834,7 +5853,6 @@
       "version": "0.4.24",
       "resolved": "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz",
       "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
-      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -5932,7 +5950,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -5941,8 +5958,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz",
-      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
-      "dev": true
+      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w="
     },
     "internal-ip": {
       "version": "4.3.0",
@@ -6257,8 +6273,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-windows": {
       "version": "1.0.2",
@@ -6293,8 +6308,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "javascript-stringify": {
       "version": "2.0.1",
@@ -6363,8 +6377,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsesc": {
       "version": "2.5.2",
@@ -6387,20 +6400,17 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
-      "dev": true
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.3",
@@ -6430,7 +6440,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -6438,6 +6447,11 @@
         "verror": "1.10.0"
       }
     },
+    "keep-alive-agent": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz",
+      "integrity": "sha1-RIR8o5TOjWtSGuhYFr1kUJlCs4U="
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -6766,14 +6780,12 @@
     "mime-db": {
       "version": "1.44.0",
       "resolved": "https://registry.npm.taobao.org/mime-db/download/mime-db-1.44.0.tgz",
-      "integrity": "sha1-+hHF6wrKEzS0Izy01S8QxaYnL5I=",
-      "dev": true
+      "integrity": "sha1-+hHF6wrKEzS0Izy01S8QxaYnL5I="
     },
     "mime-types": {
       "version": "2.1.27",
       "resolved": "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.27.tgz",
       "integrity": "sha1-R5SfmOJ56lMRn1ci4PNOUpvsAJ8=",
-      "dev": true,
       "requires": {
         "mime-db": "1.44.0"
       }
@@ -6837,7 +6849,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -6940,6 +6951,97 @@
         "minimist": "^1.2.5"
       }
     },
+    "mocha": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz",
+      "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==",
+      "optional": true,
+      "requires": {
+        "browser-stdout": "1.3.0",
+        "commander": "2.11.0",
+        "debug": "3.1.0",
+        "diff": "3.3.1",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.2",
+        "growl": "1.10.3",
+        "he": "1.1.1",
+        "mkdirp": "0.5.1",
+        "supports-color": "4.4.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+          "optional": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "optional": true
+        },
+        "he": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+          "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+          "optional": true
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "optional": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "optional": true
+        },
+        "supports-color": {
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "optional": true,
+          "requires": {
+            "has-flag": "^2.0.0"
+          }
+        }
+      }
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
@@ -7164,8 +7266,7 @@
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
-      "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=",
-      "dev": true
+      "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -7303,7 +7404,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -7528,8 +7628,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -7588,8 +7687,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
       "version": "2.2.2",
@@ -8314,8 +8412,7 @@
     "psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npm.taobao.org/psl/download/psl-1.8.0.tgz?cache=0&sync_timestamp=1585142991033&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpsl%2Fdownload%2Fpsl-1.8.0.tgz",
-      "integrity": "sha1-kyb4vPsBOtzABf3/BWrM4CDlHCQ=",
-      "dev": true
+      "integrity": "sha1-kyb4vPsBOtzABf3/BWrM4CDlHCQ="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -8375,8 +8472,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
-      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
-      "dev": true
+      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
     },
     "q": {
       "version": "1.5.1",
@@ -8662,7 +8758,6 @@
       "version": "2.88.2",
       "resolved": "https://registry.npm.taobao.org/request/download/request-2.88.2.tgz",
       "integrity": "sha1-1zyRhzHLWofaBH4gcjQUb2ZNErM=",
-      "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -8689,8 +8784,7 @@
         "qs": {
           "version": "6.5.2",
           "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
-          "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=",
-          "dev": true
+          "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
         }
       }
     },
@@ -8812,8 +8906,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz",
-      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
-      "dev": true
+      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -8827,8 +8920,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz",
-      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
-      "dev": true
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo="
     },
     "sass": {
       "version": "1.26.10",
@@ -9108,6 +9200,60 @@
       "integrity": "sha1-Z6fQLHbJ2iT5nSCAj8re0ODgS+I=",
       "dev": true
     },
+    "should": {
+      "version": "13.2.3",
+      "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
+      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
+      "optional": true,
+      "requires": {
+        "should-equal": "^2.0.0",
+        "should-format": "^3.0.3",
+        "should-type": "^1.4.0",
+        "should-type-adaptors": "^1.0.1",
+        "should-util": "^1.0.0"
+      }
+    },
+    "should-equal": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
+      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+      "optional": true,
+      "requires": {
+        "should-type": "^1.4.0"
+      }
+    },
+    "should-format": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
+      "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
+      "optional": true,
+      "requires": {
+        "should-type": "^1.3.0",
+        "should-type-adaptors": "^1.0.1"
+      }
+    },
+    "should-type": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
+      "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
+      "optional": true
+    },
+    "should-type-adaptors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+      "optional": true,
+      "requires": {
+        "should-type": "^1.3.0",
+        "should-util": "^1.0.0"
+      }
+    },
+    "should-util": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
+      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
+      "optional": true
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.3.tgz",
@@ -9453,7 +9599,6 @@
       "version": "1.16.1",
       "resolved": "https://registry.npm.taobao.org/sshpk/download/sshpk-1.16.1.tgz",
       "integrity": "sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=",
-      "dev": true,
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -9919,7 +10064,6 @@
       "version": "2.5.0",
       "resolved": "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.5.0.tgz?cache=0&sync_timestamp=1584645751908&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftough-cookie%2Fdownload%2Ftough-cookie-2.5.0.tgz",
       "integrity": "sha1-zZ+yoKodWhK0c72fuW+j3P9lreI=",
-      "dev": true,
       "requires": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -9953,7 +10097,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -9961,8 +10104,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "type-fest": {
       "version": "0.6.0",
@@ -10010,6 +10152,11 @@
         }
       }
     },
+    "underscore": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
+      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npm.taobao.org/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -10154,7 +10301,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz",
       "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -10260,8 +10406,7 @@
     "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npm.taobao.org/uuid/download/uuid-3.4.0.tgz?cache=0&sync_timestamp=1595886825323&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-3.4.0.tgz",
-      "integrity": "sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4=",
-      "dev": true
+      "integrity": "sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -10289,7 +10434,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -10307,6 +10451,11 @@
       "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz",
       "integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
     },
+    "vue-avatar-cropper": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/vue-avatar-cropper/-/vue-avatar-cropper-1.0.6.tgz",
+      "integrity": "sha512-rZXhpbjW6F8Bx0+Yy510p+C/imO3DWzj7RXFfLGicit9fmzMLpQIGAZ/E35RuSEh7g2iIS1efkYUOJlOLjOsAw=="
+    },
     "vue-awesome-swiper": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-4.1.1.tgz",
@@ -11181,8 +11330,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
       "version": "6.2.1",

src/main/pc/package.json

@@ -10,12 +10,14 @@
     "@babel/polyfill": "^7.10.4",
     "animate.css": "^4.1.0",
     "axios": "^0.20.0",
+    "baidu-aip-sdk": "^2.4.6",
     "core-js": "^3.6.5",
     "countup.js": "^2.0.7",
     "element-ui": "^2.13.2",
     "qs": "^6.9.4",
     "swiper": "^5.4.5",
     "vue": "^2.6.11",
+    "vue-avatar-cropper": "^1.0.6",
     "vue-awesome-swiper": "^4.1.1",
     "vue-color": "^2.7.1",
     "vue-countup-v2": "^4.0.0",

src/main/pc/public/index.html

@@ -52,30 +52,4 @@
 	<div id="app"></div>
 	<!-- built files will be auto injected -->
 </body>
-
-<script>
-	window.onscroll = function (e) {
-		if (document.getElementById('banner')) {
-			if (
-				document.documentElement.scrollTop > 300
-			) {
-				document.getElementById('header').style.background =
-					'#0f264d';
-			} else {
-				document.getElementById('header').style.background =
-					'transparent';
-			}
-		}
-		else {
-			document.getElementById('header').style.background =
-				'#0f264d';
-		}
-
-	}
-
-
-
-
-</script>
-
 </html>

src/main/pc/src/App.vue

@@ -1,19 +1,48 @@
 <template>
     <div id="app">
-        <app-header />
-        <div id="main" class="el-main" >
+        <header-sys v-if="HeaderType == 'system'" />
+        <app-header v-else />
+        <div id="main" class="el-main">
             <router-view class="appContainer" />
-
             <app-footer />
         </div>
+        <Login ref="login" />
     </div>
 </template>
 <script>
 import AppHeader from './components/Header';
+import HeaderSys from './components/HeaderSys';
 import AppFooter from './components/Footer';
+import { mapState } from 'vuex';
+import Login from './views/Login';
 export default {
-    components: { AppHeader, AppFooter },
-    methods: {
+    data() {
+        return { loginVisible: false };
+    },
+    components: { AppHeader, AppFooter, Login, HeaderSys },
+    computed: {
+        ...mapState(['showLogin']),
+        pageTitle() {
+            return this.$route.meta.title;
+        },
+        HeaderType() {
+            return this.$route.meta.HeaderType || 'default';
+        },
+    },
+    watch: {
+        pageTitle() {
+            document.title = this.pageTitle;
+        },
+        showLogin() {
+            if (this.showLogin) {
+                this.$refs.login.loginVisible = true;
+            }
+        },
+    },
+    created() {
+        if (this.showLogin) {
+            this.$refs.login.loginVisible = true;
+        }
     },
 };
 </script>

src/main/pc/src/components/AutoImg.vue

@@ -1,7 +1,11 @@
 <template>
     <div
         class="bg autoImg"
-        :style="{ backgroundImage: 'url(' + src + ')', paddingTop: mul }"
+        :style="{
+            backgroundImage: 'url(' + src + ')',
+            paddingTop: mul||0,
+            height: mul ? 0 : '100%',
+        }"
     ></div>
 </template>
 <script>
@@ -14,7 +18,7 @@ export default {
         },
         mul: {
             type: String,
-            default: '100%',
+            default: '',
         },
     },
     data() {

src/main/pc/src/components/Footer.vue

@@ -8,8 +8,8 @@
                 <el-link type="primary">意见反馈</el-link>
             </el-col>
             <el-col :span="5" class="foot-item">
-                <div class="text1">我是厂商</div>
-                <el-link type="primary">厂商入驻</el-link>
+                <div class="text1">我是展商</div>
+                <el-link type="primary">展商入驻</el-link>
                 <el-link type="primary">入驻流程</el-link>
                 <el-link type="primary">升级会员</el-link>
             </el-col>
@@ -17,7 +17,7 @@
                 <div class="text1">我是采购商</div>
                 <el-link type="primary">采购指南</el-link>
                 <el-link type="primary">服务协议</el-link>
-                <el-link type="primary">挑选厂商</el-link>
+                <el-link type="primary">挑选展商</el-link>
             </el-col>
             <el-col :span="6" class="foot-item right" :offset="3">
                 <img src="../assets/dibu_logo.png" alt="" />

src/main/pc/src/components/Header.vue

@@ -12,7 +12,7 @@
                     <el-menu-item index="/home">{{
                         $t('shou-ye')
                     }}</el-menu-item>
-                    <el-menu-item index="/brand">厂商总览</el-menu-item>
+                    <el-menu-item index="/brand">展商总览</el-menu-item>
                     <el-menu-item index="/product">全球产品</el-menu-item>
                     <!-- <el-menu-item index="2">成为会员</el-menu-item> -->
                     <el-menu-item index="/IMT">IMT平台</el-menu-item>
@@ -21,8 +21,18 @@
                 <div class="tip"></div>
                 <SearchInput v-if="showSearch" />
                 <div class="btnlist">
-                    <el-button type="text" class="btn1">[登录]</el-button>
-                    <el-button type="text" class="btn2">[注册]</el-button>
+                    <el-button
+                        type="text"
+                        class="btn1"
+                        @click="$store.commit('updateShowLogin', true)"
+                        >[登录]</el-button
+                    >
+                    <el-button
+                        type="text"
+                        class="btn2"
+                        @click="$router.push('/register')"
+                        >[注册]</el-button
+                    >
                 </div>
                 <el-dropdown
                     size="mini"
@@ -100,10 +110,29 @@ export default {
             }
         },
     },
+    mounted() {
+        window.addEventListener('scroll', this.scrollEvent);
+    },
     methods: {
         changeLocales(lang) {
             this.$i18n.locale = lang;
         },
+        scrollEvent() {
+            if (document.getElementById('banner')) {
+                if (document.documentElement.scrollTop > 300) {
+                    document.getElementById('header').style.background =
+                        '#0f264d';
+                } else {
+                    document.getElementById('header').style.background =
+                        'transparent';
+                }
+            } else {
+                document.getElementById('header').style.background = '#0f264d';
+            }
+        },
+    },
+    beforeDestroy() {
+        window.removeEventListener('scroll', this.scrollEvent);
     },
     components: {
         SearchInput,

src/main/pc/src/components/SearchInput.vue

@@ -22,7 +22,7 @@
                 :popper-append-to-body="false"
             >
                 <el-option label="产品" value="1"></el-option>
-                <el-option label="厂商" value="2"></el-option>
+                <el-option label="展商" value="2"></el-option>
                 <el-option label="资讯" value="3"></el-option>
             </el-select>
         </el-autocomplete>
@@ -102,7 +102,7 @@ export default {
                 },
                 {
                     value: '快乐柠檬（神州智慧店）',
-                    address: '上海市长宁区天山西路567号1层R117号店铺',
+                    address: '上海市长宁区天山西路567号1层R117号展厅',
                 },
                 {
                     value: 'Merci Paul cafe',

src/main/pc/src/element-variables.scss

@@ -17,16 +17,37 @@
     -webkit-animation-duration: 0.3s;
     animation-duration: 0.3s;
 }
+
+.bold {
+    font-weight: bolder;
+}
 body {
     margin: 0;
     padding: 0;
     // overflow: hidden;
 }
 
+.el-input__inner,
+.el-input-group__append,
+.el-input-group__prepend {
+    border-radius: 0;
+}
+
+input:-webkit-autofill,
+textarea:-webkit-autofill,
+select:-webkit-autofill {
+    -webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
+    background-color: transparent;
+    background-image: none;
+    transition: background-color 50000s ease-in-out 0s; //背景色透明 生效时长 过渡效果 启用时延迟的时间
+}
+input {
+    background-color: transparent;
+}
 .flexEnd {
     display: flex;
-		justify-content: flex-end;
-		 align-items: center;
+    justify-content: flex-end;
+    align-items: center;
 }
 .el-dropdown .el-button-group {
     .el-button {

src/main/pc/src/locales/en.json

@@ -1,3 +1,4 @@
 {
-    "shou-ye": "Home"
+    "shou-ye": "Home",
+  "chname": "enName"
 }

src/main/pc/src/locales/zh.json

@@ -1,3 +1,4 @@
 {
-    "shou-ye": "首页"
+  "shou-ye": "首页",
+  "chname": "chName"
 }

src/main/pc/src/main.js

@@ -17,9 +17,11 @@ import 'swiper/css/swiper.css';
 import './element-variables.scss';
 import TitleDriver from './components/TitleDriver';
 import AutoImg from './components/AutoImg';
+import CropUpload from './components/CropUpload';
 
 Vue.component('title-driver', TitleDriver);
 Vue.component('auto-img', AutoImg);
+Vue.component('crop-upload', CropUpload);
 
 Vue.use(VueI18n);
 Vue.use(http);

src/main/pc/src/plugins/http.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import store from '../store';
 import router from '../router';
 import qs from 'qs';
 /* eslint-disable */
@@ -6,7 +7,7 @@ let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
         // baseUrl = 'http://localhost:8080';
-        baseUrl = 'http://192.168.50.127:8080';
+        baseUrl = 'http://localhost:8080';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';
@@ -46,14 +47,8 @@ axiosInstance.interceptors.response.use(
         } else {
             errorData = error.response.data;
             if (401 === error.response.status) {
-                if (router.currentRoute.name !== 'login') {
-                    router.replace({
-                        name: 'login',
-                        params: {
-                            from: router.currentRoute.name
-                        }
-                    });
-                } else {
+                if (router.currentRoute.meta.needLogin) {
+                    store.commit('updateShowLogin', true);
                 }
             }
         }

src/main/pc/src/router/index.js

@@ -1,5 +1,7 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
+import store from '../store';
+import http from '../plugins/http';
 
 Vue.use(VueRouter);
 
@@ -11,32 +13,59 @@ const routes = [
     {
         path: '/home',
         name: 'home',
-        component: () => import('../views/Home.vue')
+        component: () => import('../views/Home.vue'),
+        meta: {
+            title: '首页'
+        }
     },
     {
         path: '/brand',
         name: 'brand',
-        component: () => import('../views/Brand.vue')
+        component: () => import('../views/Brand.vue'),
+        meta: {
+            title: '展商总览'
+        }
     },
     {
         path: '/product',
         name: 'product',
-        component: () => import('../views/Product.vue')
+        component: () => import('../views/Product.vue'),
+        meta: {
+            title: '全球产品'
+        }
     },
     {
         path: '/IMT',
         name: 'IMT',
-        component: () => import('../views/IMT.vue')
+        component: () => import('../views/IMT.vue'),
+        meta: {
+            title: 'IMT平台'
+        }
     },
     {
         path: '/NEWS',
         name: 'NEWS',
-        component: () => import('../views/NEWS.vue')
+        component: () => import('../views/NEWS.vue'),
+        meta: {
+            title: '新闻资讯'
+        }
     },
     {
         path: '/search',
         name: 'search',
-        component: () => import('../views/Search.vue')
+        component: () => import('../views/Search.vue'),
+        meta: {
+            title: '搜索结果'
+        }
+    },
+    {
+        path: '/register',
+        name: 'register',
+        component: () => import('../views/system/Register.vue'),
+        meta: {
+            title: '新用户注册',
+            HeaderType: 'system'
+        }
     }
 ];
 
@@ -45,7 +74,6 @@ const router = new VueRouter({
     base: process.env.BASE_URL,
     routes,
     scrollBehavior(to, from, savedPosition) {
-        console.log(savedPosition);
         if (savedPosition) {
             return savedPosition;
         } else {
@@ -54,4 +82,49 @@ const router = new VueRouter({
     }
 });
 
+router.beforeEach((to, from, next) => {
+    if (/^\/http/.test(to.path)) {
+        console.log(Vue.$baseUrl);
+        let url = to.path.replace('/', '');
+        let params = [];
+        if (to.query) {
+            for (let key in to.query) {
+                if (to.query.hasOwnProperty(key)) {
+                    params.push(`${key}=${to.query[key]}`);
+                }
+            }
+        }
+        if (params.length > 0) {
+            url += `?${params.join('&')}`;
+        }
+        window.open(url);
+        return;
+    }
+
+    if (!store.state.userInfo) {
+        http.axios
+            .get('/user/my')
+            .then(res => {
+                store.commit('updateShowLogin', false);
+                store.commit('updateUserInfo', res.data);
+                next();
+                return;
+            })
+            .catch(() => {
+                localStorage.removeItem('token');
+                if (to.meta.needLogin) {
+                    store.commit('updateShowLogin', true);
+                    next(false);
+                } else {
+                    next();
+                }
+            });
+    } else if (!to.matched.length) {
+        next('/404');
+    } else {
+        store.commit('updateShowLogin', false);
+        next();
+    }
+});
+
 export default router;

src/main/pc/src/store/index.js

@@ -1,15 +1,16 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
+import Vue from 'vue';
+import Vuex from 'vuex';
 
-Vue.use(Vuex)
+Vue.use(Vuex);
 
 export default new Vuex.Store({
-  state: {
-  },
-  mutations: {
-  },
-  actions: {
-  },
-  modules: {
-  }
-})
+    state: {
+        userInfo: null,
+        showLogin: false
+    },
+    mutations: {
+        updateShowLogin(state, show) {
+            state.showLogin = show;
+        }
+    }
+});

src/main/pc/src/utils/Sms.js

@@ -1,5 +1,15 @@
 import http from '../plugins/http';
+import { Message } from 'element-ui';
 
 function sendMsg(phone) {
-	
-}
+    return http.axios
+        .get('/sms/sendVerify', {
+            phone
+        })
+        .then(() => {
+            Message.success('发送成功');
+            return Promise.resolve();
+        });
+}
+
+export { sendMsg };

src/main/pc/src/views/Home.vue

@@ -35,7 +35,7 @@
                         text-color="#292C33"
                         class="fontYahei"
                     >
-                        <el-radio-button :label="0">厂商</el-radio-button>
+                        <el-radio-button :label="0">展商</el-radio-button>
                         <el-radio-button :label="1">产品</el-radio-button>
                         <el-radio-button :label="2">资讯</el-radio-button>
                     </el-radio-group>

src/main/pc/src/views/Search.vue

@@ -11,7 +11,7 @@
                             text-color="#292C33"
                             class="fontYahei"
                         >
-                            <el-radio-button :label="0">厂商</el-radio-button>
+                            <el-radio-button :label="0">展商</el-radio-button>
                             <el-radio-button :label="1">产品</el-radio-button>
                             <el-radio-button :label="2">资讯</el-radio-button>
                         </el-radio-group>

src/main/pc/src/views/system/Register.vue

@@ -36,7 +36,15 @@
                     </el-form-item>
                     <el-form-item label="手机验证码" prop="code">
                         <el-input v-model="form.code" placeholder="输入验证码">
-                            <el-button slot="append" type="warning" plain>
+                            <el-button
+                                slot="append"
+                                type="warning"
+                                :disabled="
+                                    !$refs.form.validateField('phone') || isSend
+                                "
+                                plain
+                                @click="sendMsg"
+                            >
                                 获取验证码</el-button
                             >
                         </el-input>
@@ -162,6 +170,7 @@ import {
 import { generalEvent } from '../../utils/AipOcrClient';
 import Area from '../../components/AreaInput';
 import { delChild } from '../../utils/Array';
+import { sendMsg } from '../../utils/Sms';
 export default {
     name: 'Register',
     data() {
@@ -296,6 +305,7 @@ export default {
             },
             phoneType: '+86',
             productTags: [],
+            isSend: false,
         };
     },
     computed: {
@@ -345,6 +355,9 @@ export default {
                 }
             });
         },
+        sendMsg() {
+            sendMsg(this.form.phone).then((res) => {});
+        },
     },
     components: {
         Area,
@@ -388,8 +401,8 @@ export default {
 
     .el-form-item__error {
         left: auto;
-				top: 0px;
-				right: 20px;
+        top: 0px;
+        right: 20px;
         white-space: nowrap;
         line-height: 40px;
         padding-top: 0;

src/main/pc/vue.config.js

@@ -7,7 +7,8 @@ module.exports = {
             ? './'
             : '/',
     devServer: {
-        port: 8081
+        port: 8081,
+        disableHostCheck: true
     },
     pluginOptions: {
         'style-resources-loader': {
@@ -22,10 +23,10 @@ module.exports = {
     },
     transpileDependencies: [
         'element-ui',
-				'swiper',
-				'ssr-window',
+        'swiper',
+        'ssr-window',
         'dom7',
         'vue-awesome-swiper',
-        'vuex',
+        'vuex'
     ]
 };

src/main/vue/package-lock.json

@@ -1782,6 +1782,17 @@
           "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
@@ -1808,6 +1819,34 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
         "find-cache-dir": {
           "version": "3.3.1",
           "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
@@ -1829,6 +1868,13 @@
             "path-exists": "^4.0.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -1899,6 +1945,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
@@ -1915,6 +1971,21 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.0.0-beta.5",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.5.tgz",
+          "integrity": "sha512-ciWfzNefqWlmzKznCWY9hl+fPP4KlQ0A9MtHbJ/8DpyY+dAM8gDrjufIdxwTgC4szE4EZC3A6ip/BbrqM84GqA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@types/mini-css-extract-plugin": "^0.9.1",
+            "chalk": "^3.0.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^1.2.3",
+            "merge-source-map": "^1.1.0",
+            "source-map": "^0.6.1"
+          }
         }
       }
     },
@@ -11685,86 +11756,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.0.0-beta.5",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.5.tgz",
-      "integrity": "sha512-ciWfzNefqWlmzKznCWY9hl+fPP4KlQ0A9MtHbJ/8DpyY+dAM8gDrjufIdxwTgC4szE4EZC3A6ip/BbrqM84GqA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/mini-css-extract-plugin": "^0.9.1",
-        "chalk": "^3.0.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^1.2.3",
-        "merge-source-map": "^1.1.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.3.tgz",