更新v1.1.0

Squashed commit of the following:

commit 4443f7c
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 22:10:49 2023 +0800

    美化关于页

commit 95ca46d
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 21:59:48 2023 +0800

    更新版本号，更新说明文件增加新版预览截图

commit 052e5f8
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 21:06:52 2023 +0800

    修复后端mkdirAll权限的问题

commit ace57d5
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 20:59:35 2023 +0800

    修改配置文件

commit 099015f
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 14:10:39 2023 +0800

    增加docker-compose文件

commit e229003
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 13:53:20 2023 +0800

    提交更新日志文件

commit e8736b8
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 13:49:38 2023 +0800

    增加隐藏小图标

commit 038af3a
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 13:49:04 2023 +0800

    优化 密码限制

commit 4cd15a3
Author: Sun <95302870@qq.com>
Date:   Tue Nov 28 12:34:59 2023 +0800

    增加反馈入口

commit daf6aea
Merge: 3edfadd b057e25
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 22:19:59 2023 +0800

    Merge branch 'master' into dev

commit 3edfadd
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 22:17:08 2023 +0800

    修改docker的编译镜像和运行镜像为alpine，兼容极空间设备

commit 3445f97
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 13:58:59 2023 +0800

    修复前端编译错误

commit 3ef0201
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 13:56:12 2023 +0800

    更新beta版本号

commit 620f0f1
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 13:53:46 2023 +0800

    修复 添加图标成功后遗留旧数据的问题

commit 55d877d
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 13:41:55 2023 +0800

    增加置顶按钮

commit f28dd63
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 12:56:14 2023 +0800

    优化roundmodal的样式和手机端设置样式

commit c19ce17
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 11:06:44 2023 +0800

    优化手机端logo文字显示问题

commit 018dabb
Author: Sun <95302870@qq.com>
Date:   Mon Nov 27 10:51:02 2023 +0800

    更新说明文件

commit 02239e3
Author: Sun <95302870@qq.com>
Date:   Sun Nov 26 22:59:11 2023 +0800

    优化 登录页面

commit 6aa92e8
Author: Sun <95302870@qq.com>
Date:   Sat Nov 25 23:59:40 2023 +0800

    增加编译脚本

commit d93df81
Author: Sun <95302870@qq.com>
Date:   Sat Nov 25 15:48:00 2023 +0800

    修改相关logo图片

commit 036a56d
Merge: 7018872 feacc89
Author: Sun <95302870@qq.com>
Date:   Fri Nov 24 16:00:23 2023 +0800

    Merge branch 'master' into dev

commit 7018872
Author: Sun <95302870@qq.com>
Date:   Fri Nov 24 15:31:31 2023 +0800

    更新版本标签

commit 4fae97d
Author: Sun <95302870@qq.com>
Date:   Fri Nov 24 15:07:39 2023 +0800

    更新版本1.1.0 测试版

commit 890a3c3
Author: Sun <95302870@qq.com>
Date:   Fri Nov 24 14:31:26 2023 +0800

    右键菜单新增打开局域网或者互联网地址，优化分组管理图标不统一的问题

commit 4f014cf
Author: Sun <95302870@qq.com>
Date:   Fri Nov 24 13:33:43 2023 +0800

    增加 关联删除，优化添加密码长度限制20

commit 5658e6c
Author: Sun <95302870@qq.com>
Date:   Fri Nov 24 12:09:41 2023 +0800

    增加更新日志

commit f142d1b
Author: Sun <95302870@qq.com>
Date:   Fri Nov 24 12:09:30 2023 +0800

    添加应用图标验证分组信息必填

commit 2ff2b6b
Author: Sun <95302870@qq.com>
Date:   Thu Nov 23 23:45:10 2023 +0800

    优化关于页面，及更新版本序号为2

commit c9b482b
Author: Sun <95302870@qq.com>
Date:   Thu Nov 23 22:12:13 2023 +0800

    优化关于设置版本号

commit ed70059
Author: Sun <95302870@qq.com>
Date:   Thu Nov 23 21:41:22 2023 +0800

    修复分组管理不能滚动的问题

commit faa4222
Author: Sun <95302870@qq.com>
Date:   Thu Nov 23 21:24:34 2023 +0800

    修复分组写死的问题

commit 4f2d0c8
Author: Sun <95302870@qq.com>
Date:   Thu Nov 23 20:24:39 2023 +0800

    初步尝试构建测试版本

commit 596bed1
Author: Sun <95302870@qq.com>
Date:   Thu Nov 23 19:24:05 2023 +0800

    修复搜索框配置bug，云端没有默认值，前端打不开搜索引擎选择栏

commit 489fbf7
Author: Sun <95302870@qq.com>
Date:   Thu Nov 23 19:22:57 2023 +0800

    增加logo和版本打印，修复模块配置的索引报错

