system-clients 3.0.14-akyh-2 → 3.0.14-akyh-3

package/src/components/server/Login.vue

@@ -79,46 +79,43 @@
   </div>
   <!--输入框结束-->
   <!-- 注册模态框开始 -->
-  <!-- <modal v-ref:modal :show.sync="registerShow" :backdrop="false" class="auto">
+  <modal :show.sync="visible" v-ref:modal :backdrop="true">
     <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="close"><span>&times;</span></button>
-      <h4 class="modal-title">注册</h4>
+<!--      <button type="button" class="close" @click="closeReset"><span>&times;</span></button>-->
+      <h4 class="modal-title">密码强度过低，请及时重新设置</h4>
     </header>
     <article slot="modal-body" class="modal-body modifystyle">
       <validator name="v">
 
-        <div class="has-feedback"
-        :class="{'has-warning':$v.ename.required,'has-success': !$v.ename.required}">
-          <label for="user" class="control-label">登录用户:&nbsp;&nbsp;</label>
-          <input type="text" v-model="deliver.ename" class="form-control" id="user" v-validate:ename="{ required: true}">
-          <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.ename.required"></span>
-          <span v-if="$v.ename.required">不能为空</span>
+        <div class="has-feedback">
+          <label class="control-label">密码在8-16位字符之间，至少同时具有数字和密码</label>
         </div>
 
-        <div class="has-feedback"
-        :class="{'has-warning':$v.password.required, 'has-success': !$v.password.required}">
+        <div class="has-feedback">
+          <label class="control-label">用户名:</label>
+          <span style="color: black">{{model.ename}}</span>
+        </div>
+
+        <div class="has-feedback" :class="{'has-warning':deliver.password, 'has-success': !deliver.password}">
           <label for="newpassword" class="control-label">登录密码:&nbsp;&nbsp;</label>
-          <input type="password" v-model="deliver.password" class="form-control" id="newpassword" v-validate:password='{ required: true }'>
-          <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-          <span v-if="$v.password.required">不能为空</span>
+          <input type="password" v-model="deliver.password" class="form-control" id="newpassword">
+          <span v-if="!deliver.password">不能为空</span>
         </div>
 
         <div class="has-feedback"
-        :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
-        'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
+        :class="{'has-warning':deliver.affirmpassword,'has-success': !deliver.affirmpassword}">
           <label for="affirmpassword" class="control-label">确认密码:&nbsp;&nbsp;</label>
-          <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.password }">
-          <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-          <span v-if="$v.affirmpassword.required">不能为空</span>
-          <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+          <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword">
+          <span v-if="!deliver.affirmpassword">不能为空</span>
+          <span v-if="deliver.affirmpassword !== deliver.password">两次密码不一致 !!</span>
         </div>
-
       </validator>
     </article>
     <footer slot="modal-footer" class="footerbtn">
-      <button  type="button" class="btn btn-success" @click='registed()' :disabled="!$v.valid">提交注册</button>
+      <button  type="button" class="btn btn-success" @click='resetPassword()' :disabled="!$v.valid">提交</button>
+      <button  type="button" class="btn btn-default" @click='closeReset()'>返回</button>
     </footer>
-  <modal> -->
+  </modal>
   <!-- 注册模态框结束 -->
   <!--<load-data @ready="onReady"></load-data>-->
 <!--  </div>-->
@@ -189,6 +186,22 @@
             $('form').fadeIn(500)
         }
     }
