修复验证码bug

lushun5 · Sep 1, 2021 · 96e165e · 96e165e
1 parent 6a66a47
commit 96e165e
Show file tree

Hide file tree

Showing 119 changed files with 123 additions and 119 deletions.
diff --git a/config.js b/config.js
@@ -1,15 +1,15 @@
-const { localServerDomain, localAssetsDomain, localServerPort, localAssetsPort, mainDomain } = require('./bin/domain')
+const { localServerDomain, localServerPort, localAssetsPort, mainDomain } = require('./bin/domain')
 
 if (localServerDomain.indexOf("http://") != -1 || localServerDomain.indexOf("https://") != -1) {
   console.log("\x1b[91m%s\x1b[0m", "域名配置不要加上 http协议前缀，标准格式为：www.baidu.com 或者 www.baidu.com:8011")
   return
 }
 
-if (localAssetsDomain.indexOf("http://") != -1 || localAssetsDomain.indexOf("https://") != -1) {
-  console.log("\x1b[91m%s\x1b[0m", "域名配置异常")
-  console.log("域名配置不要加上 http协议前缀，标准格式为：www.baidu.com 或者 www.baidu.com:8010")
-  return
-}
+// if (localAssetsDomain.indexOf("http://") != -1 || localAssetsDomain.indexOf("https://") != -1) {
+//   console.log("\x1b[91m%s\x1b[0m", "域名配置异常")
+//   console.log("域名配置不要加上 http协议前缀，标准格式为：www.baidu.com 或者 www.baidu.com:8010")
+//   return
+// }
 
 if (localServerPort != "8011" || localAssetsPort != "8010") {
   console.log("\x1B[33m%s\x1b[0m", "您没有使用标准端口号8010、8011，请确认你已经了解了端口号的配置规则。随意更改端口号可能导致服务无法正常运行。")
@@ -20,14 +20,14 @@ if (localServerPort != "8011" || localAssetsPort != "8010") {
   * 默认是demo域名：demo_server_domain
   * 本地或线上请使用：local_server_domain
   */
-const default_api_server_url = "//" + localServerDomain
+const default_api_server_url = localServerDomain.length ? "//" + localServerDomain : ""
 
 /**
   * 配置可视化平台的域名!!!
   * 本地请使用 "localhost"
   */
 // 默认为本地部署
-const default_assets_url = "//" + localAssetsDomain
+const default_assets_url = "" // "//" + localAssetsDomain
 
 /*
  * 删除文件夹下所有文件

diff --git a/config_bin_init.js b/config_bin_init.js
@@ -4,20 +4,24 @@ var fs = require('fs');
 var pathArray = ["./bin/domain.js", "./bin/httpReqRes.js", "./bin/messageQueue.js", "./bin/mysqlConfig.js", "./bin/purchaseCode.js", "./bin/saveDays.js", "./bin/slave.js", "./bin/stayTimeScope.js", "./bin/stopWebMonitorIdList.js", "./bin/sysMonitor.js", "./bin/useCusEmailSys.js", "./bin/webfunny.js", "./bin/webMonitorIdList.js"]
 var fileArray = [
     `module.exports = {
-        localServerDomain: 'localhost:8011', // 日志服务域名  书写形式：localhost:8011
-        localAssetsDomain: 'localhost:8010', // 数据可视化服务域名 书写形式：localhost:8010
-        localServerPort: '8011',               // 日志服务端口号
-        localAssetsPort: '8010',               // 可视化系统端口号
-    
-        /**
-         * 注意：不懂可以不用设置，【千万不要乱设置】
-         * 
-         * 1. 什么情况设置：如果同一个主域名下有多个项目，并且同一个UserId的用户，会访问这多个项目
-         * 2. 设置结果：使用userId查询，可以将一个用户在多个项目上的行为串联起来。
-         * 
-         * 例如：www.baidu.com  主域名就是：baidu.com
-         */
-        mainDomain: ''                         // 默认空字符串就行了
+      // 1. 日志服务（接口）域名  书写形式：localhost:8011;
+      // 2. 如果设置空字符串，则会使用浏览器
+      localServerDomain: 'localhost:8011',
+      
+      // 日志服务端口号
+      localServerPort: '8011',
+      // 可视化系统端口号
+      localAssetsPort: '8010',
+  
+      /**
+       * 注意：不懂可以不用设置，【千万不要乱设置】
+       * 
+       * 1. 什么情况设置：如果同一个主域名下有多个项目，并且同一个UserId的用户，会访问这多个项目
+       * 2. 设置结果：使用userId查询，可以将一个用户在多个项目上的行为串联起来。
+       * 
+       * 例如：www.baidu.com  主域名就是：baidu.com
+       */
+      mainDomain: '' // 默认空字符串就行了
     }`,
     `module.exports = {
       requestTextLength: 1000,  // 接口请求参数内容长度限制

diff --git a/controllers/controllers.js b/controllers/controllers.js
diff --git a/middlreware/auth.js b/middlreware/auth.js
@@ -8,7 +8,7 @@ const statusCode = require('../util/status-code')
  * 判断token是否可用
  */
 // 检查登录白名单
-const ignorePaths = ["/getSysInfo", "/getValidateCode", "/login", "/register", "/registerForAdmin", "/sendRegisterEmail", "/resetPwd", "/upBp"]
+const ignorePaths = ["/getSysInfo", "/getValidateCode", "/refreshValidateCode", "/login", "/register", "/registerForAdmin", "/sendRegisterEmail", "/resetPwd", "/upBp"]
 module.exports = function () {
     return async function (ctx, next) {
         const login_error = "登录已失效，请重新登录"

diff --git a/...s/resource/alarm.459647621bf87d4376a6.css → ...s/resource/alarm.88822d99a80826fb399b.css b/...s/resource/alarm.459647621bf87d4376a6.css → ...s/resource/alarm.88822d99a80826fb399b.css
diff --git a/views/resource/alarm.html b/views/resource/alarm.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././alarm.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././alarm.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/alarm.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/alarm.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/...source/behaviors.459647621bf87d4376a6.css → ...source/behaviors.88822d99a80826fb399b.css b/...source/behaviors.459647621bf87d4376a6.css → ...source/behaviors.88822d99a80826fb399b.css
diff --git a/views/resource/behaviors.html b/views/resource/behaviors.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././behaviors.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././behaviors.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/behaviors.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/behaviors.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/...source/bigScreen.459647621bf87d4376a6.css → ...source/bigScreen.88822d99a80826fb399b.css b/...source/bigScreen.459647621bf87d4376a6.css → ...source/bigScreen.88822d99a80826fb399b.css
diff --git a/views/resource/bigScreen.html b/views/resource/bigScreen.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././bigScreen.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././bigScreen.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/bigScreen.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/bigScreen.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/.../resource/common.459647621bf87d4376a6.css → .../resource/common.88822d99a80826fb399b.css b/.../resource/common.459647621bf87d4376a6.css → .../resource/common.88822d99a80826fb399b.css
diff --git a/...urce/connectUser.459647621bf87d4376a6.css → ...urce/connectUser.88822d99a80826fb399b.css b/...urce/connectUser.459647621bf87d4376a6.css → ...urce/connectUser.88822d99a80826fb399b.css
diff --git a/views/resource/connectUser.html b/views/resource/connectUser.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././connectUser.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././connectUser.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/connectUser.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/connectUser.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/...ce/createProject.459647621bf87d4376a6.css → ...ce/createProject.88822d99a80826fb399b.css b/...ce/createProject.459647621bf87d4376a6.css → ...ce/createProject.88822d99a80826fb399b.css
diff --git a/views/resource/createProject.html b/views/resource/createProject.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././createProject.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././createProject.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/createProject.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/createProject.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/.../resource/funnel.459647621bf87d4376a6.css → .../resource/funnel.88822d99a80826fb399b.css b/.../resource/funnel.459647621bf87d4376a6.css → .../resource/funnel.88822d99a80826fb399b.css
diff --git a/views/resource/funnel.html b/views/resource/funnel.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././funnel.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././funnel.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/funnel.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/funnel.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/...rce/funnelCreate.459647621bf87d4376a6.css → ...rce/funnelCreate.88822d99a80826fb399b.css b/...rce/funnelCreate.459647621bf87d4376a6.css → ...rce/funnelCreate.88822d99a80826fb399b.css
diff --git a/views/resource/funnelCreate.html b/views/resource/funnelCreate.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././funnelCreate.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././funnelCreate.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/funnelCreate.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/funnelCreate.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/views/resource/home.459647621bf87d4376a6.css → views/resource/home.88822d99a80826fb399b.css b/views/resource/home.459647621bf87d4376a6.css → views/resource/home.88822d99a80826fb399b.css
diff --git a/views/resource/home.html b/views/resource/home.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././home.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././home.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/home.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/home.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/...source/httpError.459647621bf87d4376a6.css → ...source/httpError.88822d99a80826fb399b.css b/...source/httpError.459647621bf87d4376a6.css → ...source/httpError.88822d99a80826fb399b.css
diff --git a/views/resource/httpError.html b/views/resource/httpError.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././httpError.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././httpError.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/httpError.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/httpError.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/.../httpErrorDetail.459647621bf87d4376a6.css → .../httpErrorDetail.88822d99a80826fb399b.css b/.../httpErrorDetail.459647621bf87d4376a6.css → .../httpErrorDetail.88822d99a80826fb399b.css
diff --git a/views/resource/httpErrorDetail.html b/views/resource/httpErrorDetail.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././httpErrorDetail.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././httpErrorDetail.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/httpErrorDetail.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/httpErrorDetail.88822d99a80826fb399b.min.js"></script></body>
 </html>
diff --git a/.../httpPerformance.459647621bf87d4376a6.css → .../httpPerformance.88822d99a80826fb399b.css b/.../httpPerformance.459647621bf87d4376a6.css → .../httpPerformance.88822d99a80826fb399b.css
diff --git a/views/resource/httpPerformance.html b/views/resource/httpPerformance.html
@@ -55,7 +55,7 @@
 
       flex(100, 1);
     </script>
-<link href="././common.459647621bf87d4376a6.css" rel="stylesheet"><link href="././httpPerformance.459647621bf87d4376a6.css" rel="stylesheet"></head>
+<link href="././common.88822d99a80826fb399b.css" rel="stylesheet"><link href="././httpPerformance.88822d99a80826fb399b.css" rel="stylesheet"></head>
 <body>
 <div id="app">
 </div>
@@ -64,5 +64,5 @@
         <div class="wen-li"></div>
     </div>
 </div>
-<script type="text/javascript" src="./js/common.459647621bf87d4376a6.min.js"></script><script type="text/javascript" src="./js/httpPerformance.459647621bf87d4376a6.min.js"></script></body>
+<script type="text/javascript" src="./js/common.88822d99a80826fb399b.min.js"></script><script type="text/javascript" src="./js/httpPerformance.88822d99a80826fb399b.min.js"></script></body>
 </html>