commit 263dab6
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 23:02:37 2023 +0800

    调整排序样式

commit c0adf33
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 22:58:18 2023 +0800

    说明文件增加logo

commit 721d22e
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 22:40:40 2023 +0800

    更换logo

commit 4df58fe
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 22:38:27 2023 +0800

    完善关于页面

commit 63777f0
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 21:12:14 2023 +0800

    字体为纯白色的时候，详情图标会根据背景的明暗度计算字体颜色

commit f328dc7
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 17:21:40 2023 +0800

    详情图标居中

commit 663f37b
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 16:45:11 2023 +0800

    将图标单独拆分为子组件应用图标

commit 30cd5ab
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 13:36:32 2023 +0800

    增加详情图标隐藏描述信息等设置

commit 945a94e
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 12:28:46 2023 +0800

    优化图标背景色：支持透明图标并更换背景颜色字段

commit 437053f
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 11:20:56 2023 +0800

    完善搜索框

commit a9914f8
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 01:27:16 2023 +0800

    关闭模块配置相关接口开发模式

commit 2a9e22d
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 01:24:09 2023 +0800

    完成搜索框的样式和模块配置的state等api对接

commit 7f77165
Author: Sun <95302870@qq.com>
Date:   Wed Nov 22 00:45:25 2023 +0800

    增加搜索引擎图标

commit a0e0039
Author: Sun <95302870@qq.com>
Date:   Tue Nov 21 19:54:36 2023 +0800

    增加 模块配置表

commit 0178697
Author: Sun <95302870@qq.com>
Date:   Tue Nov 21 13:10:39 2023 +0800

    图标标题加粗

commit 7a2d896
Author: Sun <95302870@qq.com>
Date:   Tue Nov 21 12:53:39 2023 +0800

    增加图标的预设颜色

commit a6c3120
Author: Sun <95302870@qq.com>
Date:   Tue Nov 21 12:18:46 2023 +0800

    增加遮罩

commit 84d3db8
Author: Sun <95302870@qq.com>
Date:   Tue Nov 21 11:05:24 2023 +0800

    极简小图标增加鼠标悬浮详情

commit 666a6a1
Author: Sun <95302870@qq.com>
Date:   Mon Nov 20 23:33:10 2023 +0800

    修复 sort字段未修改归0的问题

commit 71afd53
Author: Sun <95302870@qq.com>
Date:   Mon Nov 20 23:32:48 2023 +0800

    适配纯透明图标，增强图标背景色，增加图标url连接支持

commit 619c5e2
Author: Sun <95302870@qq.com>
Date:   Mon Nov 20 22:37:43 2023 +0800

    修复 每次修改图标都重置了排序号

commit 8a17f1c
Author: Sun <95302870@qq.com>
Date:   Mon Nov 20 21:21:20 2023 +0800

    分组为空的时候显示添加图标的图标

commit 755cf3d
Author: Sun <95302870@qq.com>
Date:   Mon Nov 20 20:52:45 2023 +0800

    首页图标排序完成

commit 5ccf23c
Author: Sun <95302870@qq.com>
Date:   Mon Nov 20 14:30:12 2023 +0800

    添加修改图标适配分组

commit 47209d7
Author: Sun <95302870@qq.com>
Date:   Mon Nov 20 11:06:32 2023 +0800

    保存分组和分组排序已经完成

commit 17403de
Merge: d0d88eb 980d81a
Author: Sun <95302870@qq.com>
Date:   Sun Nov 19 23:38:00 2023 +0800

    Merge branch 'master' into dev

commit d0d88eb
Merge: 728dbc8 47b479c
Author: Sun <95302870@qq.com>
Date:   Sun Nov 19 11:13:34 2023 +0800

    Merge branch 'docker-build' into dev

commit 47b479c
Author: Sun <95302870@qq.com>
Date:   Sun Nov 19 11:12:54 2023 +0800

    修改前端程序名

commit 728dbc8
Author: Sun <95302870@qq.com>
Date:   Thu Nov 16 13:44:47 2023 +0800

    新增删除应用分组和修改应用分组，以及图标真正的按组读取

commit a3dbd94
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 22:49:58 2023 +0800

    增加图标组api

commit de21f3f
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 22:49:44 2023 +0800

    重新划分应用盒子的结构

commit 7c40911
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 22:27:07 2023 +0800

    [后端] 增加应用分组

commit ebf9500
Merge: acedcb3 97d4f83
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 20:38:05 2023 +0800

    Merge branch 'feature/drag' into dev

commit acedcb3
Merge: f105e10 c84eae3
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 20:37:26 2023 +0800

    Merge branch 'master' into dev

commit 97d4f83
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 20:36:19 2023 +0800

    更新软件包

commit 5108f65
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 20:30:39 2023 +0800

    简单监听了一下拖拽

commit dae9aea
Merge: 396db51 f672034
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 10:01:00 2023 +0800

    Merge branch 'master' into feature/drag

commit 396db51
Author: Sun <95302870@qq.com>
Date:   Wed Nov 15 00:08:02 2023 +0800

    历史性时刻，拖拽图标

commit f105e10
Author: Sun <95302870@qq.com>
Date:   Tue Nov 14 11:35:52 2023 +0800

    尝试增加一个分组标题

commit 7e2354f
Author: Sun <95302870@qq.com>
Date:   Sun Nov 12 23:07:37 2023 +0800

    优化 枚举引用错误

commit 27e85b7
Author: Sun <95302870@qq.com>
Date:   Sun Nov 12 23:06:50 2023 +0800

    优化路由

commit fef4628
Author: Sun <95302870@qq.com>
Date:   Sun Nov 12 21:28:57 2023 +0800

    更换enums的位置

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,14 +35,16 @@ RUN go env -w GO111MODULE=on \
 
 
 # run_image
-FROM ubuntu
+FROM alpine
 
 WORKDIR /app
 
 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

README.md

@@ -1,5 +1,7 @@
 <div align=center>
-
+
+<img src="./doc/images/logo.png" width="100" height="100" />
+
 # Sun-Panel
 
 <a href="https://github.com/hslr-s/sun-panel.git">Github</a> | <a href="https://gitee.com/hslr/sun-panel.git">Gitee</a> | <a href="https://hub.docker.com/r/hslr/sun-panel">Docker Hub</a> |  <a href="https://www.bilibili.com/video/BV1AC4y1U7va">B站视频</a>
@@ -8,13 +10,13 @@
 
 </div>
 
-![](./doc/images/icon-info.jpg)
+![](./doc/images/icon-info-new.png)
 
 ## 😎 特点
 
-- 局域网内外网链接切换
 - 简洁
-- docker 部署
+- 局域网内外网链接切换
+- docker部署,对arm系统支持
 - 上手简单，免修改代码
 - 无需连接外部数据库
 - 丰富图标自由搭配（文字图标+svg图标+内置三方图标库）
@@ -47,22 +49,36 @@
 
 先画个饼
 
-- [ ] 图标排序
+- [x] 分组，拖拽排序
+- [ ] 导入导出功能
+- [ ] 增加访客账号
+- [ ] 用户自定义搜索框搜索引擎
+- [ ] 搜索框样式自定义（背景颜色，文字颜色）
+- [ ] 帐号解除邮箱限制
+- [ ] 对上传的文件管理（针对账户增强重复利用，节省空间）
+- [ ] 多国语言支持
 - [ ] 服务器监控
 - [ ] docker管理器
 - [ ] 计划任务
 
+
+
 ## 🖼️ 预览截图
 
-![](./doc/images/icon-small.jpg)
-![](./doc/images/full-color-info.jpg)
+**各种风格，自由搭配**
+
+![](./doc/images/icon-small-new.png)
+![](./doc/images/transparent-info.png)
+![](./doc/images/transparent-small.png)
+![](./doc/images/solid-color-info.png)
 ![](./doc/images/full-color-small.jpg)
 
-内置小窗口
+**内置小窗口**
+
 ![](./doc/images/window-ssh.png)
 ![](./doc/images/window-xunlei.png)
 
-## 🍜 使用教程
+## 🍜 使用运行教程
 
 <div id="default-username"></div>
 
@@ -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
 ```
 

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
+- 首个版本

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

docker-compose.yml

@@ -0,0 +1,14 @@
+version: "3.2"
+
+services:
+  sun-panel:
+    image: 'hslr/sun-panel:latest'
+    container_name: sun-panel
+    volumes:
+    - ./conf:/app/conf
+    - ./uploads:/app/uploads
+    - ./database:/app/database
+    # - ./runtime:/app/runtime
+    ports:
+    - 3002:3002
+    restart: always

package.json

@@ -1,11 +1,11 @@
 {
-  "name": "chatgpt-web",
+  "name": "sun-panel",
   "version": "2.10.9",
   "private": false,
   "description": "ChatGPT Web",
   "author": "ChenZhaoYu <chenzhaoyu1994@gmail.com>",
   "keywords": [
-    "chatgpt-web",
+    "Sun-Panel",
     "chatgpt",
     "chatbot",
     "vue"
@@ -32,6 +32,7 @@
     "naive-ui": "^2.34.3",
     "pinia": "^2.0.33",
     "vue": "^3.2.47",
+    "vue-draggable-plus": "^0.2.6",
     "vue-i18n": "^9.2.2",
     "vue-router": "^4.1.6",
     "vuedraggable": "^4.1.0"