Commit Graph

  • 5be62292d3 Merge branch 'master' of https://github.com/alwxkxk/soft-and-hard master alwxkxk 2025-01-18 21:39:13 +08:00
  • e25ba88596 fix: demo兼容mongodbV8 alwxkxk 2025-01-18 21:27:23 +08:00
  • 0ef4d279f9 fix: demo2添加可能会出现localhost报错的说明。 alwxkxk 2023-12-01 12:51:54 +08:00
  • fea9c89620 fix: id使用字符串。 nodb alwxkxk 2023-11-08 20:51:49 +08:00
  • 7e864be92b feat: 完成数据库平替功能。 alwxkxk 2023-11-08 20:24:42 +08:00
  • 142abada34 fix: 删除 package lock文件,避免安装依赖异常。 alwxkxk 2023-09-24 20:44:07 +08:00
  • cbe8f4a2a1
    Merge bad06b4719bc656966b875ab5dd0f333531c6965 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-17 11:56:15 +02:00
  • 780131c82e
    Merge 421cdaa1feac9022a22dc826a8188bd33cee627c into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-17 11:56:15 +02:00
  • 8b50535a78
    Merge bf21f7b59cc76d883f5e18e5906a94035af30968 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-17 11:56:15 +02:00
  • 5acd86032b
    Merge 32fecd2cebf1aeca6cdc134240c8a044392acd68 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-17 11:56:15 +02:00
  • b607973580
    Merge 9aaffef74a40045d0c2f8761702c6551a21223ec into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-02 07:00:03 -07:00
  • 73c90aea8e
    Merge 6767886a82765f04c53a6cfeef0f7f55176d0ca2 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-02 07:00:02 -07:00
  • 53fb6dee17
    Merge 93646f3341463aa3585650fe74f7b0bb3756d023 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-02 07:00:02 -07:00
  • 1caf1dde73
    Merge b1fb46a083e86ed223187e0e1d5968e6a8057e75 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-02 07:00:02 -07:00
  • be02eaf943
    Merge 05cbd26962c3945d017f6bb9fac81b398beb7251 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-02 07:00:02 -07:00
  • 786680175a
    Merge 3b4eeb77c307d4fc9a0cc421265f58a269ef4fdf into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-04-02 07:00:02 -07:00
  • d8671893cf
    Merge e1a5a56bb8c992898849e1ad1fe815bf3f5bf49c into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2023-02-28 08:12:18 +00:00
  • e1a5a56bb8
    build(deps): bump minimist in /demo2/electron-quick-start dependabot/npm_and_yarn/demo2/electron-quick-start/minimist-1.2.8 dependabot[bot] 2023-02-28 08:12:17 +00:00
  • a89aaa4a9b
    Merge 99ee27ae585cac6dd9ed0ee95d129fe8f9015850 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2022-12-08 12:43:57 +00:00
  • 99ee27ae58
    build(deps): bump qs from 6.5.2 to 6.5.3 in /demo2/electron-quick-start dependabot/npm_and_yarn/demo2/electron-quick-start/qs-6.5.3 dependabot[bot] 2022-12-08 12:43:55 +00:00
  • 459343e864
    Merge 78c92013f100f37edc688dafe31fabb5254a2957 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2022-11-10 15:51:45 +00:00
  • 78c92013f1
    build(deps-dev): bump electron in /demo2/electron-quick-start dependabot/npm_and_yarn/demo2/electron-quick-start/electron-18.3.7 dependabot[bot] 2022-11-10 15:51:43 +00:00
  • 92953b48e3
    Merge a121349247bbfb8fee868a11dcd3a12c96c277dd into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2022-10-11 23:41:35 +00:00
  • a121349247
    build(deps): bump xmldom and plist in /demo2/electron-quick-start dependabot/npm_and_yarn/demo2/electron-quick-start/xmldom-and-plist--removed dependabot[bot] 2022-10-11 23:41:34 +00:00
  • f6c420612a
    Merge bea116ca5bec7b555c9fa8a5d312dae04c361860 into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2022-07-08 10:58:30 +00:00
  • bea116ca5b
    build(deps): bump moment in /基础教程/WebSocket协议/Websocket服务器端例子/myapp dependabot/npm_and_yarn/WebSocket/Websocket/myapp/moment-2.29.4 dependabot[bot] 2022-07-08 10:58:28 +00:00
  • 7ff990dc71
    Merge 427b69572c639c2964265f095e7c83260df7e79c into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2022-07-07 02:20:48 +00:00
  • 427b69572c
    build(deps): bump moment in /demo2/electron-quick-start dependabot/npm_and_yarn/demo2/electron-quick-start/moment-2.29.4 dependabot[bot] 2022-07-07 02:20:47 +00:00
  • 29c7864c16
    Merge 6723452092d1a0dfeda3e751a9c7fb8b0716dc2a into b09f15dd8a4a9142d34efc55153e50cb71a3e2ec dependabot[bot] 2022-07-07 01:38:20 +00:00
  • 6723452092
    build(deps): bump moment from 2.23.0 to 2.29.4 in /demo2/myapp dependabot/npm_and_yarn/demo2/myapp/moment-2.29.4 dependabot[bot] 2022-07-07 01:38:18 +00:00
  • b09f15dd8a feat: 给demo2添加更详细的注释。 alwxkxk 2022-06-19 10:45:11 +08:00
  • fbd2f0face
    build(deps-dev): bump electron in /demo2/electron-quick-start dependabot[bot] 2022-06-16 23:58:43 +00:00
  • fdd61e0cf0
    build(deps): bump moment in /基础教程/WebSocket协议/Websocket服务器端例子/myapp dependabot[bot] 2022-04-09 12:42:14 +00:00
  • e7bb0aaa24
    build(deps): bump moment in /demo2/electron-quick-start dependabot[bot] 2022-04-09 00:58:58 +00:00
  • 1a6179ef5c
    build(deps): bump moment from 2.23.0 to 2.29.2 in /demo2/myapp dependabot[bot] 2022-04-09 00:47:57 +00:00
  • 944d1f55ef
    build(deps-dev): bump electron in /demo2/electron-quick-start dependabot[bot] 2022-03-25 18:37:19 +00:00
  • 2ee26db205 fix:修复 electron 样式问题。 alwxkxk 2022-01-05 19:32:19 +08:00
  • 55d861862d fix: 修复demmo2中,没删除index为0的websocket。 alwxkxk 2021-12-31 08:35:59 +08:00
  • d3b763e044 fix: 修复demo1 下拉框在刷新数据时,没有选中旧值。 alwxkxk 2021-12-28 17:01:23 +08:00
  • bd62b217fe fix: 修复demo1 js报错。 alwxkxk 2021-12-28 10:12:18 +08:00
  • 27561ac889 fix: 修复 demo1 页面没删除完整旧数据的问题。 suxiqiang 2021-12-28 10:03:54 +08:00
  • a3f0e5d85c
    build(deps-dev): bump electron in /demo2/electron-quick-start dependabot[bot] 2021-10-12 22:11:35 +00:00
  • 6d537c313d doc: 文档更新。 alwxkxk 2021-08-15 14:40:32 +08:00
  • 0e5409178e doc: 更新文档 新增B站的网址。 alwxkxk 2021-08-14 19:38:23 +08:00
  • e91a8c6587 feat: websocket文件目录更改,数据可视化例子代码完善。 alwxkxk 2021-08-14 15:55:17 +08:00
  • 2326649f99 fix: 修复 没正确获取 TCP客户端的IP地址的问题。 alwxkxk 2021-08-14 11:46:08 +08:00
  • 2a4bf864c1 fix: 弃用 demo1中的bodyParser alwxkxk 2021-08-12 20:38:05 +08:00
  • 4d6dbe68bf
    Merge 778750404cbaa045721d9baaa664eb38192e8779 into d557d0aef6b6873315adcc1108f9796264aa09ad dependabot[bot] 2021-08-11 09:21:22 +00:00
  • 778750404c
    build(deps): bump path-parse in /基础教程/HTTP协议基础/Websocket服务器端例子/myapp dependabot/npm_and_yarn/HTTP/Websocket/myapp/path-parse-1.0.7 dependabot[bot] 2021-08-11 09:21:21 +00:00
  • 3b4eeb77c3
    build(deps): bump path-parse from 1.0.6 to 1.0.7 in /demo2/myapp dependabot/npm_and_yarn/demo2/myapp/path-parse-1.0.7 dependabot[bot] 2021-08-10 21:17:59 +00:00
  • 05cbd26962
    build(deps): bump path-parse from 1.0.6 to 1.0.7 in /demo1/myapp dependabot/npm_and_yarn/demo1/myapp/path-parse-1.0.7 dependabot[bot] 2021-08-10 20:43:22 +00:00
  • d557d0aef6 fix: 修复demo0.1显示客户端错误地址。 alwxkxk 2021-08-10 20:34:52 +08:00
  • 064f0ef5c6 feat: demo2 页面index.js 不再使用jquery alwxkxk 2021-08-07 16:55:24 +08:00
  • 647874ce7c feat: demo1 页面index.js 不再使用jquery。 alwxkxk 2021-08-07 16:28:24 +08:00
  • aa7067644b fix: 设置背景可repeat. alwxkxk 2021-08-01 07:33:12 +08:00
  • 673b1b76d0 fix: 修复demo2 仍调用pug 的问题。 alwxkxk 2021-07-31 21:10:20 +08:00
  • 175e015a0b feat: socket超时判断 为30秒。 alwxkxk 2021-07-31 19:48:26 +08:00
  • 70b14d547a fix: 修复 render('error')的报错。 alwxkxk 2021-07-31 13:03:41 +08:00
  • 8bcc9516b9 fix: 修复路径问题。 alwxkxk 2021-07-30 23:59:26 +08:00
  • 0722f1c384 fix: 修复demo2里echart图没 对齐的问题。 dev-v2 alwxkxk 2021-07-27 19:13:46 +08:00
  • 743831f92a
    Merge 74a6c2bfea9a58515e8f9037c61e34b202b245a5 into 70469ee29f3e81a13d0765057798c3e2b3267889 dependabot[bot] 2021-07-21 20:02:54 -07:00
  • 2b59c641b3
    Merge 8f099de7216eb736dfc389b62c1ef111c7745986 into 70469ee29f3e81a13d0765057798c3e2b3267889 dependabot[bot] 2021-07-21 20:02:50 -07:00
  • 35a513b2eb feat: 开始V2.0升级。 alwxkxk 2021-07-18 08:27:41 +08:00
  • 27cac2e06e
    Merge 9165b96fb7bdb01f3918022fc39c43bf7e260eb7 into 70469ee29f3e81a13d0765057798c3e2b3267889 dependabot[bot] 2021-07-09 16:17:22 +08:00
  • 70469ee29f feat: demo0.1 index.js 更名为 server.js ,避免歧义。 v1 alwxkxk 2021-06-26 12:35:24 +08:00
  • 1bbe04600e feat: 删除 demo0.1中的中文报错提示。 alwxkxk 2021-06-25 20:30:15 +08:00
  • 8a70c24405 fix: 修复 pm2 运行demo0.1 找不到index.html的报错。 alwxkxk 2021-06-25 20:24:49 +08:00
  • eb8162c991 fix: 修复pm2.json 路径错误 alwxkxk 2021-06-25 20:16:28 +08:00
  • b1fb46a083
    Bump ws from 6.1.2 to 6.2.2 in /demo2/myapp dependabot/npm_and_yarn/demo2/myapp/ws-6.2.2 dependabot[bot] 2021-06-25 12:14:33 +00:00
  • 93646f3341
    Bump ws from 6.1.3 to 6.2.2 in /demo2/electron-quick-start dependabot/npm_and_yarn/demo2/electron-quick-start/ws-6.2.2 dependabot[bot] 2021-06-25 12:14:32 +00:00
  • e0897843fa fix: 修复 demo0.1 报错时的异常。 alwxkxk 2021-06-25 20:11:37 +08:00
  • 74a6c2bfea
    Bump ws from 6.1.2 to 7.4.6 in /基础教程/HTTP协议基础/Websocket服务器端例子/myapp dependabot/npm_and_yarn/HTTP/Websocket/myapp/ws-7.4.6 dependabot[bot] 2021-05-29 13:40:01 +00:00
  • 7a04dc1b8a
    Bump ws from 6.1.3 to 7.4.6 in /demo2/electron-quick-start dependabot[bot] 2021-05-29 02:11:50 +00:00
  • 3b8e59bc8a
    Bump ws from 6.1.2 to 7.4.6 in /demo2/myapp dependabot[bot] 2021-05-29 01:39:06 +00:00
  • 579168073a
    Bump ws from 6.1.3 to 7.4.5 in /demo2/electron-quick-start dependabot[bot] 2021-05-28 22:26:08 +00:00
  • 2c6ca990b6
    Bump ws from 6.1.2 to 7.4.5 in /demo2/myapp dependabot[bot] 2021-05-28 21:50:35 +00:00
  • 9165b96fb7
    Bump lodash in /基础教程/HTTP协议基础/Websocket服务器端例子/myapp dependabot/npm_and_yarn/HTTP/Websocket/myapp/lodash-4.17.21 dependabot[bot] 2021-05-10 09:00:58 +00:00
  • 9aaffef74a
    Bump bson from 1.1.0 to 1.1.6 in /demo2/myapp dependabot/npm_and_yarn/demo2/myapp/bson-1.1.6 dependabot[bot] 2021-05-08 21:18:25 +00:00
  • 6767886a82
    Bump lodash from 4.17.11 to 4.17.21 in /demo2/myapp dependabot/npm_and_yarn/demo2/myapp/lodash-4.17.21 dependabot[bot] 2021-05-08 00:16:18 +00:00
  • 32fecd2ceb
    Bump lodash from 4.17.11 to 4.17.21 in /demo1/myapp dependabot/npm_and_yarn/demo1/myapp/lodash-4.17.21 dependabot[bot] 2021-05-07 22:21:21 +00:00
  • 8f099de721
    Bump pug in /基础教程/HTTP协议基础/Websocket服务器端例子/myapp dependabot/npm_and_yarn/HTTP/Websocket/myapp/pug-3.0.1 dependabot[bot] 2021-03-03 03:55:33 +00:00
  • bf21f7b59c
    Bump pug from 2.0.0-beta11 to 3.0.1 in /demo1/myapp dependabot/npm_and_yarn/demo1/myapp/pug-3.0.1 dependabot[bot] 2021-03-03 03:26:49 +00:00
  • 421cdaa1fe
    Bump pug from 2.0.0-beta11 to 3.0.1 in /demo2/myapp dependabot/npm_and_yarn/demo2/myapp/pug-3.0.1 dependabot[bot] 2021-03-03 02:50:47 +00:00
  • 723cb5127e
    Bump electron from 4.0.3 to 9.4.0 in /demo2/electron-quick-start dependabot[bot] 2021-01-28 19:42:21 +00:00
  • 2e4f328e13 fix: 修复微信小程序URL配置错误。 alwxkxk 2020-11-28 10:04:38 +08:00
  • 406c09588e feat: IP地址从119.29.107.47 更换到 42.192.168.165 alwxkxk 2020-11-28 09:35:26 +08:00
  • 8b2d823ea6
    Bump lodash from 4.17.11 to 4.17.20 in /demo1/myapp dependabot[bot] 2020-11-20 08:56:39 +00:00
  • 21f3298f09 fix: 修复 pm2.json 路径错误。 suxiqiang 2020-11-20 16:55:50 +08:00
  • bad06b4719
    Bump mongodb from 3.1.10 to 3.1.13 in /demo2/myapp dependabot/npm_and_yarn/demo2/myapp/mongodb-3.1.13 dependabot[bot] 2020-09-04 08:45:26 +00:00
  • 821d8f5d62
    Bump lodash in /基础教程/HTTP协议基础/Websocket服务器端例子/myapp dependabot[bot] 2020-07-18 01:27:40 +00:00
  • c8f5cc8931
    Bump lodash from 4.17.11 to 4.17.19 in /demo2/myapp dependabot[bot] 2020-07-16 15:24:58 +00:00
  • d858b13914
    Bump lodash from 4.17.11 to 4.17.19 in /demo1/myapp dependabot[bot] 2020-07-16 13:41:17 +00:00
  • 58946f7336
    Bump electron from 4.0.3 to 7.2.4 in /demo2/electron-quick-start dependabot[bot] 2020-07-07 04:32:54 +00:00
  • 947718848c
    Bump lodash from 4.17.11 to 4.17.15 in /demo2/myapp dependabot[bot] 2019-10-30 12:55:12 +00:00
  • 51e2963c91
    Bump lodash from 4.17.11 to 4.17.15 in /demo1/myapp dependabot[bot] 2019-10-30 12:55:11 +00:00
  • 2cae955493
    Bump lodash in /基础教程/HTTP协议基础/Websocket服务器端例子/myapp dependabot[bot] 2019-10-30 12:55:07 +00:00
  • 96b5af5438 feat:修改demo2若干BUG,并且使其兼容IE内核的浏览器 alwxkxk 2019-10-30 20:53:48 +08:00
  • e476245590 docs:修改文档说明 alwxkxk 2019-10-26 13:47:20 +08:00
  • 133c16f92f nodemcu代码设置读取socket数据时等待时间为100ms(默认值为1000ms,会显得硬件响应很慢) alwxkxk 2019-04-11 20:47:07 +08:00
  • c660c80ef6 完成demo0.1 alwxkxk 2019-03-19 20:38:19 +08:00