diff --git a/build/icons/128x128.png b/build/icons/128x128.png new file mode 100644 index 0000000..56b37e1 Binary files /dev/null and b/build/icons/128x128.png differ diff --git a/build/icons/16x16.png b/build/icons/16x16.png new file mode 100644 index 0000000..fc40055 Binary files /dev/null and b/build/icons/16x16.png differ diff --git a/build/icons/48x48.png b/build/icons/48x48.png new file mode 100644 index 0000000..a85fc93 Binary files /dev/null and b/build/icons/48x48.png differ diff --git a/build/icons/icon.icns b/build/icons/icon.icns new file mode 100644 index 0000000..aa79460 Binary files /dev/null and b/build/icons/icon.icns differ diff --git a/build/icons/icon.png b/build/icons/icon.png new file mode 100644 index 0000000..df48e85 Binary files /dev/null and b/build/icons/icon.png differ diff --git a/electron/config/bin.js b/electron/config/bin.js index 45c22ca..6af78e8 100644 --- a/electron/config/bin.js +++ b/electron/config/bin.js @@ -72,5 +72,27 @@ module.exports = { stringArrayEncoding: ['none'], deadCodeInjection: false, } - } + }, + + /** + * 执行自定义命令 + * ee-bin exec + */ + exec: { + go: { + directory: './go', + cmd: 'go', + args: ['run', './main.go', '--env=dev'], + }, + node_version: { + directory: './', + cmd: 'node', + args: ['-v'], + }, + npm_version: { + directory: './', + cmd: 'npm', + args: ['-v'], + }, + }, }; \ No newline at end of file diff --git a/electron/config/builder.json b/electron/config/builder.json index 0d9e76d..269a240 100644 --- a/electron/config/builder.json +++ b/electron/config/builder.json @@ -44,7 +44,7 @@ ] }, "linux": { - "icon": "build/icons/icon.icns", + "icon": "build/icons", "artifactName": "${productName}-${os}-${version}-${arch}.${ext}", "target": [ "deb" diff --git a/electron/config/config.default.js b/electron/config/config.default.js index 0f2b4eb..be57281 100644 --- a/electron/config/config.default.js +++ b/electron/config/config.default.js @@ -17,7 +17,7 @@ module.exports = (appInfo) => { /** * 应用程序顶部菜单 */ - config.openAppMenu = 'dev-show'; + config.openAppMenu = true; /** * 主窗口 @@ -132,6 +132,13 @@ module.exports = (appInfo) => { mainExit: false, childExit: true, rendererExit: true, + }; + + /** + * jobs + */ + config.jobs = { + messageLog: true }; /** diff --git a/electron/config/config.local.js b/electron/config/config.local.js index 9b63737..69938ca 100644 --- a/electron/config/config.local.js +++ b/electron/config/config.local.js @@ -18,6 +18,13 @@ module.exports = (appInfo) => { */ config.openAppMenu = true; + /** + * jobs + */ + config.jobs = { + messageLog: true + }; + return { ...config }; diff --git a/electron/config/config.prod.js b/electron/config/config.prod.js index cc58f5b..2ed9b61 100644 --- a/electron/config/config.prod.js +++ b/electron/config/config.prod.js @@ -18,6 +18,13 @@ module.exports = (appInfo) => { */ config.openAppMenu = false; + /** + * jobs + */ + config.jobs = { + messageLog: false + }; + return { ...config }; diff --git a/electron/controller/framework.js b/electron/controller/framework.js index c60993c..91de22c 100644 --- a/electron/controller/framework.js +++ b/electron/controller/framework.js @@ -241,6 +241,8 @@ class FrameworkController extends Controller { /** * 上传文件 + * 不建议使用,请使用electron的api来获取文件的本机路径,然后读取并上传 + * 使用http的files属性,实际上多余拷贝一次文件 */ async uploadFile() { const { CoreApp } = EE; diff --git a/frontend/index.html b/frontend/index.html index 42ae824..c0b96bd 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -17,7 +17,7 @@ margin: -7.5em; padding: 3em; position: absolute; - top: 40%; + top: 50%; width: 9em; transform: rotateX(45deg) rotateZ(45deg); transform-style: preserve-3d; diff --git a/go/config/config.default.ini b/go/config/config.default.ini new file mode 100644 index 0000000..e69de29 diff --git a/go/go.mod b/go/go.mod new file mode 100644 index 0000000..5be1a48 --- /dev/null +++ b/go/go.mod @@ -0,0 +1,21 @@ +module electron-egg + +go 1.20 + +require ee-go v1.0.0 + +replace ee-go => D:\www\bilibili\gofile\src\ee-core\ee-go + +require ( + github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/shirou/gopsutil/v3 v3.23.8 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect + github.com/yusufpapurcu/wmi v1.2.3 // indirect + golang.org/x/sys v0.11.0 // indirect +) diff --git a/go/go.sum b/go/go.sum new file mode 100644 index 0000000..6e039b6 --- /dev/null +++ b/go/go.sum @@ -0,0 +1,47 @@ +github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ= +github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/shirou/gopsutil/v3 v3.23.8 h1:xnATPiybo6GgdRoC4YoGnxXZFRc3dqQTGi73oLvvBrE= +github.com/shirou/gopsutil/v3 v3.23.8/go.mod h1:7hmCaBn+2ZwaZOr6jmPBZDfawwMGuo1id3C6aM8EDqQ= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= +github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/go/main.go b/go/main.go new file mode 100644 index 0000000..ee266cb --- /dev/null +++ b/go/main.go @@ -0,0 +1,9 @@ +package main + +import ( + "ee-go/eapp" +) + +func main() { + eapp.Run() +} diff --git a/package.json b/package.json index c09a7f2..6ff3ee9 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,14 @@ { "name": "ee", - "version": "3.7.0", + "version": "3.8.0", "description": "A fast, desktop software development framework", "main": "main.js", "scripts": { "dev": "ee-bin dev", "dev-frontend": "ee-bin dev --serve=frontend", "dev-electron": "ee-bin dev --serve=electron", + "dev-go": "ee-bin exec --command=go", + "dev-cmd": "ee-bin exec --command=node_version,npm_version", "build-frontend": "ee-bin build", "start": "ee-bin start", "rd": "ee-bin rd",