Merge branch 'master' of https://github.com/linlinjava/litemall

tianshazzqgit · Oct 7, 2021 · 5edc0a4 · 5edc0a4
2 parents ab54668 + 39e563b
commit 5edc0a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,14 +11,16 @@ jobs:
       matrix:
         java-version:
         - 8
+        - 8.0.192
         - 11
+        - 11.0.3
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java-version }}
       uses: actions/setup-java@v2
       with:
         java-version: ${{ matrix.java-version }}
-        distribution: adopt
+        distribution: zulu
     - name: Cache Maven packages
       uses: actions/cache@v2
       with:

diff --git a/litemall-admin/src/utils/validate.js b/litemall-admin/src/utils/validate.js
@@ -60,7 +60,7 @@ export function validAlphabets(str) {
  * @returns {Boolean}
  */
 export function validEmail(email) {
-  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  const reg = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
   return reg.test(email)
 }