+    let savePassword = function * (self) {
+      self.deliver.ename = self.model.ename
+      self.deliver.password = self.model.password
+      let res = yield self.$post('rs/db/modifypwd', {data: self.deliver})
+      if (res.status === 200 || res.status === 204) {
+        self.visible = false
+        self.deliver.password = ''
+        self.deliver.newpassword = ''
+        self.deliver.affirmpassword = ''
+        self.deliver.ename = ''
+        self.model.ename = ''
+        self.model.password = ''
+        self.login = false
+        $('form').fadeIn(500)
+      }
+    }
     export default {
         title: '登录',
         ready () {
@@ -222,7 +235,8 @@
                 show: false,
                 checkCode: '',
                 login_do:true,
-                picLyanzhengma: ''
+                picLyanzhengma: '',
+                visible: false
             }
         },
         methods: {
@@ -237,6 +251,11 @@
                 this.$emit('ready')
             },
             confirm (key) {
+              if (this.checkPassword(this.model.password) <= 2) {
+                this.visible = true
+                $('form').fadeIn(500)
+                return
+              }
                 this.login_do=!this.login_do
                 // return
                 if (key == 'key') {
@@ -282,7 +301,114 @@
                     code += random[index];//根据索引取得随机数加到code上
                 }
                 this.checkCode = code;//把code值赋给验证码
+            },
+          checkPassword (str) {
+            // 第一步先判断各分类长度
+            let num = 0// 数字
+            let lowerCase = 0// 小写字母
+            let upperCase = 0// 大写字母
+            let special = 0// 特殊字符
+            for (let i = 0; i < str.length; i++) {
+              const c = str.charCodeAt(i)
+              if (c >= 48 && c <= 57) {
+                // 数字
+                num++
+              } else if (c >= 65 && c <= 90) {
+                // 大写字母
+                upperCase++
+              } else if (c === 97 && c <= 122) {
+                // 小写字母
+                lowerCase++
+              } else {
+                special++
+              }
+            }
+            // 第二步 计算分数
+            let wholeMark = 0
+            let numMark = 0
+            let caseMark = 0
+            let specialMark = 0
+            let reward = 0
+            // 整长度分数
+            if (str.length <= 4) {
+              wholeMark = 5
+            } else if (str.length > 4 && str.length <= 8) {
+              wholeMark = 10
+            } else {
+              wholeMark = 25
             }
+            // 奖励分数
+            if ((lowerCase || upperCase) && num) {
+              reward = 2
+              if (special) {
+                reward = 3
+                if (lowerCase && upperCase) {
+                  reward = 5
+                }
+              }
+            }
+            // 字母分数
+            if (lowerCase || upperCase) {
+              caseMark = 10
+              if (lowerCase && upperCase) {
+                caseMark = 20
+              }
+            }
+            // 数字分数
+            if (num) {
+              numMark = 10
+              if (num >= 3) {
+                numMark = 20
+              }
+            }
+            // 符号分数
+            if (special) {
+              specialMark = 10
+              if (special > 1) {
+                specialMark = 25
+              }
+            }
+            const totalMark = wholeMark + numMark + caseMark + specialMark + reward
+            console.warn(totalMark)
+            let strength
+            if (totalMark < 25) {
+              strength = 0
+            } else if (totalMark >= 25 && totalMark < 50) {
+              strength = 1
+            } else if (totalMark >= 50 && totalMark < 60) {
+              strength = 2
+            } else if (totalMark >= 60 && totalMark < 70) {
+              strength = 3
+            } else if (totalMark >= 70 && totalMark < 80) {
+              strength = 4
+            } else if (totalMark >= 80 && totalMark < 90) {
+              strength = 5
+            } else {
+              strength = 6
+            }
+            return strength
+          },
+          closeReset () {
+              this.visible = false
+            this.login = false
+            $('form').fadeIn(500)
+          },
+          resetPassword () {
+              if (!this.deliver.password || !this.deliver.affirmpassword) {
+                this.$showMessage("密码不能为空！")
+                return
+              }
+              if (this.deliver.password !== this.deliver.affirmpassword) {
+                this.$showMessage("两次输入的密码不一致，请核对！")
+                return
+              }
+              if (this.checkPassword(this.deliver.password) <= 2) {
+                this.$showMessage("密码过于简单，请重新设置！")
+                return
+              }
+            let gen = savePassword(this)
+            co(gen)
+          }
         }
     }
 </script>

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Dec 01 10:42:40 CST 2021
-gradle.version=7.1

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

package/gradlew

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega