Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/HumanResource

.vscode/launch.json

@@ -16,31 +16,28 @@
             "-p 4700",
             "-f http://localhost:4700",
             // 研发
-             "-g postgres://postgres:123@10.8.30.166:5432/hr-dev",
+            // "-g postgres://postgres:123@10.8.30.166:5432/hr-dev",
             "--redisHost localhost",
             "--redisPort 6379",
             "--apiEmisUrl http://localhost:14000",
             // 测试
             //  "--apiEmisUrl http://10.8.30.161:1111",
             // "--redisHost 10.8.30.112",
+              "-g postgres://postgres:123@10.8.30.166:5432/HRM",
             "--qnak 5XrM4wEB9YU6RQwT64sPzzE6cYFKZgssdP5Kj3uu",
             "--qnsk w6j2ixR_i-aelc6I7S3HotKIX-ukMzcKmDfH6-M5",
             "--qnbkt pep-resource",
             // "--qndmn http://resources.anxinyun.cn",
             "--qndmn https://pepsource.anxinyun.cn",
-             
             // 似乎不能传空 先注释 * 2
             // "--clickHouseUser ",
             // "--clickHousePassword ",
- 
             "--clickHousePort 30123",
- 
             // 开发
             // "--clickHouseUrl http://10.8.30.71",
             // "--clickHousePepEmis pepca_dev",
             // "--clickHouseCamworkflow camworkflow",
             // "--clickHouseHr hr_dev",
- 
             // 测试
             "--clickHouseUrl http://10.8.30.161",
             "--clickHousePepEmis pepca8",
@@ -51,15 +48,32 @@
       {
          "type": "node",
          "request": "launch",
-          "name": "run mocha",
+         "name": "run hrm-web",
-          "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+         "program": "${workspaceRoot}/web/server.js",
-          "stopOnEntry": false,
          "args": [
-             "app/test/*.test.js",
+            "-p",
-             "--no-timeouts"
+            "5700",
+            "-u",
+            "http://localhost:4700",
+            "--apiHrUrl",
+            "http://localhost:4700",
+            "-d",
+            "localhost",
+            "--webPepUrl",
+            "http://localhost:5300",
+            "--apiEmisUrl",
+            "http://localhost:4000",
+            "--qnak",
+            "5XrM4wEB9YU6RQwT64sPzzE6cYFKZgssdP5Kj3uu",
+            "--qnsk",
+            "w6j2ixR_i-aelc6I7S3HotKIX-ukMzcKmDfH6-M5",
+            "--qnbkt",
+            "pep-resource",
+            "--qndmn",
+            "https://pepsource.anxinyun.cn",
+            "--wkys",
+            "http://10.8.30.109:14000",
          ],
-          "cwd": "${workspaceRoot}",
-          "runtimeExecutable": null,
          "env": {
             "NODE_ENV": "development"
          }