diff --git a/jshERP-web/src/components/tools/UserPassword.vue b/jshERP-web/src/components/tools/UserPassword.vue
index 721d6f2a..51523fc6 100644
--- a/jshERP-web/src/components/tools/UserPassword.vue
+++ b/jshERP-web/src/components/tools/UserPassword.vue
@@ -40,6 +40,7 @@
 <script>
 
   import { putAction } from '@/api/manage'
+  import md5 from 'md5'
 
   export default {
     name: "UserPassword",
@@ -111,6 +112,8 @@
         this.form.validateFields((err, values) => {
           if (!err) {
             that.confirmLoading = true;
+            values.oldpassword = md5(values.oldpassword)
+            values.password = md5(values.password)
             let params = Object.assign({userId:this.userId},values)
             console.log("修改密码提交数据",params)
             putAction(this.url,params).then((res)=>{
diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue
index 4befb704..87c90970 100644
--- a/jshERP-web/src/views/user/Login.vue
+++ b/jshERP-web/src/views/user/Login.vue
@@ -55,6 +55,7 @@
 </template>
 <!-- BY cao_yu_li -->
 <script>
+  import md5 from "md5"
   import api from '@/api'
   import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
   import { mapActions } from "vuex"
@@ -132,7 +133,7 @@
           that.form.validateFields([ 'loginName', 'password', 'rememberMe' ], { force: true }, (err, values) => {
             if (!err) {
               loginParams.loginName = values.loginName
-              loginParams.password = values.password
+              loginParams.password = md5(values.password)
               //loginParams.remember_me = values.rememberMe
               console.log("登录参数",loginParams)
               that.Login(loginParams).then((res) => {
diff --git a/jshERP-web/src/views/user/Register.vue b/jshERP-web/src/views/user/Register.vue
index b316429d..f41f625c 100644
--- a/jshERP-web/src/views/user/Register.vue
+++ b/jshERP-web/src/views/user/Register.vue
@@ -80,6 +80,7 @@
   import {mixinDevice} from '@/utils/mixin.js'
   import {getAction, postAction} from '@/api/manage'
   import {checkOnlyUser} from '@/api/api'
+  import md5 from 'md5'
 
   const levelNames = {
     0: '低',
@@ -232,7 +233,7 @@
             if(values.inputCode == this.randCode) {
               let register = {
                 loginName: values.username,
-                password: values.password
+                password: md5(values.password)
               };
               postAction("/user/registerUser", register).then((res) => {
                 if(res.code === 200){