淡化项目编号登录更改

app/controller/login_controller.js

@@ -26,6 +26,18 @@ module.exports = app => {
                 ctx.redirect('/wap');
                 return;
             }
+            let projectData = null;
+
+            // 判断是否有编号且存在
+            if (ctx.params.code) {
+                const projectInfo = await ctx.service.project.getProjectByCode(ctx.params.code.toString().trim());
+                if (projectInfo) {
+                    projectData = projectInfo;
+                } else {
+                    ctx.redirect('/');
+                    return;
+                }
+            }
 
             const errorMessage = ctx.session.loginError;
             // 显示完删除
@@ -37,6 +49,7 @@ module.exports = app => {
                 await ctx.service.maintain.syncMaintainData();
             }
             const renderData = {
+                projectData,
                 maintainData,
                 maintainConst,
                 errorMessage,
@@ -190,8 +203,13 @@ module.exports = app => {
          */
         async logout(ctx) {
             // 删除session并跳转
+            const code = ctx.session.sessionProject.code ? ctx.session.sessionProject.code : null;
             ctx.session = null;
-            ctx.redirect('/');
+            if (code) {
+                ctx.redirect('/login/' + code);
+            } else {
+                ctx.redirect('/');
+            }
         }
 
         /**
@@ -482,7 +500,7 @@ module.exports = app => {
           }
           ctx.body = response;
         }
-        
+
         /**
          * 项目管理授权页面
          *
@@ -558,7 +576,7 @@ module.exports = app => {
           }
           ctx.body = response
         }
-      
+
     }
 
     return LoginController;

app/router.js

@@ -40,6 +40,7 @@ module.exports = app => {
     const budgetCheck = app.middlewares.budgetCheck();
     // 登入登出相关
     app.get('/login', 'loginController.index');
+    app.get('/login/:code', 'loginController.index');
     app.get('/login/port', api2otherCheck, 'loginController.port');
     app.get('/', 'loginController.index');
     app.get('/logout', 'loginController.logout');

app/view/login/login.ejs

@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="/public/css/main.css">
     <link rel="stylesheet" href="/public/css/toast.css">
     <link rel="stylesheet" href="/public/css/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="/public/css/jquery-ui/jquery-ui.min.css">
     <link rel="shortcut icon" href="/public/images/favicon.ico">
     <style>
         html{height:100%;}
@@ -31,7 +32,7 @@
         <div class="left-login text-white pt-5 px-5">
             <h2>Hi，您好！</h2>
             <div class="login-border my-4"></div>
-            <div class="left-login-title" id="project_name">纵横捭阖  数“智”管家</div>
+            <div class="left-login-title" id="project_name"><% if (projectData) { %><%- projectData.name %><% } else { %>纵横捭阖  数“智”管家<% } %></div>
         </div>
         <% if (maintainData.status === maintainConst.status.ongoing) { %>
         <form class="right-login position-relative text-center">
@@ -42,14 +43,14 @@
         </form>
         <% } else { %>
         <form method="post" action="/login" id="normal-form" class="right-login position-relative text-center" style="min-width: 360px;">
-            <h3 class="mt-5 mb-4">欢迎登录</h3>
+            <h3 class="mt-5 <% if (projectData) { %>mb-5<% } else { %>mb-4<% } %>">欢迎登录</h3>
             <div class="position-absolute"><a href="javascript:void(0);" class="change-form" data-toggle="tooltip" data-placement="left" title="微信登录"><img alt="微信扫码登录" src="/public/images/icon_login_qr.png"></a></div>
             <div class="mx-4">
-                <div class="input-group mb-4 <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">
+                <div <% if (projectData) { %>style="display: none"<% } %> class="input-group mb-4 <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">
                     <div class="input-group-prepend">
                         <div class="input-group-text"><img src="/public/images/icon_login_folder.png"></div>
                     </div>
-                    <input type="text" id="project" class="form-control" name="project" placeholder="项目编号" autofocus="">
+                    <input type="text" id="project" class="form-control" name="project" value="<% if (projectData) { %><%- projectData.code %><% } %>" placeholder="项目编号" autofocus="">
                 </div>
                 <div class="input-group mb-4 <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">
                     <div class="input-group-prepend">
@@ -63,7 +64,7 @@
                     </div>
                     <input type="password" id="project-password" name="project_password" class="form-control" placeholder="密码">
                 </div>
-                <div class="form-group mb-4">
+                <div class="form-group <% if (projectData) { %>mb-5<% } else { %>mb-4<% } %>">
                     <div class="form-check d-flex justify-content-start pl-0">
                         <label class="form-check-label" for="exampleCheck1"><a href="#fg-password" data-toggle="modal" data-target="#fg-password">忘记密码？</a></label>
                     </div>
@@ -96,7 +97,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label>项目编号</label>
-                    <input class="form-control" id="forget-project" placeholder="输入项目编号">
+                    <input class="form-control" id="forget-project" placeholder="输入项目编号" <% if (projectData) { %>readonly<% } %>>
                     <div class="invalid-feedback"></div>
                 </div>
                 <div class="form-group">
@@ -137,10 +138,19 @@
 <script src="/public/js/jquery/jquery-3.2.1.min.js"></script>
 <script src="/public/js/popper/popper.min.js"></script>
 <script src="/public/js/bootstrap/bootstrap.min.js"></script>
+<script src="/public/js/jquery/jquery-ui.js"></script>
 <script src="/public/js/global.js"></script>
 <script>
-    const csrf = '<%= ctx.csrf %>'
+    const csrf = '<%= ctx.csrf %>';
 </script>
+<% if (projectData) { %>
+    <script>
+        $(document).ready(function() {
+            setLocalCache('project_name', '<%- projectData.name %>');
+            setLocalCache('project_code', '<%- projectData.code %>');
+        });
+    </script>
+<% } %>
 <script src="/public/js/login.js"></script>
 <script src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
 <script>

app/view/login/login_management.ejs

@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="/public/css/main.css">
     <link rel="stylesheet" href="/public/css/toast.css">
     <link rel="stylesheet" href="/public/css/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="/public/css/jquery-ui/jquery-ui.min.css">
     <link rel="shortcut icon" href="/public/images/favicon.ico">
     <style>
         html{height:100%;}
@@ -58,6 +59,7 @@
 <script src="/public/js/jquery/jquery-3.2.1.min.js"></script>
 <script src="/public/js/popper/popper.min.js"></script>
 <script src="/public/js/bootstrap/bootstrap.min.js"></script>
+<script src="/public/js/jquery/jquery-ui.js"></script>
 <script src="/public/js/global.js"></script>
 <% if (projectData) { %>
 <script>

app/view/login/login_port.ejs

@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="/public/css/main.css">
     <link rel="stylesheet" href="/public/css/toast.css">
     <link rel="stylesheet" href="/public/css/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="/public/css/jquery-ui/jquery-ui.min.css">
     <link rel="shortcut icon" href="/public/images/favicon.ico">
     <style>
         html{height:100%;}
@@ -79,6 +80,7 @@
 <script src="/public/js/jquery/jquery-3.2.1.min.js"></script>
 <script src="/public/js/popper/popper.min.js"></script>
 <script src="/public/js/bootstrap/bootstrap.min.js"></script>
+<script src="/public/js/jquery/jquery-ui.js"></script>
 <script src="/public/js/global.js"></script>
 <% if (projectData) { %>
 <script>

app/view/login/wxproject.ejs

@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="/public/css/wap/main.css">
     <link rel="stylesheet" href="/public/css/toast.css">
     <link rel="stylesheet" href="/public/css/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="/public/css/jquery-ui/jquery-ui.min.css">
     <link rel="shortcut icon" href="/public/images/favicon.ico">
 </head>
 <body>
@@ -69,6 +70,7 @@
 <script src="/public/js/jquery/jquery-3.2.1.min.js"></script>
 <script src="/public/js/popper/popper.min.js"></script>
 <script src="/public/js/bootstrap/bootstrap.min.js"></script>
+<script src="/public/js/jquery/jquery-ui.js"></script>
 <script src="/public/js/wap/global.js"></script>
 </body>
 </html>