-
{{$t('server.relayCdkeyUserId')}}
-
{{$t('server.relayCdkeyOrderId')}}
-
{{$t('server.relayCdkeyContact')}}
-
{{$t('server.relayCdkeyRemark')}}
+
{{$t('server.cdkeyUserId')}}
+
{{$t('server.cdkeyOrderId')}}
+
{{$t('server.cdkeyContact')}}
+
{{$t('server.cdkeyRemark')}}
@@ -26,38 +26,38 @@
-
+
{{ scope.row.Bandwidth }}Mbps
-
+
{{ parseSpeed(scope.row.LastBytes) }}
{{ parseSpeed(scope.row.MaxBytes) }}
-
+
- {{$t('server.relayCdkeyPayPrice')}}.{{ scope.row.PayPrice }}/{{$t('server.relayCdkeyPrice')}}.{{ scope.row.Price }}
- {{$t('server.relayCdkeyUserPrice')}}.{{ scope.row.UserPrice }}/{{$t('server.relayCdkeyCostPrice')}}.{{ scope.row.CostPrice }}
+ {{$t('server.cdkeyPayPrice')}}.{{ scope.row.PayPrice }}/{{$t('server.cdkeyPrice')}}.{{ scope.row.Price }}
+ {{$t('server.cdkeyUserPrice')}}.{{ scope.row.UserPrice }}/{{$t('server.cdkeyCostPrice')}}.{{ scope.row.CostPrice }}
-
+
{{ scope.row.OrderId }}
{{ scope.row.Contact }}
-
-
+
+
-
+
-
+
-
+
-
+
@@ -79,7 +79,7 @@
-
+
@@ -88,12 +88,12 @@ import { injectGlobalData } from '@/provide';
import { onMounted, reactive, watch } from 'vue'
import { Delete,Plus,Search,Warning } from '@element-plus/icons-vue';
import { useI18n } from 'vue-i18n';
-import { relayCdkeyDel,relayCdkeyPage } from '@/apis/relay';
+import { cdkeyDel,cdkeyPage } from '@/apis/cdkey';
import Flags from './Flags.vue';
import Add from './Add.vue';
import Test from './Test.vue';
export default {
- props: ['modelValue'],
+ props: ['modelValue','type'],
emits: ['update:modelValue'],
components:{Delete,Plus,Search ,Flags,Add,Test,Warning},
setup(props,{emit}) {
@@ -109,6 +109,7 @@ export default {
OrderId:'',
Contact:'',
Remark:'',
+ Type:props.type,
Flag:0
},
list:{
@@ -142,7 +143,7 @@ export default {
handleSearch();
}
const handleSearch = ()=>{
- relayCdkeyPage(state.page).then((res)=>{
+ cdkeyPage(state.page).then((res)=>{
state.list = res;
}).catch(()=>{})
}
@@ -157,7 +158,7 @@ export default {
}
const handleDel = (row)=>{
- relayCdkeyDel(row.Id).then((res)=>{
+ cdkeyDel(row.Id).then((res)=>{
handleSearch();
}).catch(()=>{})
}
diff --git a/src/linker.web/src/views/full/server/relayCdkey/My.vue b/src/linker.web/src/views/full/server/cdkey/My.vue
similarity index 74%
rename from src/linker.web/src/views/full/server/relayCdkey/My.vue
rename to src/linker.web/src/views/full/server/cdkey/My.vue
index a3e142ea..b7feefd2 100644
--- a/src/linker.web/src/views/full/server/relayCdkey/My.vue
+++ b/src/linker.web/src/views/full/server/cdkey/My.vue
@@ -1,11 +1,11 @@
-
+
-
{{$t('server.relayCdkeyOrderId')}}
-
{{$t('server.relayCdkeyContact')}}
-
{{$t('server.relayCdkeyRemark')}}
+
{{$t('server.cdkeyOrderId')}}
+
{{$t('server.cdkeyContact')}}
+
{{$t('server.cdkeyRemark')}}
@@ -20,39 +20,39 @@
-
+
{{ scope.row.Bandwidth }}Mbps
-
+
{{ parseSpeed(scope.row.LastBytes) }}
{{ parseSpeed(scope.row.MaxBytes) }}
-
+
- {{$t('server.relayCdkeyPayPrice')}}.{{ scope.row.PayPrice }}/{{$t('server.relayCdkeyPrice')}}.{{ scope.row.Price }}
- {{$t('server.relayCdkeyUserPrice')}}.{{ scope.row.UserPrice }}/{{$t('server.relayCdkeyCostPrice')}}.{{ scope.row.CostPrice }}
+ {{$t('server.cdkeyPayPrice')}}.{{ scope.row.PayPrice }}/{{$t('server.cdkeyPrice')}}.{{ scope.row.Price }}
+ {{$t('server.cdkeyUserPrice')}}.{{ scope.row.UserPrice }}/{{$t('server.cdkeyCostPrice')}}.{{ scope.row.CostPrice }}
-
+
{{ scope.row.OrderId }}
{{ scope.row.Contact }}
-
+
-
+
-
+
-
+
-
+
-
+
@@ -82,11 +82,11 @@ import { injectGlobalData } from '@/provide';
import { onMounted, reactive, watch } from 'vue'
import { Delete,Plus,Search } from '@element-plus/icons-vue';
import { useI18n } from 'vue-i18n';
-import {relayCdkeyMy,relayCdkeyDel, relayCdkeyImport } from '@/apis/relay';
+import {cdkeyMy,cdkeyDel, cdkeyImport } from '@/apis/cdkey';
import Flags from './Flags.vue';
import { ElMessage, ElMessageBox } from 'element-plus';
export default {
- props: ['modelValue'],
+ props: ['modelValue','type'],
emits: ['update:modelValue'],
components:{Delete,Plus,Search,Flags },
setup(props,{emit}) {
@@ -101,6 +101,7 @@ export default {
OrderId:'',
Contact:'',
Remark:'',
+ Type:props.type,
Flag:0
},
list:{
@@ -132,7 +133,7 @@ export default {
handleSearch();
}
const handleSearch = ()=>{
- relayCdkeyMy(state.page).then((res)=>{
+ cdkeyMy(state.page).then((res)=>{
state.list = res;
}).catch(()=>{})
}
@@ -146,13 +147,13 @@ export default {
handleSearch();
}
const handleDel = (row)=>{
- relayCdkeyDel(row.Id).then((res)=>{
+ cdkeyDel(row.Id).then((res)=>{
handleSearch();
}).catch(()=>{})
}
const handleImport = ()=>{
- ElMessageBox.prompt(t('server.relayCdkeyImport'), t('common.tips'), {
+ ElMessageBox.prompt(t('server.cdkeyImport'), t('common.tips'), {
confirmButtonText: t('common.confirm'),
cancelButtonText: t('common.cancel')
}).then(({ value }) => {
@@ -161,9 +162,9 @@ export default {
return;
}
- relayCdkeyImport({Base64:value}).then((res)=>{
+ cdkeyImport({Base64:value}).then((res)=>{
if(res){
- ElMessage.error(t(`server.relayCdkeyImport${res}`));
+ ElMessage.error(t(`server.cdkeyImport${res}`));
handleImport();
}else{
ElMessage.success(t('common.oper'));
diff --git a/src/linker.web/src/views/full/server/relayCdkey/Test.vue b/src/linker.web/src/views/full/server/cdkey/Test.vue
similarity index 75%
rename from src/linker.web/src/views/full/server/relayCdkey/Test.vue
rename to src/linker.web/src/views/full/server/cdkey/Test.vue
index c235f7f8..df3911f8 100644
--- a/src/linker.web/src/views/full/server/relayCdkey/Test.vue
+++ b/src/linker.web/src/views/full/server/cdkey/Test.vue
@@ -1,143 +1,143 @@
-
+
-
+
- {{$t('server.relayCdkeyTestParseError')}}
+ {{$t('server.cdkeyTestParseError')}}
-
+
- {{$t('server.relayCdkeyTestGBError')}}
+ {{$t('server.cdkeyTestGBError')}}
success
-
+
- {{$t('server.relayCdkeyTestSpeedError')}}
+ {{$t('server.cdkeyTestSpeedError')}}
success
-
+
- {{$t('server.relayCdkeyTestTimeError')}}
+ {{$t('server.cdkeyTestTimeError')}}
success
-
+
- {{$t('server.relayCdkeyTestUserIdError')}}
+ {{$t('server.cdkeyTestUserIdError')}}
success
-
+
- {{$t('server.relayCdkeyTestOrderIdError')}}
+ {{$t('server.cdkeyTestOrderIdError')}}
success
-
+
- {{$t('server.relayCdkeyTestContactError')}}
+ {{$t('server.cdkeyTestContactError')}}
success
-
+
- {{$t('server.relayCdkeyTestCostPriceError')}}
+ {{$t('server.cdkeyTestCostPriceError')}}
success
-
+
- {{$t('server.relayCdkeyTestPriceError')}}
+ {{$t('server.cdkeyTestPriceError')}}
success
-
+
- {{$t('server.relayCdkeyTestUserPriceError')}}
+ {{$t('server.cdkeyTestUserPriceError')}}
success
-
+
- {{$t('server.relayCdkeyTestPayPriceError')}}
+ {{$t('server.cdkeyTestPayPriceError')}}
success
-
+
- {{$t('server.relayCdkeyTestCountError')}}
+ {{$t('server.cdkeyTestCountError')}}
success
-
+
- {{$t('server.relayCdkeyTestTypeError')}}
+ {{$t('server.cdkeyTestTypeError')}}
success
@@ -157,9 +157,9 @@
import { reactive, watch } from 'vue'
import { Search } from '@element-plus/icons-vue';
import { useI18n } from 'vue-i18n';
-import { relayCdkeyTest } from '@/apis/relay';
+import { cdkeyTest } from '@/apis/cdkey';
export default {
- props: ['modelValue'],
+ props: ['modelValue','type'],
emits: ['update:modelValue'],
components:{Search},
setup(props,{emit}) {
@@ -171,6 +171,7 @@ export default {
Order:{},
Cdkey:'',
Field:[],
+ Type:props.type
},
rules:{}
});
@@ -183,7 +184,7 @@ export default {
});
const handleChange = ()=>{
- relayCdkeyTest({Base64:state.Base64}).then(res=>{
+ cdkeyTest({Base64:state.Base64}).then(res=>{
if(res.Cdkey) state.ruleForm.Cdkey = res.Cdkey;
if(res.Field) state.ruleForm.Field = res.Field;
if(res.Order) state.ruleForm.Order = res.Order;
diff --git a/src/linker.web/src/views/full/server/relayCdkey/Index.vue b/src/linker.web/src/views/full/server/relayCdkey/Index.vue
deleted file mode 100644
index 9aa0e022..00000000
--- a/src/linker.web/src/views/full/server/relayCdkey/Index.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
- {{$t('server.relayMyCdkey')}}
- {{$t('server.relayCdkey')}}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/linker/Program.cs b/src/linker/Program.cs
index d3a7d8fb..8957ef86 100644
--- a/src/linker/Program.cs
+++ b/src/linker/Program.cs
@@ -65,7 +65,7 @@ namespace linker
using JsonDocument json = ParseArgs(args);
LinkerMessengerEntry.Setup(ExcludeModule.None, json);
- LoggerHelper.Instance.Warning($"current version : {VersionHelper.version}");
+ LoggerHelper.Instance.Warning($"current version : {VersionHelper.Version}");
LoggerHelper.Instance.Warning($"linker env is docker : {Environment.GetEnvironmentVariable("SNLTTY_LINKER_IS_DOCKER")}");
LoggerHelper.Instance.Warning($"linker env os : {System.Runtime.InteropServices.RuntimeInformation.OSDescription}");
LoggerHelper.Instance.Debug($"linker are running....");
diff --git a/src/linker/linker.csproj b/src/linker/linker.csproj
index 8716fcce..00968fac 100644
--- a/src/linker/linker.csproj
+++ b/src/linker/linker.csproj
@@ -21,17 +21,16 @@
snltty
snltty
1. 一些累计更新
-2. 重建权限存储，ulong改为BitArray，同组所有客户端需保持版本一致
-3. 增加唤醒功能，支持WOL，COM继电器，HID继电器
-4. 基于One-KVM包装docker镜像集成linker
+2. 修复socks5，解决CPU爆满问题，增加域名解析和HTTP代理
+3. 优化唤醒模块
5. 管理端口改为1804，一个端口托管Web+Websocket
snltty
https://github.com/snltty/linker
https://github.com/snltty/linker
linker
- 1.8.2
- 1.8.2
- 1.8.2
+ 1.8.3
+ 1.8.3
+ 1.8.3
False
diff --git a/version.txt b/version.txt
index 43247f32..ae3b21ac 100644
--- a/version.txt
+++ b/version.txt
@@ -1,7 +1,6 @@
-v1.8.2
-2025-06-09 16:34:38
+v1.8.3
+2025-06-10 17:28:53
1. 一些累计更新
-2. 重建权限存储，ulong改为BitArray，同组所有客户端需保持版本一致
-3. 增加唤醒功能，支持WOL，COM继电器，HID继电器
-4. 基于One-KVM包装docker镜像集成linker
+2. 修复socks5，解决CPU爆满问题，增加域名解析和HTTP代理
+3. 优化唤醒模块
5. 管理端口改为1804，一个端口托管Web+Websocket
\ No newline at end of file
diff --git a/ymls/nuget.yml b/ymls/nuget.yml
index bd47eb0b..b0242ef2 100644
--- a/ymls/nuget.yml
+++ b/ymls/nuget.yml
@@ -37,6 +37,7 @@ jobs:
dotnet build ./src/linker.messenger.pcp -c release
dotnet build ./src/linker.messenger.plan -c release
dotnet build ./src/linker.messenger.relay -c release
+ dotnet build ./src/linker.messenger.cdkey -c release
dotnet build ./src/linker.messenger.serializer.memorypack -c release
dotnet build ./src/linker.messenger.sforward -c release
dotnet build ./src/linker.messenger.signin -c release
@@ -70,6 +71,7 @@ jobs:
dotnet pack ./src/linker.messenger.pcp -c release
dotnet pack ./src/linker.messenger.plan -c release
dotnet pack ./src/linker.messenger.relay -c release
+ dotnet pack ./src/linker.messenger.cdkey -c release
dotnet pack ./src/linker.messenger.serializer.memorypack -c release
dotnet pack ./src/linker.messenger.sforward -c release
dotnet pack ./src/linker.messenger.signin -c release
@@ -103,6 +105,7 @@ jobs:
dotnet nuget push ./src/linker.messenger.pcp/bin/release/linker.messenger.pcp.{{version}}.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
dotnet nuget push ./src/linker.messenger.plan/bin/release/linker.messenger.plan.{{version}}.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
dotnet nuget push ./src/linker.messenger.relay/bin/release/linker.messenger.relay.{{version}}.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
+ dotnet nuget push ./src/linker.messenger.cdkey/bin/release/linker.messenger.cdkey.{{version}}.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
dotnet nuget push ./src/linker.messenger.serializer.memorypack/bin/release/linker.messenger.serializer.memorypack.{{version}}.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
dotnet nuget push ./src/linker.messenger.sforward/bin/release/linker.messenger.sforward.{{version}}.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
dotnet nuget push ./src/linker.messenger.signin/bin/release/linker.messenger.signin.{{version}}.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols