diff --git a/config/dev.env.js b/config/dev.env.js
index 16734ec..fb72118 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -5,6 +5,6 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://139.198.17.115:20004/smartwell"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"http://192.168.0.166:14537"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index 16734ec..fb72118 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -5,6 +5,6 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://139.198.17.115:20004/smartwell"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"http://192.168.0.166:14537"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d023f1a..c8b83e6 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
   // BASE_API: '"http://111.198.10.15:8098/smartwell"',
   // BASE_API: '"http://106.74.146.218:2031"',
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 16734ec..fb72118 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -5,6 +5,6 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://139.198.17.115:20004/smartwell"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"http://192.168.0.166:14537"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d023f1a..c8b83e6 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
   // BASE_API: '"http://111.198.10.15:8098/smartwell"',
   // BASE_API: '"http://106.74.146.218:2031"',
 }
diff --git a/src/api/job.js b/src/api/job.js
index c02fdd5..94722c4 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -37,6 +37,7 @@
   return request({
     url: 'job/searchList',
     method: 'get',
+    timeout:200000,
     params
   })
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 16734ec..fb72118 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -5,6 +5,6 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://139.198.17.115:20004/smartwell"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"http://192.168.0.166:14537"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d023f1a..c8b83e6 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://111.198.10.15:11302/smartwell"',
-  // BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
+  // BASE_API: '"http://111.198.10.15:11302/smartwell"',
+  BASE_API: '"https://yjaqjk.bda.gov.cn/smartwell"',
   // BASE_API: '"http://111.198.10.15:8098/smartwell"',
   // BASE_API: '"http://106.74.146.218:2031"',
 }
diff --git a/src/api/job.js b/src/api/job.js
index c02fdd5..94722c4 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -37,6 +37,7 @@
   return request({
     url: 'job/searchList',
     method: 'get',
+    timeout:200000,
     params
   })
 }
diff --git a/src/page/mine/modules/ResetPwd.vue b/src/page/mine/modules/ResetPwd.vue
index fe8dfe6..42b6c2b 100644
--- a/src/page/mine/modules/ResetPwd.vue
+++ b/src/page/mine/modules/ResetPwd.vue
@@ -9,7 +9,7 @@
       </mt-header>
       <div class="listbody">
         <mt-field label="原密码" placeholder="请输入原密码" type="password" v-model="oldPassword" :state="oldPasswordValidate" @change="validateOldPass"></mt-field>
-        <mt-field label="新密码" placeholder="12位以上数字.字母.特殊字符组合" type="password" v-model="newPassword" :state="newPasswordValidate" @change="validateNewPass"></mt-field>
+        <mt-field label="新密码" placeholder="8位以上数字.字母.特殊字符组合" type="password" v-model="newPassword" :state="newPasswordValidate" @change="validateNewPass"></mt-field>
         <mt-field label="重复密码" placeholder="请再次输入密码" type="password" v-model="rePassword" :state="rePasswordValidate" @change="validateRePass"></mt-field>
       </div>
       <div class="logout-div">
@@ -40,13 +40,17 @@
       }
     },
     created(){
-      if(this.$route.query && this.$route.query.force)
-      this.force = this.$route.query.force
-      Toast({
-        message: '初次登录请修改密码',
-        position: 'center',
-        duration: 3 * 1000
-      })
+      if(this.$route.query && this.$route.query.force){
+        this.force = this.$route.query.force
+        if(force){
+          Toast({
+            message: '初次登录请修改密码',
+            position: 'center',
+            duration: 3 * 1000
+          })
+        }
+      }
+
     },
     methods:{
       //验证原密码
@@ -67,11 +71,11 @@
           this.newPasswordValidate = 'error'
           return false
         }else{
-          if(value.length<12){
+          if(value.length<8){
             this.newPasswordValidate = 'error'
             return false
           }else{
-            var reg = /^(?![a-zA-Z]+$)(?![a-z\d]+$)(?![a-z!@#\$%]+$)(?![A-Z\d]+$)(?![A-Z!@#\$%]+$)(?![\d!@#\$%]+$)[a-zA-Z\d!@#\$%]+$/
+            var reg = /^(?![a-zA-Z]+$)(?![a-z\d]+$)(?![a-z!@#\$%^&_=]+$)(?![A-Z\d]+$)(?![A-Z!@#\$%^&_=]+$)(?![\d!@#\$%]+$)[a-zA-Z\d!@#\$%^&_=]+$/
             if(value.match(reg)){
               this.newPasswordValidate = 'success'
               return true
@@ -103,7 +107,7 @@
           return
         }
         if(this.validateNewPass()==false){
-          Toast('密码长度至少12位，且包含数字、大、小写字母、特殊字符中至少三种')
+          Toast('密码长度至少8位，且包含数字、大、小写字母、特殊字符中至少三种')
           return
         }
         if(this.validateRePass()==false){