Merge remote-tracking branch 'origin/master'

.drone.yml

@@ -11,6 +11,18 @@ steps:
       - npm run build:stage
       - pwd
       - ls -la
+  - name: removeFiles
+    image: appleboy/drone-ssh
+    settings:
+      host: deploy.iamsee.com
+      username: root
+      password: $jgkj001
+      debug: true
+      script:
+        - cd /www/wwwroot/railway-web.iamsee.com/release
+        - pwd
+        - chattr -i dist/.user.ini
+        - rm -rf dist
   - name: scp_files
     image: appleboy/drone-scp
     settings:

.drone_prod.yml

@@ -11,15 +11,16 @@ steps:
       - npm run build:prod
       - pwd
       - ls -la
-  - name: remoteFiles
+  - name: removeFiles
     image: appleboy/drone-ssh
     settings:
-      host: deploy.iamsee.com
+      host: 182.92.65.152
+      port: 27082
       username: root
-      password: $jgkj001
+      password: Swsc2021!bd
       debug: true
       script:
-        - cd /www/wwwroot/railway-web.iamsee.com/release
+        - cd /www/wwwroot/gdscys.svstrong.com/release
         - pwd
         - chattr -i dist/.user.ini
         - rm -rf dist

src/layout/components/UserPassword.vue

@@ -41,7 +41,7 @@
           label="确认新密码"
         >
           <a-input
-            v-decorator="[ 'confirmPassword', validatorRules.confirmPassword]"
+            v-decorator="[ 'reNewPassword', validatorRules.reNewPassword]"
             type="password"
             placeholder="请确认新密码"
           />
@@ -77,7 +77,7 @@ export default {
             validator: this.validateToNextPassword
           }]
         },
-        confirmPassword: {
+        reNewPassword: {
           rules: [{
             required: true, message: '请确认新密码!'
           }, {
@@ -126,10 +126,10 @@ export default {
         if (!err) {
           // { userName: this.username },
           const params = Object.assign(values)
-          params.oldPassword = encodeURIComponent(params.oldPassword)
-          params.newPassword = encodeURIComponent(params.newPassword)
-          params.confirmPassword = encodeURIComponent(params.confirmPassword)
-          delete params.confirmPassword
+          // params.oldPassword = encodeURIComponent(params.oldPassword)
+          // params.newPassword = encodeURIComponent(params.newPassword).
+          // params.reNewPassword = encodeURIComponent(params.reNewPassword)
+          // delete params.reNewPassword
           console.log('修改密码提交数据', params)
           putAction(this.url, params).then((res) => {
             if (res.code === 200) {

src/utils/request.js

@@ -45,6 +45,10 @@ service.interceptors.request.use(
       paramsObject = Object.assign({}, config.data)
       JSONToString(paramsObject)
     }
+    if (config.url === 'system/user/profile/updatePwd') {
+      paramsObject = Object.assign({}, config.params)
+      JSONToString(paramsObject)
+    }
 
     function JSONToString(paramsObject) {
       Object.keys(paramsObject).forEach(key => {
@@ -57,6 +61,7 @@ service.interceptors.request.use(
         }
       })
     }
+
     console.log('paramsObject===', paramsObject)
     const queryString1 = queryString.stringify(paramsObject)
     console.log('queryString1===', queryString1)