Commit Graph

217 Commits

Author SHA1 Message Date
gaoshuaixing
c8e15acd2b Merge branch 'test_v3' into demo
# Conflicts:
#	.gitignore
#	electron/config/config.default.js
#	package.json
#	public/dist/assets/AppSider-370f21ef.js
#	public/dist/assets/AppSider-686a98c7.js
#	public/dist/assets/AppSider-c97621a5.js
#	public/dist/assets/HttpServer-187e00e2.js
#	public/dist/assets/HttpServer-30d50111.js
#	public/dist/assets/HttpServer-8bfec31d.js
#	public/dist/assets/Index-05794807.js
#	public/dist/assets/Index-084e8516.js
#	public/dist/assets/Index-0ca67f51.js
#	public/dist/assets/Index-101996e4.js
#	public/dist/assets/Index-2000eb61.js
#	public/dist/assets/Index-20381655.js
#	public/dist/assets/Index-21687ab0.js
#	public/dist/assets/Index-254e6122.js
#	public/dist/assets/Index-354876ed.js
#	public/dist/assets/Index-39077248.js
#	public/dist/assets/Index-3a18fb51.js
#	public/dist/assets/Index-42fc9403.js
#	public/dist/assets/Index-4f01872f.js
#	public/dist/assets/Index-52b8d0e6.js
#	public/dist/assets/Index-5576808b.js
#	public/dist/assets/Index-56032292.js
#	public/dist/assets/Index-56f39044.js
#	public/dist/assets/Index-58506a1f.js
#	public/dist/assets/Index-5fef5718.js
#	public/dist/assets/Index-6c47115f.js
#	public/dist/assets/Index-83b2210f.js
#	public/dist/assets/Index-9303d7d7.js
#	public/dist/assets/Index-998790bd.js
#	public/dist/assets/Index-9e9d1c9b.js
#	public/dist/assets/Index-a287b54b.js
#	public/dist/assets/Index-ad225bc9.js
#	public/dist/assets/Index-b5636571.js
#	public/dist/assets/Index-b9aeb238.js
#	public/dist/assets/Index-c2f0b408.js
#	public/dist/assets/Index-c680d757.js
#	public/dist/assets/Index-cbf8bde1.js
#	public/dist/assets/Index-ce621282.js
#	public/dist/assets/Index-d1ca7867.js
#	public/dist/assets/Index-e0a4b6f3.js
#	public/dist/assets/Index-e0cd22d1.js
#	public/dist/assets/Index-e239b54e.js
#	public/dist/assets/Index-e2cf0785.js
#	public/dist/assets/Index-e8bb3bdf.js
#	public/dist/assets/Index-e8bb3bdf.js.gz
#	public/dist/assets/Index-ea299cba.js
#	public/dist/assets/Index-ef5eadce.js
#	public/dist/assets/Index-f0b2dff9.js
#	public/dist/assets/Index-f2c2d585.js
#	public/dist/assets/Index-f5517914.js
#	public/dist/assets/Index-f7de81e1.js
#	public/dist/assets/Index-f8275354.js
#	public/dist/assets/Index-fd4157ad.js
#	public/dist/assets/Ipc-3df72f72.js
#	public/dist/assets/Ipc-437f7ae5.js
#	public/dist/assets/Ipc-4d2246aa.js
#	public/dist/assets/Ipc-d007eef7.js
#	public/dist/assets/Menu-55bd1041.js
#	public/dist/assets/Menu-9e9e00ac.js
#	public/dist/assets/Menu-c3ec0fd5.js
#	public/dist/assets/Pic-dc019ccc.js
#	public/dist/assets/SocketServer-3d2fc222.js
#	public/dist/assets/SocketServer-41a2a7e5.js
#	public/dist/assets/SocketServer-d36df569.js
#	public/dist/assets/Window-061165a8.js
#	public/dist/assets/index-0d31d5fa.js
#	public/dist/assets/index-265ac112.js
#	public/dist/assets/index-265ac112.js.gz
#	public/dist/assets/index-7e8ac19c.js
#	public/dist/assets/index-9a8e575f.js
#	public/dist/assets/index-de86382b.js
#	public/dist/assets/index-de86382b.js.gz
#	public/dist/assets/index-f283ba7d.js
#	public/dist/assets/index-f283ba7d.js.gz
#	public/dist/assets/store2-0f6f431e.js
#	public/dist/assets/store2-5a46c4a6.js
#	public/dist/assets/store2-c97601fe.js
#	public/dist/index.html
#	public/dist/index.html.gz
2024-03-07 16:29:56 +08:00
gaoshuaixing
3bef6a48bb Merge branch 'dev_v3' into test_v3 2024-03-07 16:14:30 +08:00
gaoshuaixing
4bec9d655a python 2024-03-07 16:08:28 +08:00
gaoshuaixing
3848544d12 Revert "del py"
This reverts commit 2a1642b796.
2024-03-07 10:41:06 +08:00
gaoshuaixing
2a1642b796 del py 2024-03-06 10:41:48 +08:00
gaoshuaixing
b6d9a09904 html dist 2024-03-04 16:46:52 +08:00
gaoshuaixing
6f68e8fb21 Merge branch 'dev_v3' into test_v3
# Conflicts:
#	electron/config/config.local.js
#	package.json
#	public/dist/assets/AppSider-871239d4.js
#	public/dist/assets/AppSider-a7301cdd.js
#	public/dist/assets/AppSider-c97621a5.js
#	public/dist/assets/HttpServer-0912c8b7.js
#	public/dist/assets/HttpServer-8bfec31d.js
#	public/dist/assets/HttpServer-d7066a37.js
#	public/dist/assets/Index-034efc6a.js
#	public/dist/assets/Index-08001b4c.js
#	public/dist/assets/Index-101996e4.js
#	public/dist/assets/Index-16a4dd02.js
#	public/dist/assets/Index-18d35d1c.js
#	public/dist/assets/Index-29283367.js
#	public/dist/assets/Index-354876ed.js
#	public/dist/assets/Index-39077248.js
#	public/dist/assets/Index-3b3f7743.js
#	public/dist/assets/Index-413b80ae.js
#	public/dist/assets/Index-46b18835.js
#	public/dist/assets/Index-46bae197.js
#	public/dist/assets/Index-53ee5687.js
#	public/dist/assets/Index-55188015.js
#	public/dist/assets/Index-5e3fc052.js
#	public/dist/assets/Index-5e799834.js
#	public/dist/assets/Index-6c47115f.js
#	public/dist/assets/Index-7412a1d7.js
#	public/dist/assets/Index-7f01e8aa.js
#	public/dist/assets/Index-7f0cd861.js
#	public/dist/assets/Index-8ca1895c.js
#	public/dist/assets/Index-922a1229.js
#	public/dist/assets/Index-9563719d.js
#	public/dist/assets/Index-9e9d1c9b.js
#	public/dist/assets/Index-a717c6f6.js
#	public/dist/assets/Index-afb9111c.js
#	public/dist/assets/Index-afdf2d82.js
#	public/dist/assets/Index-b2727714.js
#	public/dist/assets/Index-bbf9da88.js
#	public/dist/assets/Index-c2f0b408.js
#	public/dist/assets/Index-c521a9f5.js
#	public/dist/assets/Index-c62981d9.js
#	public/dist/assets/Index-ce621282.js
#	public/dist/assets/Index-dc93a782.js
#	public/dist/assets/Index-e0cd22d1.js
#	public/dist/assets/Index-e239b54e.js
#	public/dist/assets/Index-e75e109f.js
#	public/dist/assets/Index-ea03b463.js
#	public/dist/assets/Index-ea299cba.js
#	public/dist/assets/Index-f2c2d585.js
#	public/dist/assets/Index-f4d16407.js
#	public/dist/assets/Index-f5517914.js
#	public/dist/assets/Index-f7288458.js
#	public/dist/assets/Ipc-4d92174b.js
#	public/dist/assets/Ipc-9b727d04.js
#	public/dist/assets/Ipc-d007eef7.js
#	public/dist/assets/Ipc-f792091f.js
#	public/dist/assets/SocketServer-14a819df.js
#	public/dist/assets/Window-73e498f2.js
#	public/dist/assets/index-0d31d5fa.js
#	public/dist/assets/index-3bb9c4c1.js
#	public/dist/assets/index-71914d0e.js
#	public/dist/assets/index-c01cca1d.js
#	public/dist/assets/index-c01cca1d.js.gz
#	public/dist/assets/store2-127baa44.js
#	public/dist/assets/store2-5d974a5c.js
#	public/dist/assets/store2-c97601fe.js
#	public/dist/index.html
#	public/dist/index.html.gz
2024-03-04 16:42:42 +08:00
gaoshuaixing
5cc3f5b346 flask 2024-03-01 19:02:19 +08:00
gaoshuaixing
dbf19008bc python flask fastapi demo 2024-02-21 14:38:12 +08:00
gaoshuaixing
a80949d4b6 fastapi 2024-02-20 17:52:28 +08:00
gaoshuaixing
cfd7e2f5ef py 2024-02-06 17:55:39 +08:00
gaoshuaixing
59e314d3f6 更新自动升级,双击托盘显示 2024-02-05 14:55:28 +08:00
gaoshuaixing
fa208ad32b dist 2024-02-01 16:17:44 +08:00
gaoshuaixing
a52eb6165a 2.8.2 2024-01-30 16:54:19 +08:00
gaoshuaixing
53937cf56b Merge branch 'test_v3' into demo 2024-01-29 18:27:44 +08:00
gaoshuaixing
6d5b2bec16 test beta 2024-01-29 18:21:05 +08:00
gaoshuaixing
fa44a2f11b del go-dev 2024-01-16 18:18:00 +08:00
gaoshuaixing
0b28d3cfdd 3.10.0 demo 2024-01-15 15:55:39 +08:00
gaoshuaixing
1328f773a2 dist 2024-01-15 14:51:47 +08:00
gaoshuaixing
f1a9133d5c dist 2024-01-09 11:05:48 +08:00
gaoshuaixing
43ef81b2bb Merge branch 'dev_v3' into test_v3
# Conflicts:
#	public/dist/assets/AppSider-37d75fdb.js
#	public/dist/assets/AppSider-a7301cdd.js
#	public/dist/assets/AppSider-d48c3965.js
#	public/dist/assets/HttpServer-0912c8b7.js
#	public/dist/assets/HttpServer-546d6543.js
#	public/dist/assets/HttpServer-ed0cf5b9.js
#	public/dist/assets/Index-034efc6a.js
#	public/dist/assets/Index-08a68a56.js
#	public/dist/assets/Index-0a2dd15e.js
#	public/dist/assets/Index-0b2ed0b9.js
#	public/dist/assets/Index-0c7eea33.js
#	public/dist/assets/Index-0c9716bb.js
#	public/dist/assets/Index-10bba485.js
#	public/dist/assets/Index-10ccb891.js
#	public/dist/assets/Index-19397142.js
#	public/dist/assets/Index-1c9a1a3c.js
#	public/dist/assets/Index-275356b3.js
#	public/dist/assets/Index-3787ff4d.js
#	public/dist/assets/Index-3fb421ed.js
#	public/dist/assets/Index-42e24823.js
#	public/dist/assets/Index-46b18835.js
#	public/dist/assets/Index-49dffb1d.js
#	public/dist/assets/Index-4c8f0528.js
#	public/dist/assets/Index-4ead8109.js
#	public/dist/assets/Index-53ee5687.js
#	public/dist/assets/Index-586aac40.js
#	public/dist/assets/Index-5fee302f.js
#	public/dist/assets/Index-60c27949.js
#	public/dist/assets/Index-6658484b.js
#	public/dist/assets/Index-6bf27758.js
#	public/dist/assets/Index-739b1e83.js
#	public/dist/assets/Index-7412a1d7.js
#	public/dist/assets/Index-74f192e6.js
#	public/dist/assets/Index-7f0573a3.js
#	public/dist/assets/Index-7f0cd861.js
#	public/dist/assets/Index-818d29dc.js
#	public/dist/assets/Index-8b9c9ecd.js
#	public/dist/assets/Index-8d8a0d0e.js
#	public/dist/assets/Index-90db42e6.js
#	public/dist/assets/Index-922a1229.js
#	public/dist/assets/Index-96df2d3c.js
#	public/dist/assets/Index-98f2b7d4.js
#	public/dist/assets/Index-9990c62b.js
#	public/dist/assets/Index-a717c6f6.js
#	public/dist/assets/Index-ae1fb139.js
#	public/dist/assets/Index-afdf2d82.js
#	public/dist/assets/Index-b2727714.js
#	public/dist/assets/Index-bbf9da88.js
#	public/dist/assets/Index-c35a8796.js
#	public/dist/assets/Index-c62981d9.js
#	public/dist/assets/Index-cb8b9bf1.js
#	public/dist/assets/Index-d66e2d7b.js
#	public/dist/assets/Index-d9ba0d3e.js
#	public/dist/assets/Index-da530e68.js
#	public/dist/assets/Index-db1203f0.js
#	public/dist/assets/Index-e75e109f.js
#	public/dist/assets/Index-f4e201af.js
#	public/dist/assets/Index-f713a226.js
#	public/dist/assets/Index-f7288458.js
#	public/dist/assets/Ipc-1f3029ea.js
#	public/dist/assets/Ipc-45ee52db.js
#	public/dist/assets/Ipc-4d92174b.js
#	public/dist/assets/Ipc-7b5efd90.js
#	public/dist/assets/Ipc-c93bc100.js
#	public/dist/assets/Ipc-d9cee164.js
#	public/dist/assets/Menu-27224c6e.js
#	public/dist/assets/Menu-c7c3a351.js
#	public/dist/assets/Menu-cb098491.js
#	public/dist/assets/Pic-303a031c.js
#	public/dist/assets/Pic-90e6fdc0.js
#	public/dist/assets/Pic-bbb96498.js
#	public/dist/assets/SocketServer-bff9de3d.js
#	public/dist/assets/Window-55d42d7d.js
#	public/dist/assets/Window-c2cf4f95.js
#	public/dist/assets/Window-e0fe9230.js
#	public/dist/assets/index-40d1cd1c.js
#	public/dist/assets/index-587e4740.js
#	public/dist/assets/index-71914d0e.js
#	public/dist/assets/index-869350c9.js
#	public/dist/assets/index-869350c9.js.gz
#	public/dist/assets/store2-5d974a5c.js
#	public/dist/assets/store2-c7ac8a8d.js
#	public/dist/assets/store2-d04fc23f.js
#	public/dist/index.html
#	public/dist/index.html.gz
2024-01-09 11:00:09 +08:00
gaoshuaixing
2d77481d80 cross go 2024-01-03 17:26:32 +08:00
gaoshuaixing
1e8346cfbe demo 3.9.0 2023-12-04 17:43:01 +08:00
gaoshuaixing
226cee8162 "ee-core": "^2.7.0-beta.9" 2023-12-04 16:58:47 +08:00
gaoshuaixing
27838aa344 test go 2023-12-04 15:39:40 +08:00
gaoshuaixing
242e915219 Merge branch 'dev_v3' into test_v3 2023-12-01 19:13:10 +08:00
gaoshuaixing
abf8c1c15e config 2023-12-01 19:05:05 +08:00
gsx
973b3f8549 test beta 2023-11-29 17:22:49 +08:00
gaoshuaixing
626e26f073 Merge branch 'dev_v3' into test_v3 2023-11-24 18:31:10 +08:00
gaoshuaixing
5596f1e2db go config 2023-11-22 17:04:37 +08:00
gaoshuaixing
87566bfdcb go dev 2023-11-17 19:12:00 +08:00
gaoshuaixing
a39d5b318e go static 2023-11-15 14:32:33 +08:00
gaoshuaixing
30bda1a5ae move config 2023-11-14 18:34:51 +08:00
gaoshuaixing
9d72280710 Merge branch 'dev_v3' into test_v3 2023-11-08 18:32:07 +08:00
gaoshuaixing
27b8237805 go bin 2023-11-08 18:28:11 +08:00
gaoshuaixing
be89c07279 3.8.0 2023-10-19 17:38:19 +08:00
gaoshuaixing
4f8ff767b7 Merge branch 'test_v3' into demo 2023-10-19 17:35:44 +08:00
gaoshuaixing
af16b0e477 Merge branch 'dev_v3' into test_v3 2023-10-19 15:27:44 +08:00
gaoshuaixing
09d95806d0 自定义(多)命令,jobs日志是否打印 2023-10-09 18:59:31 +08:00
gaoshuaixing
2e86d3ea57 go 2023-09-19 17:19:17 +08:00
gaoshuaixing
b852b15cc6 demo 3.7.0 2023-09-07 17:22:16 +08:00
gaoshuaixing
e674e3e6d3 Merge branch 'test_v3' into demo 2023-09-07 17:15:07 +08:00
gaoshuaixing
d6dbd5cc37 test 2023-09-06 11:25:14 +08:00
gaoshuaixing
67c6198e43 Merge branch 'dev_v3' into test_v3 2023-09-06 11:10:55 +08:00
gaoshuaixing
7cba79cd4e load page 2023-09-05 19:41:33 +08:00
gaoshuaixing
e54e24fadf bin 2023-09-04 19:40:14 +08:00
wallace5303
5325218691 pkg 2023-08-24 21:28:41 +08:00
gaoshuaixing
7a5a5e0ee7 dist 2023-08-21 16:05:01 +08:00
gaoshuaixing
19446acaef ee-bin 2023-08-21 11:52:46 +08:00
gaoshuaixing
f4b6647925 pkg 2023-08-04 18:27:14 +08:00