Browse Source

change port

master
godo 6 months ago
parent
commit
dff8f99a89
  1. 1
      README.md
  2. 8943
      frontend/package-lock.json
  3. 11
      frontend/package.json
  4. 251
      frontend/src/components/setting/SetSystem.vue
  5. 4
      frontend/src/components/window/IframeFile.vue
  6. 4
      frontend/src/system/applist.ts
  7. 6
      frontend/src/system/config.ts
  8. 7
      frontend/src/util/goutil.ts
  9. 16
      godo/cmd/main.go
  10. 22
      godo/libs/dir.go

1
README.md

@ -27,6 +27,7 @@
- markdown新增ai优化/续写/纠错/翻译/总结,生成大纲,根据大纲一键创建文章
- 更改文档存储方式,支持选择文件夹
- 内网聊天新增ai对话,可保存对话历史,可更换模型和prompt
- 新增可定义端口和访问路径,支持web端系统重启
## 🏭 第三阶段目标(十二月底发布)
1. **文档处理与Markdown智能升级**

8943
frontend/package-lock.json

File diff suppressed because it is too large

11
frontend/package.json

@ -1,11 +1,11 @@
{
"name": "godoos",
"private": true,
"version": "1.0.2",
"version": "1.0.3",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vue-tsc --noEmit && vite build",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
@ -19,20 +19,16 @@
"jszip": "^3.10.1",
"lunar-typescript": "^1.7.6",
"moment": "^2.30.1",
"nanoid": "^5.0.9",
"pinia": "^2.1.7",
"pinia-plugin-persist": "^1.0.0",
"vite-plugin-svg-icons": "^2.0.1",
"vue": "^3.4.31",
"vue-i18n": "^9.13.1",
"vue-router": "^4.4.0",
"vue-svg-icon": "^1.2.9",
"vue-web-screen-shot": "^1.5.3",
"vue3-lottie": "^3.3.1"
},
"devDependencies": {
"@types/file-saver": "^2.0.7",
"@types/nanoid": "^3.0.0",
"@types/node": "^20.14.10",
"@vitejs/plugin-vue": "^5.0.5",
"sass": "^1.77.8",
@ -40,7 +36,6 @@
"typescript": "^5.5.3",
"unplugin-auto-import": "^0.18.0",
"unplugin-vue-components": "^0.27.2",
"vite": "^5.3.3",
"vue-tsc": "^2.0.26"
"vite": "^5.3.3"
}
}

251
frontend/src/components/setting/SetSystem.vue

@ -2,59 +2,47 @@
<div class="container">
<div class="nav">
<ul>
<li
v-for="(item, index) in items"
:key="index"
@click="selectItem(index)"
:class="{ active: index === activeIndex }"
>
<li v-for="(item, index) in items" :key="index" @click="selectItem(index)"
:class="{ active: index === activeIndex }">
{{ item }}
</li>
</ul>
</div>
<div class="setting">
<div v-if="1 === activeIndex">
<div
class="setting-item"
style="margin-top: 60px"
>
<div class="setting-item" style="margin-top: 60px">
<label>存储方式</label>
<el-select v-model="config.storeType">
<el-option
v-for="(item, key) in storeList"
:key="key"
:label="item.title"
:value="item.value"
/>
<el-option v-for="(item, key) in storeList" :key="key" :label="item.title"
:value="item.value" />
</el-select>
</div>
<div
class="setting-item"
v-if="config.storeType === 'local'"
>
<template v-if="config.storeType === 'local'">
<div class="setting-item">
<label>存储地址</label>
<el-input
v-model="config.storePath"
@click="selectFile()"
placeholder="可为空,为空则取系统默认存储地址"
/>
<el-input v-model="config.storePath" @click="selectFile()"
placeholder="可为空,为空则取系统默认存储地址:/用户目录/.godoos/os" />
</div>
<div class="setting-item">
<label>自定义端口</label>
<el-input v-model="config.netPort" placeholder="可为空,为空则取系统默认56780" />
</div>
<div class="setting-item">
<label>自定义路径</label>
<el-input v-model="config.netPath" placeholder="自定义web访问路径,英文,不要加斜杠,可为空" />
</div>
</template>
<template v-if="config.storeType === 'net'">
<div class="setting-item">
<label>服务器地址</label>
<el-input
v-model="config.storenet.url"
placeholder="http://192.168.1.16:56780 不要加斜杠"
/>
<el-input v-model="config.storenet.url" placeholder="可访问的地址,例如http://192.168.1.6:56780 不要加斜杠" />
</div>
</template>
<template v-if="config.storeType === 'webdav'">
<div class="setting-item">
<label>服务器地址</label>
<el-input
v-model="config.webdavClient.url"
placeholder="https://godoos.com/webdav 不要加斜杠"
/>
<el-input v-model="config.webdavClient.url" placeholder="https://godoos.com/webdav 不要加斜杠" />
</div>
<div class="setting-item">
<label>登陆用户名</label>
@ -62,19 +50,13 @@
</div>
<div class="setting-item">
<label>登陆密码</label>
<el-input
v-model="config.webdavClient.password"
type="password"
/>
<el-input v-model="config.webdavClient.password" type="password" />
</div>
</template>
<div class="setting-item">
<label></label>
<el-button
@click="submitOsInfo"
type="primary"
>
<el-button @click="submitOsInfo" type="primary">
{{ t("confirm") }}
</el-button>
</div>
@ -86,10 +68,7 @@
</div>
<div class="setting-item">
<label></label>
<el-button
@click="exportBackup"
type="primary"
>
<el-button @click="exportBackup" type="primary">
导出
</el-button>
</div>
@ -98,73 +77,42 @@
</div>
<div class="setting-item">
<label></label>
<el-button
@click="selectZipfile"
type="primary"
>
<el-button @click="selectZipfile" type="primary">
导入
</el-button>
<input
type="file"
accept=".zip"
style="display: none"
ref="zipFileInput"
/>
<input type="file" accept=".zip" style="display: none" ref="zipFileInput" />
</div>
</div>
<div v-if="0 === activeIndex">
<div
class="setting-item"
style="margin-top: 60px"
>
<div class="setting-item" style="margin-top: 60px">
<label>用户角色</label>
<el-select v-model="config.userType">
<el-option
v-for="(item, key) in userTypes"
:key="key"
:label="item.title"
:value="item.value"
/>
<el-option v-for="(item, key) in userTypes" :key="key" :label="item.title"
:value="item.value" />
</el-select>
</div>
<template v-if="config.userType === 'member'">
<div class="setting-item">
<label>服务器地址</label>
<el-input
v-model="config.userInfo.url"
placeholder="网址或域名,例子:https://godoos.com 不要加斜杠"
/>
<el-input v-model="config.userInfo.url" placeholder="网址或域名,例子:https://godoos.com 不要加斜杠" />
</div>
<div class="setting-item">
<label>用户名</label>
<el-input
v-model="config.userInfo.username"
placeholder="登录用户名"
/>
<el-input v-model="config.userInfo.username" placeholder="登录用户名" />
</div>
<div class="setting-item">
<label>密码</label>
<el-input
v-model="config.userInfo.password"
type="password"
placeholder="登录密码"
/>
<el-input v-model="config.userInfo.password" type="password" placeholder="登录密码" />
</div>
</template>
<div class="setting-item">
<label></label>
<el-button
@click="saveUserInfo"
type="primary"
>
<el-button @click="saveUserInfo" type="primary">
{{ t("confirm") }}
</el-button>
</div>
</div>
<div
v-if="3 === activeIndex"
class="setting-area"
>
<div v-if="3 === activeIndex" class="setting-area">
<SetFilePwd v-if="config.userType === 'person'"></SetFilePwd>
</div>
</div>
@ -172,23 +120,23 @@
</template>
<script lang="ts" setup>
import { Dialog, join, System, t } from "@/system";
import {
import { Dialog, join, System, t } from "@/system";
import {
getClientId,
getSystemConfig,
setSystemConfig,
} from "@/system/config";
import { OpenDirDialog, RestartApp } from "@/util/goutil";
import { notifyError, notifySuccess } from "@/util/msg";
import FileSaver from "file-saver";
import JSZip from "jszip";
import { inject, ref } from "vue";
const config = ref(getSystemConfig());
const sys = inject<System>("system")!;
let zipFile: File | undefined = undefined;
const zipFileInput = ref();
const fileName: any = ref("");
const storeList = [
} from "@/system/config";
import { OpenDirDialog, RestartApp } from "@/util/goutil";
import { notifyError, notifySuccess } from "@/util/msg";
import FileSaver from "file-saver";
import JSZip from "jszip";
import { inject, ref } from "vue";
const config = ref(getSystemConfig());
const sys = inject<System>("system")!;
let zipFile: File | undefined = undefined;
const zipFileInput = ref();
const fileName: any = ref("");
const storeList = [
// {
// title: "",
// value: "browser",
@ -205,11 +153,11 @@
title: "webdav",
value: "webdav",
},
];
];
const items = ["用户角色", "个人存储", "备份还原", "文件密码箱"];
const urlRegex = /^(https?:\/\/)/;
const userTypes = [
const items = ["用户角色", "存储配置", "备份还原", "文件密码箱"];
const urlRegex = /^(https?:\/\/)/;
const userTypes = [
{
title: "独立用户",
value: "person",
@ -218,41 +166,26 @@
title: "企业用户",
value: "member",
},
];
const activeIndex = ref(0);
];
const activeIndex = ref(0);
const selectItem = (index: number) => {
const selectItem = (index: number) => {
activeIndex.value = index;
};
function selectFile() {
};
function selectFile() {
OpenDirDialog().then((res: string) => {
config.value.storePath = res;
});
}
}
function submitOsInfo() {
function submitOsInfo() {
const saveData = toRaw(config.value);
const postData: any = {
//name: "osPath",
type: saveData.storeType,
};
if (saveData.storeType === "browser") {
setSystemConfig(saveData);
RestartApp();
return;
}
if (saveData.storeType === "local") {
if (saveData.storePath === "") {
setSystemConfig(saveData);
RestartApp();
return;
}
postData.name = "osPath";
postData.value = saveData.storePath;
const postData = parseData(saveData);
const postUrl = config.value.apiUrl + "/system/setting";
fetch(postUrl, {
method: "POST",
body: JSON.stringify([postData]),
body: JSON.stringify(postData),
})
.then((res) => res.json())
.then((res) => {
@ -305,12 +238,13 @@
});
return;
}
postData.name = "webdavClient";
postData.value = saveData.webdavClient;
const postUrl = config.value.apiUrl + "/system/setting";
fetch(postUrl, {
method: "POST",
body: JSON.stringify([postData]),
body: JSON.stringify([{
name: "webdavClient",
value: saveData.webdavClient,
}]),
})
.then((res) => res.json())
.then((res) => {
@ -325,8 +259,28 @@
}
});
}
}
function parseData(saveData: any) {
let postData = []
if (saveData.storePath !== "") {
postData.push({ name: "osPath", value: saveData.storePath })
}
if (saveData.netPort != "" && saveData.netPort != "56780" && !isNaN(saveData.netPort) && saveData.netPort*1 > 0 && saveData.netPort*1 < 65535) {
postData.push({
name: "netPort",
value: saveData.netPort,
});
}
if (saveData.netPath != "" && /^[A-Za-z]+$/.test(saveData.netPath)) {
postData.push({
name: "netPath",
value: saveData.netPath,
});
}
async function saveUserInfo() {
return postData;
}
async function saveUserInfo() {
const saveData = toRaw(config.value);
if (saveData.userType == "person") {
setSystemConfig(saveData);
@ -378,8 +332,8 @@
notifyError("登录失败");
}
return;
}
async function exportBackup() {
}
async function exportBackup() {
const { setProgress } = Dialog.showProcessDialog({
message: `正在打包`,
});
@ -401,8 +355,8 @@
setProgress(100);
});
}
}
async function dfsPackage(path: string, zip: JSZip, setProgress: any) {
}
async function dfsPackage(path: string, zip: JSZip, setProgress: any) {
const dir = await sys.fs.readdir(path);
for (let i = 0; i < dir.length; i++) {
@ -423,8 +377,8 @@
}
}
}
}
function selectZipfile() {
}
function selectZipfile() {
zipFileInput.value.click();
zipFileInput.value.onchange = (e: any) => {
const tar: any = e.target as HTMLInputElement;
@ -437,8 +391,8 @@
fileName.value = "";
}
};
}
async function importBackup(path = "") {
}
async function importBackup(path = "") {
if (!zipFile) {
return;
}
@ -480,21 +434,22 @@
});
}, 100);
}
}
}
</script>
<style scoped>
@import "./setStyle.css";
@import "./setStyle.css";
.ctrl {
.ctrl {
width: 100px;
}
}
.setting-item {
.setting-item {
display: flex;
align-items: center;
}
.setting-area {
}
.setting-area {
width: 100%;
height: 90%;
}
}
</style>

