From 9cf463b04c94a4ab2716be6d1f4056d3ae30eeb4 Mon Sep 17 00:00:00 2001 From: Sun <95302870@qq.com> Date: Wed, 29 Nov 2023 10:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0v1.1.0=20Squashed=20commit=20?= =?UTF-8?q?of=20the=20following:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 4443f7c8251b31687ed93114930ab3d769f4ed6c Author: Sun <95302870@qq.com> Date: Tue Nov 28 22:10:49 2023 +0800 美化关于页 commit 95ca46d460eba469ca8ae54f65c7773835061c0f Author: Sun <95302870@qq.com> Date: Tue Nov 28 21:59:48 2023 +0800 更新版本号,更新说明文件增加新版预览截图 commit 052e5f81fe4065e10199d52bc041329fc9c5fe86 Author: Sun <95302870@qq.com> Date: Tue Nov 28 21:06:52 2023 +0800 修复后端mkdirAll权限的问题 commit ace57d5ba69c311e40997d5791cf03a8b28e0c07 Author: Sun <95302870@qq.com> Date: Tue Nov 28 20:59:35 2023 +0800 修改配置文件 commit 099015f2767cedfd6eae91e60131817471eb1f24 Author: Sun <95302870@qq.com> Date: Tue Nov 28 14:10:39 2023 +0800 增加docker-compose文件 commit e229003431ff2476f0ab63a8dffb88504716ba48 Author: Sun <95302870@qq.com> Date: Tue Nov 28 13:53:20 2023 +0800 提交更新日志文件 commit e8736b8b62db6d590c063b42757599381429541e Author: Sun <95302870@qq.com> Date: Tue Nov 28 13:49:38 2023 +0800 增加隐藏小图标 commit 038af3aaa91a023cc10aabff5b0cfd15c64d0b46 Author: Sun <95302870@qq.com> Date: Tue Nov 28 13:49:04 2023 +0800 优化 密码限制 commit 4cd15a383923bf3de56e9e4dc6df3bf97236ed18 Author: Sun <95302870@qq.com> Date: Tue Nov 28 12:34:59 2023 +0800 增加反馈入口 commit daf6aea902893f816dca5c0bb09326f2f110ddcc Merge: 3edfadd b057e25 Author: Sun <95302870@qq.com> Date: Mon Nov 27 22:19:59 2023 +0800 Merge branch 'master' into dev commit 3edfaddd173efcbbde867dc9ce9b022920b39061 Author: Sun <95302870@qq.com> Date: Mon Nov 27 22:17:08 2023 +0800 修改docker的编译镜像和运行镜像为alpine,兼容极空间设备 commit 3445f97152c2f6b9f1f9f68b46e4b84f8240c9c2 Author: Sun <95302870@qq.com> Date: Mon Nov 27 13:58:59 2023 +0800 修复前端编译错误 commit 3ef02013ffb595e7805692350389bb623155cfe9 Author: Sun <95302870@qq.com> Date: Mon Nov 27 13:56:12 2023 +0800 更新beta版本号 commit 620f0f1e1523f34e87001e8a2bbe3d4a01cb0b9b Author: Sun <95302870@qq.com> Date: Mon Nov 27 13:53:46 2023 +0800 修复 添加图标成功后遗留旧数据的问题 commit 55d877d1ca11e83d9f7325a321aeb5b65ad4ee8b Author: Sun <95302870@qq.com> Date: Mon Nov 27 13:41:55 2023 +0800 增加置顶按钮 commit f28dd63328aeca5d8c3c036c5786304f8a33b1f9 Author: Sun <95302870@qq.com> Date: Mon Nov 27 12:56:14 2023 +0800 优化roundmodal的样式和手机端设置样式 commit c19ce176878ea2ef06b0a5dc75bd6d8239892302 Author: Sun <95302870@qq.com> Date: Mon Nov 27 11:06:44 2023 +0800 优化手机端logo文字显示问题 commit 018dabb2faddc0541fb33ef5a51a126575a59cf5 Author: Sun <95302870@qq.com> Date: Mon Nov 27 10:51:02 2023 +0800 更新说明文件 commit 02239e3686933e4c33e430be8300ec2d0be41887 Author: Sun <95302870@qq.com> Date: Sun Nov 26 22:59:11 2023 +0800 优化 登录页面 commit 6aa92e8ba6c4eeb2fa2995ee93aeeac86b54b551 Author: Sun <95302870@qq.com> Date: Sat Nov 25 23:59:40 2023 +0800 增加编译脚本 commit d93df810fa95a7baa28ca5323903b93f286ba741 Author: Sun <95302870@qq.com> Date: Sat Nov 25 15:48:00 2023 +0800 修改相关logo图片 commit 036a56ddc7a555d6227c92dfa2abfe84f9042662 Merge: 7018872 feacc89 Author: Sun <95302870@qq.com> Date: Fri Nov 24 16:00:23 2023 +0800 Merge branch 'master' into dev commit 7018872ce9fd0fa8f1ff4731a16b2ea90fb9153f Author: Sun <95302870@qq.com> Date: Fri Nov 24 15:31:31 2023 +0800 更新版本标签 commit 4fae97dd932ce4638d869a0c7a123c788c3e3e43 Author: Sun <95302870@qq.com> Date: Fri Nov 24 15:07:39 2023 +0800 更新版本1.1.0 测试版 commit 890a3c3dbdccbe4dfd5a6915e87a2649c9141e7b Author: Sun <95302870@qq.com> Date: Fri Nov 24 14:31:26 2023 +0800 右键菜单新增打开局域网或者互联网地址,优化分组管理图标不统一的问题 commit 4f014cf4aa384a2c8a03585ffd6ce41c941b9356 Author: Sun <95302870@qq.com> Date: Fri Nov 24 13:33:43 2023 +0800 增加 关联删除,优化添加密码长度限制20 commit 5658e6c379b077d359fff75c5e9b904cbce5f81e Author: Sun <95302870@qq.com> Date: Fri Nov 24 12:09:41 2023 +0800 增加更新日志 commit f142d1b378e0525db157a93cca61ee86bf1eb08d Author: Sun <95302870@qq.com> Date: Fri Nov 24 12:09:30 2023 +0800 添加应用图标验证分组信息必填 commit 2ff2b6b32a4bb70653e3a7312ccb0f4b0b945f07 Author: Sun <95302870@qq.com> Date: Thu Nov 23 23:45:10 2023 +0800 优化关于页面,及更新版本序号为2 commit c9b482b24e2d23d638501dbaa44f826386c420b5 Author: Sun <95302870@qq.com> Date: Thu Nov 23 22:12:13 2023 +0800 优化关于设置版本号 commit ed70059ffbce1ae8a9e2e0378803f7875ada342b Author: Sun <95302870@qq.com> Date: Thu Nov 23 21:41:22 2023 +0800 修复分组管理不能滚动的问题 commit faa4222b1494271878c2c7469c14a4efa49c6761 Author: Sun <95302870@qq.com> Date: Thu Nov 23 21:24:34 2023 +0800 修复分组写死的问题 commit 4f2d0c858e55735b9ba3a8453de9407b76346805 Author: Sun <95302870@qq.com> Date: Thu Nov 23 20:24:39 2023 +0800 初步尝试构建测试版本 commit 596bed19dcf3bceb77e30f9c24218888f8da7e64 Author: Sun <95302870@qq.com> Date: Thu Nov 23 19:24:05 2023 +0800 修复搜索框配置bug,云端没有默认值,前端打不开搜索引擎选择栏 commit 489fbf748a7e35c6b69198b19038c01a548e20f2 Author: Sun <95302870@qq.com> Date: Thu Nov 23 19:22:57 2023 +0800 增加logo和版本打印,修复模块配置的索引报错 commit 263dab607af8a830acee44e37776bda4da814b40 Author: Sun <95302870@qq.com> Date: Wed Nov 22 23:02:37 2023 +0800 调整排序样式 commit c0adf335d3e48e6770d56eb506b471852fbfbc43 Author: Sun <95302870@qq.com> Date: Wed Nov 22 22:58:18 2023 +0800 说明文件增加logo commit 721d22e75b93d3646f5f206d208a9a743840a25b Author: Sun <95302870@qq.com> Date: Wed Nov 22 22:40:40 2023 +0800 更换logo commit 4df58fec7b2054ce97cf2989045affd144aa4f8b Author: Sun <95302870@qq.com> Date: Wed Nov 22 22:38:27 2023 +0800 完善关于页面 commit 63777f0bbac85550fafe1b084bd664c7722ab934 Author: Sun <95302870@qq.com> Date: Wed Nov 22 21:12:14 2023 +0800 字体为纯白色的时候,详情图标会根据背景的明暗度计算字体颜色 commit f328dc73305665a921e030dd4a06d759d0cac3bf Author: Sun <95302870@qq.com> Date: Wed Nov 22 17:21:40 2023 +0800 详情图标居中 commit 663f37bf1a26b7dff24edcfb149222ac780cb90d Author: Sun <95302870@qq.com> Date: Wed Nov 22 16:45:11 2023 +0800 将图标单独拆分为子组件应用图标 commit 30cd5ab460e032f7f6d7c23eb7a9c7af735d0f41 Author: Sun <95302870@qq.com> Date: Wed Nov 22 13:36:32 2023 +0800 增加详情图标隐藏描述信息等设置 commit 945a94e76cae4251953512cc09f348ad38bb9a38 Author: Sun <95302870@qq.com> Date: Wed Nov 22 12:28:46 2023 +0800 优化图标背景色:支持透明图标并更换背景颜色字段 commit 437053fc9d8d9e3c55aac4d259e4b4c4bc11de58 Author: Sun <95302870@qq.com> Date: Wed Nov 22 11:20:56 2023 +0800 完善搜索框 commit a9914f8e8ced23b8c50701a85d522c8f0fcd1c2b Author: Sun <95302870@qq.com> Date: Wed Nov 22 01:27:16 2023 +0800 关闭模块配置相关接口开发模式 commit 2a9e22d4b781f43c0f9b8a867d26c295e756175b Author: Sun <95302870@qq.com> Date: Wed Nov 22 01:24:09 2023 +0800 完成搜索框的样式和模块配置的state等api对接 commit 7f771650ef7272e474f74ed689ab844bf90b946f Author: Sun <95302870@qq.com> Date: Wed Nov 22 00:45:25 2023 +0800 增加搜索引擎图标 commit a0e0039ae89eaa27e4b849baa0168716866682ea Author: Sun <95302870@qq.com> Date: Tue Nov 21 19:54:36 2023 +0800 增加 模块配置表 commit 017869794177d7a5d4c12c0eac6fb7c7fe79734e Author: Sun <95302870@qq.com> Date: Tue Nov 21 13:10:39 2023 +0800 图标标题加粗 commit 7a2d896a44262b54d6a1d2d12fe6bbbc31b1ca49 Author: Sun <95302870@qq.com> Date: Tue Nov 21 12:53:39 2023 +0800 增加图标的预设颜色 commit a6c3120c186646b323e57ecce0f85ec9c79a41a5 Author: Sun <95302870@qq.com> Date: Tue Nov 21 12:18:46 2023 +0800 增加遮罩 commit 84d3db81ea2aaa0f67a67690e449d15401e8e511 Author: Sun <95302870@qq.com> Date: Tue Nov 21 11:05:24 2023 +0800 极简小图标增加鼠标悬浮详情 commit 666a6a117bc30c64a78ab0fe2cb7836c602b2741 Author: Sun <95302870@qq.com> Date: Mon Nov 20 23:33:10 2023 +0800 修复 sort字段未修改归0的问题 commit 71afd530d7a740763326a6117f8e7c04ac1f7f69 Author: Sun <95302870@qq.com> Date: Mon Nov 20 23:32:48 2023 +0800 适配纯透明图标,增强图标背景色,增加图标url连接支持 commit 619c5e28e1c51c16e14ed09601709ab751ee2454 Author: Sun <95302870@qq.com> Date: Mon Nov 20 22:37:43 2023 +0800 修复 每次修改图标都重置了排序号 commit 8a17f1c0bf2f00c530dee61cd5070a74ca4a53b2 Author: Sun <95302870@qq.com> Date: Mon Nov 20 21:21:20 2023 +0800 分组为空的时候显示添加图标的图标 commit 755cf3dc569e402cb3dfc9915e94de4f2595571b Author: Sun <95302870@qq.com> Date: Mon Nov 20 20:52:45 2023 +0800 首页图标排序完成 commit 5ccf23c68b3284be00dadf94073a665826737a77 Author: Sun <95302870@qq.com> Date: Mon Nov 20 14:30:12 2023 +0800 添加修改图标适配分组 commit 47209d729270bf4704428ecd91606d4721bd9a13 Author: Sun <95302870@qq.com> Date: Mon Nov 20 11:06:32 2023 +0800 保存分组和分组排序已经完成 commit 17403de7ed236a097d70cd5ecbbe261e620ff377 Merge: d0d88eb 980d81a Author: Sun <95302870@qq.com> Date: Sun Nov 19 23:38:00 2023 +0800 Merge branch 'master' into dev commit d0d88eb548bbe9d7f5ad663f383db858843a8d8c Merge: 728dbc8 47b479c Author: Sun <95302870@qq.com> Date: Sun Nov 19 11:13:34 2023 +0800 Merge branch 'docker-build' into dev commit 47b479cf8da7214dd9e0592b461743ab7d3824ed Author: Sun <95302870@qq.com> Date: Sun Nov 19 11:12:54 2023 +0800 修改前端程序名 commit 728dbc80ff7885d0b4cf289b06763cc60ed17d7e Author: Sun <95302870@qq.com> Date: Thu Nov 16 13:44:47 2023 +0800 新增删除应用分组和修改应用分组,以及图标真正的按组读取 commit a3dbd948ca743384a2de3685083695603d674bf1 Author: Sun <95302870@qq.com> Date: Wed Nov 15 22:49:58 2023 +0800 增加图标组api commit de21f3f232c1243917b5c55ba4bedb01437f8564 Author: Sun <95302870@qq.com> Date: Wed Nov 15 22:49:44 2023 +0800 重新划分应用盒子的结构 commit 7c409112ba1f8eefb7df7fffdb78b285e3f5322c Author: Sun <95302870@qq.com> Date: Wed Nov 15 22:27:07 2023 +0800 [后端] 增加应用分组 commit ebf9500529c7db30b1c6e1ed4056013d0f83827a Merge: acedcb3 97d4f83 Author: Sun <95302870@qq.com> Date: Wed Nov 15 20:38:05 2023 +0800 Merge branch 'feature/drag' into dev commit acedcb32a03ed0ee1833143912a9215182da3fb6 Merge: f105e10 c84eae3 Author: Sun <95302870@qq.com> Date: Wed Nov 15 20:37:26 2023 +0800 Merge branch 'master' into dev commit 97d4f8368dffca2a16d729e666068a552feca87d Author: Sun <95302870@qq.com> Date: Wed Nov 15 20:36:19 2023 +0800 更新软件包 commit 5108f65275181b899b8fc100c615cb6065dcca5d Author: Sun <95302870@qq.com> Date: Wed Nov 15 20:30:39 2023 +0800 简单监听了一下拖拽 commit dae9aea41f1540ccb74abea2a31af5d2a1e4dcfd Merge: 396db51 f672034 Author: Sun <95302870@qq.com> Date: Wed Nov 15 10:01:00 2023 +0800 Merge branch 'master' into feature/drag commit 396db51979d513559512b0a9702dd0d616c2872b Author: Sun <95302870@qq.com> Date: Wed Nov 15 00:08:02 2023 +0800 历史性时刻,拖拽图标 commit f105e10fe1ced11d0b32eba37cfbfdb94f6ad07b Author: Sun <95302870@qq.com> Date: Tue Nov 14 11:35:52 2023 +0800 尝试增加一个分组标题 commit 7e2354f4ed509c7d05667604b7eb56e91f911ed0 Author: Sun <95302870@qq.com> Date: Sun Nov 12 23:07:37 2023 +0800 优化 枚举引用错误 commit 27e85b7da339706ea97604a785bf013dad5f9534 Author: Sun <95302870@qq.com> Date: Sun Nov 12 23:06:50 2023 +0800 优化路由 commit fef462804c0d445f5b9bc7e38e226b55c26017ee Author: Sun <95302870@qq.com> Date: Sun Nov 12 21:28:57 2023 +0800 更换enums的位置 --- Dockerfile | 9 +- README.md | 51 +- UPDATELOG.md | 22 + build.sh | 143 ++++++ doc/images/icon-info-new.png | Bin 0 -> 240123 bytes doc/images/icon-small-new.png | Bin 0 -> 243682 bytes doc/images/logo.png | Bin 0 -> 63259 bytes doc/images/solid-color-info.png | Bin 0 -> 236766 bytes doc/images/transparent-info.png | Bin 0 -> 268402 bytes doc/images/transparent-small.png | Bin 0 -> 277147 bytes docker-compose.yml | 14 + package-lock.json | 4 +- package.json | 5 +- pnpm-lock.yaml | 74 +-- public/favicon-black.svg | 1 + public/favicon.ico | Bin 165662 -> 11500 bytes public/favicon.svg | 2 +- public/logo.png | Bin 0 -> 63259 bytes .../common/apiData/commonApiStructs/common.go | 9 + .../apiData/panelApiStructs/itemIcon.go | 12 +- service/api/api_v1/panel/A_ENTER.go | 7 +- service/api/api_v1/panel/ItemIconGroup.go | 152 ++++++ service/api/api_v1/panel/itemIcon.go | 54 +- service/api/api_v1/panel/users.go | 49 +- service/api/api_v1/system/A_ENTER.go | 15 +- service/api/api_v1/system/ModuleConfig.go | 53 ++ service/api/api_v1/system/login.go | 4 +- service/assets/conf.example.ini | 37 +- service/assets/version | 2 +- service/initialize/A_ENTER.go | 15 + service/initialize/database/connect.go | 4 +- service/lib/cmn/base.go | 3 +- service/lib/cmn/log.go | 4 +- service/models/datatype/itemIcon.go | 3 +- service/models/itemIcon.go | 37 +- service/models/itemIconGroup.go | 20 + service/models/moduleConfig.go | 61 +++ service/router/panel/A_ENTER.go | 1 + service/router/panel/itemIcon.go | 1 + service/router/panel/itemIconGroup.go | 19 + service/router/system/A_ENTER.go | 1 + service/router/system/moduleConfig.go | 16 + src/api/panel/itemIcon.ts | 10 +- src/api/panel/itemIconGroup.ts | 28 ++ src/api/system/moduleConfig.ts | 18 + src/assets/about_image/docker.png | Bin 0 -> 1410 bytes src/assets/about_image/gitee.png | Bin 0 -> 7019 bytes src/assets/about_image/github.png | Bin 0 -> 7421 bytes src/assets/logo.svg | 1 + src/assets/search_engine_svg/baidu.svg | 1 + src/assets/search_engine_svg/bing.svg | 20 + src/assets/search_engine_svg/google.svg | 1 + src/components/common/ItemIcon/index.vue | 20 +- .../common/RoundCardModal/index.vue | 2 +- src/components/common/Setting/About.vue | 27 - src/components/deskModule/SearchBox/index.vue | 177 ++++++- src/enums/index.ts | 1 + src/{enum.ts => enums/panel/index.ts} | 4 +- src/router/index.ts | 9 - src/store/modules/index.ts | 1 + src/store/modules/moduleConfig/helper.ts | 22 + src/store/modules/moduleConfig/index.ts | 54 ++ src/store/modules/panel/helper.ts | 6 +- src/store/modules/panel/index.ts | 2 +- src/typings/common.d.ts | 5 + src/typings/deskModule/searchBox.d.ts | 10 + src/typings/panel.d.ts | 20 +- src/views/exception/test/index.vue | 60 ++- src/views/home/Layout.vue | 50 -- src/views/home/applist/index.vue | 0 src/views/home/components/AppIcon/index.vue | 87 ++++ .../home/components/EditItem/IconEditor.vue | 123 +++-- src/views/home/components/EditItem/index.vue | 121 ++++- src/views/home/components/Setting/index.vue | 11 +- .../home/components/Setting/tabs/About.vue | 57 ++- .../Setting/tabs/EditUser/index.vue | 8 +- .../Setting/tabs/ItemGroupManage.vue | 198 ++++++++ .../home/components/Setting/tabs/Style.vue | 106 ++-- .../home/components/Setting/tabs/UserInfo.vue | 4 + .../home/components/Setting/tabs/Users.vue | 7 +- src/views/home/components/index.ts | 3 +- src/views/home/index.vue | 471 ++++++++++++------ src/views/login/index.vue | 20 +- 83 files changed, 2089 insertions(+), 580 deletions(-) create mode 100644 UPDATELOG.md create mode 100644 build.sh create mode 100644 doc/images/icon-info-new.png create mode 100644 doc/images/icon-small-new.png create mode 100644 doc/images/logo.png create mode 100644 doc/images/solid-color-info.png create mode 100644 doc/images/transparent-info.png create mode 100644 doc/images/transparent-small.png create mode 100644 docker-compose.yml create mode 100644 public/favicon-black.svg create mode 100644 public/logo.png create mode 100644 service/api/api_v1/panel/ItemIconGroup.go create mode 100644 service/api/api_v1/system/ModuleConfig.go create mode 100644 service/models/itemIconGroup.go create mode 100644 service/models/moduleConfig.go create mode 100644 service/router/panel/itemIconGroup.go create mode 100644 service/router/system/moduleConfig.go create mode 100644 src/api/panel/itemIconGroup.ts create mode 100644 src/api/system/moduleConfig.ts create mode 100644 src/assets/about_image/docker.png create mode 100644 src/assets/about_image/gitee.png create mode 100644 src/assets/about_image/github.png create mode 100644 src/assets/logo.svg create mode 100644 src/assets/search_engine_svg/baidu.svg create mode 100644 src/assets/search_engine_svg/bing.svg create mode 100644 src/assets/search_engine_svg/google.svg create mode 100644 src/enums/index.ts rename src/{enum.ts => enums/panel/index.ts} (70%) create mode 100644 src/store/modules/moduleConfig/helper.ts create mode 100644 src/store/modules/moduleConfig/index.ts create mode 100644 src/typings/deskModule/searchBox.d.ts delete mode 100644 src/views/home/Layout.vue create mode 100644 src/views/home/applist/index.vue create mode 100644 src/views/home/components/AppIcon/index.vue create mode 100644 src/views/home/components/Setting/tabs/ItemGroupManage.vue diff --git a/Dockerfile b/Dockerfile index 387b5c6..26b3ecf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,12 +16,13 @@ COPY . /build RUN pnpm run build # build backend -FROM golang:1.19 as server_image +FROM golang:1.21-alpine as server_image WORKDIR /build COPY ./service . +RUN apk add --no-cache bash curl gcc git go musl-dev # 执行指令 关闭链接确认 RUN go env -w GO111MODULE=on \ @@ -34,7 +35,7 @@ RUN go env -w GO111MODULE=on \ # run_image -FROM ubuntu +FROM alpine WORKDIR /app @@ -42,6 +43,8 @@ COPY --from=web_image /build/dist /app/web COPY --from=server_image /build/sun-panel /app/sun-panel -RUN apt-get update && apt-get install -y ca-certificates &&./sun-panel -config +RUN apk add --no-cache bash ca-certificates su-exec tzdata \ + && chmod +x ./sun-panel \ + && ./sun-panel -config CMD ./sun-panel diff --git a/README.md b/README.md index ef978fb..82fcaf8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@
- + ## 😎 特点 -- 局域网内外网链接切换 - 简洁 -- docker 部署 +- 局域网内外网链接切换 +- docker部署,对arm系统支持 - 上手简单,免修改代码 - 无需连接外部数据库 - 丰富图标自由搭配(文字图标+svg图标+内置三方图标库) @@ -47,22 +49,36 @@ 先画个饼 -- [ ] 图标排序 +- [x] 分组,拖拽排序 +- [ ] 导入导出功能 +- [ ] 增加访客账号 +- [ ] 用户自定义搜索框搜索引擎 +- [ ] 搜索框样式自定义(背景颜色,文字颜色) +- [ ] 帐号解除邮箱限制 +- [ ] 对上传的文件管理(针对账户增强重复利用,节省空间) +- [ ] 多国语言支持 - [ ] 服务器监控 - [ ] docker管理器 - [ ] 计划任务 + + ## 🖼️ 预览截图 - - +**各种风格,自由搭配** + + + + +  -内置小窗口 +**内置小窗口** +   -## 🍜 使用教程 +## 🍜 使用运行教程 @@ -78,7 +94,20 @@ |-config|生成配置文件(conf/conf.ini)| |-password-reset|重置第一个用户的密码| +### 二进制文件运行 + +去 [Releases](https://github.com/hslr-s/sun-panel/releases) 下载二进制文件 + 执行示例 + +```sh +./sun-panel +``` + +#### 重置密码 + +执行示例 + ```sh ./sun-panel -password-reset ``` @@ -115,14 +144,14 @@ hslr/sun-panel ``` -### 编译和运行 +### 自编译运行 #### 前端 ``` # 开发运行 pnpm dev -# 编译打包 +# 编译打包(打包后生成dist目录,若需要结合后端使用请改成web) pnpm build ``` diff --git a/UPDATELOG.md b/UPDATELOG.md new file mode 100644 index 0000000..496fe38 --- /dev/null +++ b/UPDATELOG.md @@ -0,0 +1,22 @@ +# 更新说明 +> 老用户版本升级需要看升级说明,并且一定提前备份好重要数据。新用户可以直接使用最新版本。 + + +## v1.1.0 +> 支持上个版本直接升级无需特殊处理 + +- [新增] 增加分组,拖拽排序 +- [新增] 搜索框 +- [新增] 应用图标支持URL外链 +- [新增] 图标支持纯透明 +- [新增] 壁纸背景增加遮罩设置 +- [新增] 右键菜单新增打开局域网或者互联网地址 +- [优化] 网址输入框增加https/http提示 +- [优化] 小图标模式,鼠标悬浮显示详情,支持隐藏图标标题 +- [优化] 详情图标样式,支持隐藏描述信息 +- [优化] 添加用户密码时限制字符 +- [其他] 新增arm版本docker支持。[DockerHub](https://hub.docker.com/r/hslr/sun-panel)直接拉取即可 +- [其他] 新增多平台二进制文件运行。[Releases](https://github.com/hslr-s/sun-panel/releases) + +## v1.0.0 +- 首个版本 \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..fd2ca21 --- /dev/null +++ b/build.sh @@ -0,0 +1,143 @@ +#!/bin/bash + +REPO=$( + cd $(dirname $0) + pwd +) +COMMIT_SHA=$(git rev-parse --short HEAD) +VERSION=$(git describe --tags) +# VERSION="0.1.1" +FRONTEND="false" +BINARY="false" +RELEASE="false" + +debugInfo() { + echo "Repo: $REPO" + echo "Build frontend: $FRONTEND" + echo "Build binary: $BINARY" + echo "Release: $RELEASE" + echo "Version: $VERSION" + echo "Commit: $COMMIT_SHA" +} + +buildFrontend() { + cd $REPO + pwd +# npm install pnpm -g + pnpm install + pnpm run build +} + +buildBackEndAssets() { + cd $REPO/service +# export PATH=$PATH:/root/go/bin + go install -a -v github.com/go-bindata/go-bindata/...@latest + go install -a -v github.com/elazarl/go-bindata-assetfs/...@latest + go-bindata-assetfs -o=assets/bindata.go -pkg=assets assets/... +} + +# buildBinary() { +# cd $REPO/service +# # mv "${REPO}/dist" "${REPO}/web" +# go build -o "sun-panel" --ldflags="-X sun-panel/global.RUNCODE=release" main.go +# } + +_build() { + cd $REPO/service + pwd + local osarch=$1 + IFS=/ read -r -a arr <<<"$osarch" + os="${arr[0]}" + arch="${arr[1]}" + gcc="${arr[2]}" + + # Go build to build the binary. + export GOOS=$os + export GOARCH=$arch + export CC=$gcc + export CGO_ENABLED=1 + + pathRelease=$REPO/release + + if [ -n "$VERSION" ]; then + outPath="sun-panel_${VERSION}_${os}_${arch}" + else + outPath="sun-panel_${COMMIT_SHA}_${os}_${arch}" + fi + outname="${pathRelease}/${outPath}/sun-panel" + go build -o "${outname}" --ldflags="-X sun-panel/global.RUNCODE=release" main.go + + cd $pathRelease + # copy front file + cp -r "${REPO}/dist" "${pathRelease}/${outPath}/web" + + echo "Release ${outPath}" + if [ "$os" = "windows" ]; then + mv $outname $outPath/sun-panel.exe + zip -r "${pathRelease}/${outPath}.zip" $outPath + else + mv $outname $outPath/sun-panel + tar -zcvf "${pathRelease}/${outPath}.tar.gz" $outPath + fi + rm -rf "${pathRelease}/${outPath}" +} + +release() { + cd $REPO/service + ## List of architectures and OS to test coss compilation. + SUPPORTED_OSARCH="linux/amd64/gcc linux/arm/arm-linux-gnueabihf-gcc windows/amd64/x86_64-w64-mingw32-gcc linux/arm64/aarch64-linux-gnu-gcc" + + echo "Release builds for OS/Arch/CC: ${SUPPORTED_OSARCH}" + for each_osarch in ${SUPPORTED_OSARCH}; do + _build "${each_osarch}" + done +} + +usage() { + # echo "Usage: $0 [-f] [-c] [-b] [-r]" 1>&2 + echo "Usage: $0 [-f] [-b] [-r]" 1>&2 + exit 1 +} + +while getopts "bfcrd" o; do + case "${o}" in + b) + FRONTEND="true" + BINARY="true" + ;; + f) + FRONTEND="true" + ;; + c) + BINARY="true" + ;; + r) + FRONTEND="true" + RELEASE="true" + ;; + d) + DEBUG="true" + ;; + *) + usage + ;; + esac +done +shift $((OPTIND - 1)) + +if [ "$DEBUG" = "true" ]; then + debugInfo +fi + +if [ "$FRONTEND" = "true" ]; then + buildFrontend +fi + +# if [ "$BINARY" = "true" ]; then +# buildBinary +# fi + +if [ "$RELEASE" = "true" ]; then + buildBackEndAssets + release +fi \ No newline at end of file diff --git a/doc/images/icon-info-new.png b/doc/images/icon-info-new.png new file mode 100644 index 0000000000000000000000000000000000000000..c31947e840aa74891f9d87cb7804fc71b9dd0c4f GIT binary patch literal 240123 zcmZsDWmH?ywk|C#?poa4iaQhu?(XjH9w?=_YjAgWmjcDDNO0HU?)F-G&VBdC-D4zc zXJ;p4P5b7Y-qif}A)a94;IL1O%d_gs2h(1XMi)1Y{S?`#)FSvDbL~8DJeGG@T(J zNVxt!-T{)B4gOq2bpdF&DBGL4xEnf|LMYo=Iv6^;nCfDWuRuT$Lr97Wsd%Ixb=V#W zjCiiO>Uu{-6Hx5TTVX)6Q@)qRr*Du8#4RFKpeeSaV~?VTku8W5vlOau*oPMm6GhEN zy9OxIs$4`tH;`t3Q~7S8pD($Ff*NW>E1@lgSRp0x1t~NxdH!6)$IYWgzV6b6fAr}2 z>=7vFIR5H>IR*-mL(xG4K;_vkpGn_Fg@1$ER
zTAgfW3GkvfwelfkDB%|J8qqR<*G?|K65Fmq>s G$2Th2#8I3inVa~mT#M-d4<@xR
zf(#JZ66zrWaQ0g4;=>Em0Q#Hxm(f6{&x1hZp;6_+gML2MbT9kH(R&0ZwcC!SQe5^i
zyH^E_(_!b}iLCHg>xVoskjl}A0Gi_Oih_lg;hefLAXflsABCpc_h?^)L-F06j_=k_
zt{Gd#zK%j7Gr%js_<17xqs@$m_hn%=?OJJs`fYvhr)DNdeYg_al1B6IgcWA1=k@Jy
za-S*m2=N3Ehmw}H LqB1%X;ikVZ*efL`lqC$HLV6K&cQwx*EQVCkgJEv@tx^8%-r?+NY^+fJtkp1*S@(%{#}DVd;exz17hGM%SAf!9faO}PE{{c-uU7QE+aar
zJ;ffnSJR5)oeP|4=O+ohv@y71eU5xn!qHMq!6R98sg5vYu9L4{=CSV
6ky(V*
zcb^)3=Nkx;myIPqxJ3=i7z=VY{j{M3J1vM$?M9rXJ9Z2eao@iD$5{V;M~pTj>Xgm4
zbqkl
d
zE{k!t&&E6}q;xv&KA$!#qM-gWOa-vNX_J#u@u{xz)k4bJ!=3dj*oM#|W9T3%d2qLV
z;x)(f#@m&Uwm!*_?3mHVFk74W+!|-{xU%liJo(FS^0+G2@1P%D{(WPu1T#ruW9&(Y
zl+)ueO90*7KbYm#iVvmG!JWU-TgoH)c_yY%;2F9P_fM|i^+$cq9Spi&UEVb|LbR#C
z|BhlW!16~{MarL_!OtW49>QBURlOUaMDP57;J0NHpTwjS_xS
z30EZK=PV7BugZJ*9iKn{ar3Fyj7~UTdViYP_dB$BE9$)77JSNn5BA$UfA!7{aZypN
zXmR?Yb@!^)=)ljPEl6oDt8D3)i^-SJ=7pqhYq5?)Oz$4|vWhHD>U(+q_OSjwb^g>?
zrRP?p-i4g}oGy6t(`PW*_qI;((j+^nY-I(jQ8={YD)s%&&uiVyXOuxaSkZ=@BG2IQ
z`F*wXa`N^0eb^$3UQ{&uk+$<);cf5zR`Bg^HEhV>xxwIFPBbXBpOZM_9qy<5$3~Mp
z=J7sRe03}%ST
x7DO7s26r)VdN%3K8{`YwPQ;^y4YR@oEdQw;b$~IA6vrwqibn1@n|KG~^%1
zi
~z;7kxW67Opg@oqgwO)rAKl7x5f;F%KNMcwAJjhS560JF
zG8?V%co4L8o_MD+PL;U8^sU%6zhUk4%#Ufkz7gK=0$
z@gertda^dMMK^`HW1D3fM#vlc5@?iwSUAh0Rdz?zjB5<-XSl&wi^L<6EQZg6Q1A6rY)x_sUei^
z`}fB2{%}dz81Hso9)N)@hXjz)wH%yo0Q?vNAkJa0TbHgrGhmkM5?hdb+%Hx$$2zpsVaUjl;IYII
z0*Kg!u{gVsh5_R