update---nginx新增websocket代理，取消密码加密，新增菜单自动替换用户名

nginx.conf

@@ -93,12 +93,14 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_pass http://ems-ems-datasource/v1; # 转发地址.dev.svc.cluster.local
         }
-        location ws://localhost:8086/websocket/ {
-            rewrite ^ws://localhost:8086/websocket/(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
+        location /zhongsteel.pass.web/pass/ems/websocket {
+            rewrite ^/zhongsteel.pass.web/pass/ems/websocket/(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_pass http://ems-ems-api/websocket/; # 转发地址.dev.svc.cluster.local
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
         }	
     }	
 }

src/components/main.vue

@@ -8,9 +8,9 @@
                 <img
                     class="sl-header-li-logo"
                     src="../assets/img/login/xintai_log.png"
-                    alt="能源管控系统"
+                    alt="生产能源运营系统"
                 >
-                <div class="sl-header-li-name">能源管控系统</div>
+                <div class="sl-header-li-name">生产能源运营系统</div>
                 <!-- <div class="hnstLogo">
                     <img
                         src="../assets/img/hnst_logo.png"
@@ -1083,6 +1083,9 @@ export default {
         selectMenu (menuData, pageBreadcrumb) {
             var that = this;
             if (menuData.menuUrl !== null && menuData.menuUrl !== '' && typeof (menuData.menuUrl) !== 'undefined') {
+              if(menuData.menuUrl.search('createName')) {
+                menuData.menuUrl = menuData.menuUrl.replace('createName', that.$store.state.userInfo.userName);
+              }
                 window.localStorage.setItem('activeMenu', menuData.menuId)
                 var temp = [];
                 menuData.pageBreadcrumb = pageBreadcrumb;

src/views/index/components/login.vue

@@ -206,8 +206,8 @@ export default {
                     // 登陆中 登录按钮不可用
                     this.loginBtnLoading = true;
                     let form = JSON.parse(JSON.stringify(this.loginForm));
-                        this.shaObj.update(form.password)
-                        form.password = this.shaObj.getHash('HEX')
+                        // this.shaObj.update(form.password)
+                        // form.password = this.shaObj.getHash('HEX')
                     this.store.dispatch('index/login/login', form).then(res => {
                       if (res.code === '0') {
                         //  登录成功

src/views/systemConfig/components/functionMain.vue

@@ -1546,7 +1546,7 @@ export default {
             //     try {
             //         FileSaver.saveAs(new Blob([etout], { 
             //         type: 'application/octet-stream' 
-            //         }), '中钢能源管控系统菜单详情.xlsx');   //导出的文件名
+            //         }), '新泰能源管控系统菜单详情.xlsx');   //导出的文件名
             //         this.$message({
             //             type: 'success',
             //             message: '正在为您导出...'
@@ -1564,7 +1564,7 @@ export default {
                 return false;
             }
             // 表格标题
-            var dataTitle = '中钢能源管控系统菜单详情';
+            var dataTitle = '新泰能源管控系统菜单详情';
             // 配置文件类型
             const wopts = { bookType: 'xlsx', bookSST: true, type: 'binary', cellStyles: true };
             this.downloadExl(data, wopts, dataTitle)
@@ -1647,7 +1647,7 @@ export default {
             ))], {
                 type: ""
             });
-            this.saveAs(tmpDown, "中钢能源管控系统菜单详情" + '.' + (type.bookType == "biff2" ? "xls" : type.bookType));
+            this.saveAs(tmpDown, "新泰能源管控系统菜单详情" + '.' + (type.bookType == "biff2" ? "xls" : type.bookType));
         },
         // 下载功能
         saveAs(obj, fileName) {
@@ -1655,7 +1655,7 @@ export default {
             tmpa.download = fileName || "未命名";
             // 兼容ie 
             if ("msSaveOrOpenBlob" in navigator) {
-                window.navigator.msSaveOrOpenBlob(obj, "中钢能源管控系统菜单详情"+ ".xlsx");
+                window.navigator.msSaveOrOpenBlob(obj, "新泰能源管控系统菜单详情"+ ".xlsx");
             } else {
                 tmpa.href = URL.createObjectURL(obj);
             }