4
frontend/src/components/window/IframeFile.vue

@ -6,11 +6,11 @@
import { BrowserWindow, Dialog, Notify, System } from "@/system";
import { getSplit, getSystemConfig, setSystemKey } from "@/system/config";
import { base64ToBuffer, isBase64 } from "@/util/file";
import { generateRandomString } from "@/util/common";
import { isShareFile } from "@/util/sharePath.ts";
import { inject, onMounted, onUnmounted, ref, toRaw } from "vue";
import { askAi } from "@/hook/useAi";
import { useChooseStore } from "@/stores/choose";
import { nanoid } from "nanoid";
import eventBus from "@/system/event/eventBus";
const SP = getSplit();
@ -34,7 +34,7 @@ const storeRef = ref<HTMLIFrameElement | null>(null);
let hasInit = false;
const choose = useChooseStore();
const componentID = nanoid();
const componentID = generateRandomString(16);
// console.log("ID", componentID);
const saveFile = async (e: any) => {
if (e.componentID !== componentID) return;

4
frontend/src/system/applist.ts

@ -81,8 +81,8 @@ export const appList = [
name: "document",
appIcon: "word",
url: "/docx/index.html",
//url:"http://localhost:3000/",
width: 800,
//url:"http://localhost:9000/",
width: 1000,
frame: true,
height: 600,
center: true,

6
frontend/src/system/config.ts

@ -82,6 +82,12 @@ export const getSystemConfig = (ifset = false) => {
if (!config.storePath) {
config.storePath = "";
}
if(!config.netPath) {
config.netPath = "";
}
if(!config.netPort) {
config.netPort = "56780";
}
if (!config.userType) {
config.userType = 'person';
}

7
frontend/src/util/goutil.ts

@ -1,3 +1,4 @@
import { getSystemKey } from "@/system/config";
export async function OpenDirDialog() {
if ((window as any).go) {
return (window as any)['go']['app']['App']['OpenDirDialog']();
@ -18,7 +19,13 @@ export async function checkUrl(url: string) {
}
export function RestartApp() {
if (!(window as any).go) {
const apiUrl = getSystemKey("apiUrl");
fetch(apiUrl + "/system/restart").then(() => {
setTimeout(() => {
window.location.reload();
}, 1000);
})
//window.location.reload();
} else {
return (window as any)['go']['app']['App']['RestartApp']();
}

16
godo/cmd/main.go

@ -36,7 +36,7 @@ import (
"github.com/gorilla/mux"
)
const serverAddress = ":56780"
//const serverAddress = ":56780"
var srv *http.Server
@ -83,6 +83,11 @@ func OsStart() {
router.HandleFunc("/system/message", sys.HandleSystemEvents).Methods(http.MethodGet)
router.HandleFunc("/system/update", sys.UpdateAppHandler).Methods(http.MethodGet)
router.HandleFunc("/system/setting", sys.ConfigHandler).Methods(http.MethodPost)
router.HandleFunc("/system/restart", func(w http.ResponseWriter, r *http.Request) {
go OsRestart() // 使用 goroutine 来避免阻塞当前请求
w.WriteHeader(http.StatusOK)
w.Write([]byte("Restart initiated"))
}).Methods(http.MethodGet)
fileRouter := router.PathPrefix("/file").Subrouter()
fileRouter.HandleFunc("/desktop", files.HandleDesktop).Methods(http.MethodGet)
@ -156,9 +161,12 @@ func OsStart() {
distFS, _ := fs.Sub(deps.Frontendassets, "dist")
fileServer := http.FileServer(http.FS(distFS))
//netPath := libs.GetNetPath()
router.PathPrefix("/").Handler(fileServer)
go store.CheckActive(context.Background())
serverAddress := libs.GetSytemPort()
log.Printf("Listening on port: %v", serverAddress)
srv = &http.Server{Addr: serverAddress, Handler: router}
Serve(srv)
@ -175,3 +183,9 @@ func OsStop() {
}
log.Println("Server stopped.")
}
func OsRestart() {
// 停止当前服务
OsStop()
// 重新启动服务
OsStart()
}

22
godo/libs/dir.go

@ -173,6 +173,28 @@ func GetVectorPath(name string) string {
dbDir := GetDbDir()
return filepath.Join(dbDir, "vector", hashHex+".db")
}
func GetSytemPort() string {
netPort, ok := GetConfig("netPort")
if !ok {
return ":56780"
}
portStr, ok := netPort.(string)
if !ok || portStr == "" {
return ":56780"
}
return ":" + portStr
}
func GetNetPath() string {
netPath, ok := GetConfig("netPath")
if !ok {
return "/"
}
pathStr, ok := netPath.(string)
if !ok || pathStr == "" {
return "/"
}
return "/" + pathStr
}
func GetCacheDir() string {
homeDir := GetDataDir()
cachePath := filepath.Join(homeDir, "cache")

Loading…
Cancel
Save