dedsudiyu 1 year ago
parent
commit
a97b8ddb35
2 changed files with 48 additions and 29 deletions
  1. 37 18
      src/views/comprehensive/system/publicConfig/exploitConfig.vue
  2. 11 11
      src/views/login.vue

+ 37 - 18
src/views/comprehensive/system/publicConfig/exploitConfig.vue

@@ -202,17 +202,27 @@
         let _this = this;
         this.$refs["form"].validate(valid => {
           if (valid) {
-            _this.form.mqttExtranetUrl=Encrypt(_this.form.mqttExtranetUrl)
-            _this.form.mqttExtranetUser=Encrypt(_this.form.mqttExtranetUser)
-            _this.form.mqttExtranetPassword=Encrypt(_this.form.mqttExtranetPassword)
-
-            _this.form.mqttIntranetUrl=Encrypt(_this.form.mqttIntranetUrl)
-            _this.form.mqttIntranetUser=Encrypt(_this.form.mqttIntranetUser)
-            _this.form.mqttIntranetPassword=Encrypt(_this.form.mqttIntranetPassword)
-            addUrlConfig(_this.form).then(response => {
+            let obj = JSON.parse(JSON.stringify(_this.form))
+            obj.fileIntranetUrl=Encrypt(obj.fileIntranetUrl)
+            obj.fileExtranetUrl=Encrypt(obj.fileExtranetUrl)
+            obj.cameraIntranetUrl=Encrypt(obj.cameraIntranetUrl)
+            obj.cameraExtranetUrl=Encrypt(obj.cameraExtranetUrl)
+            obj.cameraIntranetAgent=Encrypt(obj.cameraIntranetAgent)
+            obj.cameraExtranetAgent=Encrypt(obj.cameraExtranetAgent)
+            obj.ipIdentify=Encrypt(obj.ipIdentify)
+            obj.screenIntranetUrl=Encrypt(obj.screenIntranetUrl)
+            obj.screenExtranetUrl=Encrypt(obj.screenExtranetUrl)
+            obj.pcIntranetUrl=Encrypt(obj.pcIntranetUrl)
+            obj.pcExtranetUrl=Encrypt(obj.pcExtranetUrl)
+            obj.mqttExtranetUrl=Encrypt(obj.mqttExtranetUrl)
+            obj.mqttExtranetUser=Encrypt(obj.mqttExtranetUser)
+            obj.mqttExtranetPassword=Encrypt(obj.mqttExtranetPassword)
+            obj.mqttIntranetUrl=Encrypt(obj.mqttIntranetUrl)
+            obj.mqttIntranetUser=Encrypt(obj.mqttIntranetUser)
+            obj.mqttIntranetPassword=Encrypt(obj.mqttIntranetPassword)
+            addUrlConfig(obj).then(response => {
               _this.msgSuccess(response.msg);
               _this.getUrlConfig()
-
             });
           }
         });
@@ -221,15 +231,24 @@
       getUrlConfig(){
         let _this=this;
         getUrlConfig().then(response => {
-            _this.form=response.data
-
-          _this.form.mqttExtranetUrl=Decrypt(_this.form.mqttExtranetUrl)
-          _this.form.mqttExtranetUser=Decrypt(_this.form.mqttExtranetUser)
-          _this.form.mqttExtranetPassword=Decrypt(_this.form.mqttExtranetPassword)
-
-          _this.form.mqttIntranetUrl=Decrypt(_this.form.mqttIntranetUrl)
-          _this.form.mqttIntranetUser=Decrypt(_this.form.mqttIntranetUser)
-          _this.form.mqttIntranetPassword=Decrypt(_this.form.mqttIntranetPassword)
+          _this.form=response.data
+          _this.form.fileIntranetUrl=Decrypt(_this.form.fileIntranetUrl)?Decrypt(_this.form.fileIntranetUrl):_this.form.fileIntranetUrl
+          _this.form.fileExtranetUrl=Decrypt(_this.form.fileExtranetUrl)?Decrypt(_this.form.fileExtranetUrl):_this.form.fileExtranetUrl
+          _this.form.cameraIntranetUrl=Decrypt(_this.form.cameraIntranetUrl)?Decrypt(_this.form.cameraIntranetUrl):_this.form.cameraIntranetUrl
+          _this.form.cameraExtranetUrl=Decrypt(_this.form.cameraExtranetUrl)?Decrypt(_this.form.cameraExtranetUrl):_this.form.cameraExtranetUrl
+          _this.form.cameraIntranetAgent=Decrypt(_this.form.cameraIntranetAgent)?Decrypt(_this.form.cameraIntranetAgent):_this.form.cameraIntranetAgent
+          _this.form.cameraExtranetAgent=Decrypt(_this.form.cameraExtranetAgent)?Decrypt(_this.form.cameraExtranetAgent):_this.form.cameraExtranetAgent
+          _this.form.ipIdentify=Decrypt(_this.form.ipIdentify)?Decrypt(_this.form.ipIdentify):_this.form.ipIdentify
+          _this.form.screenIntranetUrl=Decrypt(_this.form.screenIntranetUrl)?Decrypt(_this.form.screenIntranetUrl):_this.form.screenIntranetUrl
+          _this.form.screenExtranetUrl=Decrypt(_this.form.screenExtranetUrl)?Decrypt(_this.form.screenExtranetUrl):_this.form.screenExtranetUrl
+          _this.form.pcIntranetUrl=Decrypt(_this.form.pcIntranetUrl)?Decrypt(_this.form.pcIntranetUrl):_this.form.pcIntranetUrl
+          _this.form.pcExtranetUrl=Decrypt(_this.form.pcExtranetUrl)?Decrypt(_this.form.pcExtranetUrl):_this.form.pcExtranetUrl
+          _this.form.mqttExtranetUrl=Decrypt(_this.form.mqttExtranetUrl)?Decrypt(_this.form.mqttExtranetUrl):_this.form.mqttExtranetUrl
+          _this.form.mqttExtranetUser=Decrypt(_this.form.mqttExtranetUser)?Decrypt(_this.form.mqttExtranetUser):_this.form.mqttExtranetUser
+          _this.form.mqttExtranetPassword=Decrypt(_this.form.mqttExtranetPassword)?Decrypt(_this.form.mqttExtranetPassword):_this.form.mqttExtranetPassword
+          _this.form.mqttIntranetUrl=Decrypt(_this.form.mqttIntranetUrl)?Decrypt(_this.form.mqttIntranetUrl):_this.form.mqttIntranetUrl
+          _this.form.mqttIntranetUser=Decrypt(_this.form.mqttIntranetUser)?Decrypt(_this.form.mqttIntranetUser):_this.form.mqttIntranetUser
+          _this.form.mqttIntranetPassword=Decrypt(_this.form.mqttIntranetPassword)?Decrypt(_this.form.mqttIntranetPassword):_this.form.mqttIntranetPassword
         });
       },
     },

+ 11 - 11
src/views/login.vue

@@ -138,17 +138,17 @@ export default {
         //判定http或者https
         let urlText = window.location.href.split('://')[0]+'://';
 
-        let outerNet=window.location.href.indexOf(response.data.ipIdentify) == -1//true外网 false 内网
+        let outerNet=window.location.href.indexOf(Decrypt(response.data.ipIdentify)) == -1//true外网 false 内网
 
         if(outerNet){//外网
           //文件预览地址
-          localStorage.setItem('filePreviewUrl',urlText+response.data.fileExtranetUrl)
+          localStorage.setItem('filePreviewUrl',urlText+Decrypt(response.data.fileExtranetUrl))
           //摄像头代理访问地址
-          localStorage.setItem('cameraExtranetAgent',urlText+response.data.cameraExtranetAgent)
+          localStorage.setItem('cameraExtranetAgent',urlText+Decrypt(response.data.cameraExtranetAgent))
           //摄像头地址ip段
-          localStorage.setItem('ipIdentify',response.data.ipIdentify)
+          localStorage.setItem('ipIdentify',Decrypt(response.data.ipIdentify))
           //摄像头访问地址
-          localStorage.setItem('cameraUrl','wss://'+response.data.cameraExtranetUrl)
+          localStorage.setItem('cameraUrl','wss://'+Decrypt(response.data.cameraExtranetUrl))
           //MQTT地址
           localStorage.setItem('mqttUrl','wss://'+Decrypt(response.data.mqttExtranetUrl))
           //MQTT账号
@@ -156,16 +156,16 @@ export default {
           //MQTT密码
           localStorage.setItem('mqttPassword',Decrypt(response.data.mqttExtranetPassword))
           //可视化大屏访问地址
-          localStorage.setItem('screenUrl',urlText+response.data.screenExtranetUrl)
+          localStorage.setItem('screenUrl',urlText+Decrypt(response.data.screenExtranetUrl))
         }else{
           //文件预览地址
-          localStorage.setItem('filePreviewUrl',urlText+response.data.fileIntranetUrl)
+          localStorage.setItem('filePreviewUrl',urlText+Decrypt(response.data.fileIntranetUrl))
           //摄像头代理访问地址
-          localStorage.setItem('cameraExtranetAgent',urlText+response.data.cameraIntranetAgent)
+          localStorage.setItem('cameraExtranetAgent',urlText+Decrypt(response.data.cameraIntranetAgent))
           //摄像头地址ip段
-          localStorage.setItem('ipIdentify',response.data.ipIdentify)
+          localStorage.setItem('ipIdentify',Decrypt(response.data.ipIdentify))
           //摄像头访问地址
-          localStorage.setItem('cameraUrl','wss://'+response.data.cameraIntranetUrl)
+          localStorage.setItem('cameraUrl','wss://'+Decrypt(response.data.cameraIntranetUrl))
           //MQTT地址
           localStorage.setItem('mqttUrl','ws://'+Decrypt(response.data.mqttIntranetUrl))
           //MQTT账号
@@ -173,7 +173,7 @@ export default {
           //MQTT密码
           localStorage.setItem('mqttPassword',Decrypt(response.data.mqttIntranetPassword))
           //可视化大屏访问地址
-          localStorage.setItem('screenUrl',urlText+response.data.screenIntranetUrl)
+          localStorage.setItem('screenUrl',urlText+Decrypt(response.data.screenIntranetUrl))
         }