Merge remote-tracking branch 'origin/master'

components/mobile/registerEnterprise/index.vue

@@ -215,7 +215,7 @@
           if (this.state.mobile === 'success') {
             this.$indicator.open('获取中...')
             let _this = this
-            this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.step1.mobile}})
+            this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.step1.mobile, timestamp: new Date().getTime() + ''}})
               .then(response => {
                 this.$indicator.close()
                 if (response.data) {

components/mobile/registerPersonal/index.vue

@@ -219,7 +219,7 @@
         if (this.state.mobile === 'success') {
           this.$indicator.open('获取中...')
           let _this = this
-          this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.mobile}})
+          this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.mobile, timestamp: new Date().getTime() + ''}})
             .then(response => {
               this.$indicator.close()
               if (response.data) {

components/mobile/reset/stepAppeal.vue

@@ -184,7 +184,7 @@
             if (this.state.mobile === 'success') {
               this.$indicator.open('获取中...')
               let _this = this
-              this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.valid.mobile}})
+              this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.valid.mobile, timestamp: new Date().getTime() + ''}})
                 .then(response => {
                   this.$indicator.close()
                   if (response.data) {

components/mobile/reset/stepMobile.vue

@@ -72,7 +72,7 @@
         } else {
           this.$indicator.open('获取中...')
           let _this = this
-          this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.info}})
+          this.$http.get('/sso/personal/register/checkCode', {params: {mobile: this.info, timestamp: new Date().getTime() + ''}})
             .then(response => {
               this.$indicator.close()
               if (response.data) {

components/register/EnterpriseRegistration.vue

@@ -589,7 +589,7 @@
 //      获取校验码
       getCheckCode () {
         this.isShowLoading = true
-        this.$http.get(`/sso/userspace/register/checkCode`, {params: {mobile: this.enterprise.mobile}})
+        this.$http.get(`/sso/userspace/register/checkCode`, {params: {mobile: this.enterprise.mobile, timestamp: new Date().getTime() + ''}})
           .then(response => {
             this.isShowLoading = false
             if (response.data) {

components/register/PersonalRegistration.vue

@@ -516,7 +516,7 @@
       getCheckCode () {
         this.isShowLoading = true
 //        this.getCode()
-        this.$http.get(`/sso/personal/register/checkCode`, {params: {mobile: this.item.mobile}})
+        this.$http.get(`/sso/personal/register/checkCode`, {params: {mobile: this.item.mobile, timestamp: new Date().getTime() + ''}})
           .then(response => {
             this.isShowLoading = false
             if (response.data) {

server.js

@@ -3,7 +3,7 @@ const app = require('express')()
 const proxy = require('http-proxy-middleware')
 const cookiejar = require('cookiejar')
 const host = process.env.HOST || '127.0.0.1'
-const port = process.env.PORT || 80
+const port = process.env.PORT || 3001
 process.noDeprecation = true
 
 app.set('port', port)
@@ -17,7 +17,7 @@ const proxyTable = config.proxyTable
 if (proxyTable) {
   // 本地代理支持localhost、127.0.0.1等不同地址跨域
   app.use((req, res, next) => {
-    res.header('Access-Control-Allow-Origin', '*')
+    res.header('Access-Control-Allow-Origin', req.get('origin'))
     res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE')
     res.header('Access-Control-Allow-Headers', 'Content-Type')
     res.header('Access-Control-Allow-Credentials', 'true')