Compare commits

..

No commits in common. "d17674d06ea558fb672dac18d253da8bbdc38019" and "5d2d8c7123b7591e200474523d7b819e8cb211d6" have entirely different histories.

5 changed files with 8 additions and 11 deletions

View File

@ -18,8 +18,8 @@ jobs:
node-version: 20.x node-version: 20.x
- name: Build NapCat.Framework - name: Build NapCat.Framework
run: | run: |
npm i && cd napcat.webui && npm i && cd .. || exit 1 npm i && cd napcat.webui && npm i && cd ..
npm run build:framework && npm run depend || exit 1 npm run build:framework && npm run depend
rm package-lock.json rm package-lock.json
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -37,8 +37,8 @@ jobs:
node-version: 20.x node-version: 20.x
- name: Build NapCat.Shell - name: Build NapCat.Shell
run: | run: |
npm i && cd napcat.webui && npm i && cd .. || exit 1 npm i && cd napcat.webui && npm i && cd ..
npm run build:shell && npm run depend || exit 1 npm run build:shell && npm run depend
rm package-lock.json rm package-lock.json
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View File

@ -6,7 +6,7 @@
"scripts": { "scripts": {
"webui:lint": "eslint --fix src/**/*.{js,ts,vue}", "webui:lint": "eslint --fix src/**/*.{js,ts,vue}",
"webui:dev": "vite", "webui:dev": "vite",
"webui:build": "vite build", "webui:build": "vue-tsc -b && vite build",
"webui:preview": "vite preview" "webui:preview": "vite preview"
}, },
"dependencies": { "dependencies": {

View File

@ -4,8 +4,8 @@
"type": "module", "type": "module",
"version": "4.1.12", "version": "4.1.12",
"scripts": { "scripts": {
"build:framework": "npm run build:webui && vite build --mode framework || exit 1", "build:framework": "npm run build:webui && vite build --mode framework",
"build:shell": "npm run build:webui && vite build --mode shell || exit 1", "build:shell": "npm run build:webui && vite build --mode shell",
"build:webui": "cd napcat.webui && vite build", "build:webui": "cd napcat.webui && vite build",
"dev:framework": "vite build --mode framework", "dev:framework": "vite build --mode framework",
"dev:shell": "vite build --mode shell", "dev:shell": "vite build --mode shell",

View File

@ -78,12 +78,8 @@ export class PacketHighwayContext {
ip: int32ip2str(addr.ip), ip: int32ip2str(addr.ip),
port: addr.port port: addr.port
}); });
this.hwClient.changeServer(int32ip2str(addr.ip), addr.port);
} }
} }
if (this.sig.serverAddr.length === 0) {
this.logger.warn('[Highway PrepareUpload] server addr is empty!');
}
} }
async uploadImage(peer: Peer, img: PacketMsgPicElement): Promise<void> { async uploadImage(peer: Peer, img: PacketMsgPicElement): Promise<void> {

View File

@ -66,6 +66,7 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
try { try {
const publishUrl = 'https://ip.011102.xyz/'; const publishUrl = 'https://ip.011102.xyz/';
const data = await RequestUtil.HttpGetJson<{ IP: { IP: string } }>(publishUrl, 'GET', {}, {}, true, true); const data = await RequestUtil.HttpGetJson<{ IP: { IP: string } }>(publishUrl, 'GET', {}, {}, true, true);
log("IP data", data);
log(`[NapCat] [WebUi] WebUi Publish Panel Url: ${createUrl(data.IP.IP, '/webui', config.token)}`); log(`[NapCat] [WebUi] WebUi Publish Panel Url: ${createUrl(data.IP.IP, '/webui', config.token)}`);
} catch (err) { } catch (err) {
logger.logError(`[NapCat] [WebUi] Get Publish Panel Url Error: ${err}`); logger.logError(`[NapCat] [WebUi] Get Publish Panel Url Error: ${err}`);