Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
bia-pain-bache committed Nov 26, 2024
2 parents b5304c4 + 538d0ae commit 2cb307b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion _worker.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/cores-configs/normalConfigs.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ export async function getNormalConfigs(request, env) {
: '&security=none';

if (vlessConfigs) {
vlessConfs += `${atob('dmxlc3M')}://${userID}@${addr}:${port}?path=/${path}&encryption=none&host=${host}&type=ws${tlsFields}#${vlessRemark}\n`;
vlessConfs += `${atob('dmxlc3M6Ly8=')}${userID}@${addr}:${port}?path=/${path}&encryption=none&host=${host}&type=ws${tlsFields}#${vlessRemark}\n`;
}

if (trojanConfigs) {
trojanConfs += `${atob('dHJvamFu')}://${trojanPass}@${addr}:${port}?path=/tr${path}&host=${host}&type=ws${tlsFields}#${trojanRemark}\n`;
trojanConfs += `${atob('dHJvamFuOi8v')}${trojanPass}@${addr}:${port}?path=/tr${path}&host=${host}&type=ws${tlsFields}#${trojanRemark}\n`;
}

proxyIndex++;
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function initParams(request, env) {
trojanPassword = env.TROJAN_PASS || 'bpb-trojan';
defaultHttpPorts = ['80', '8080', '2052', '2082', '2086', '2095', '8880'];
defaultHttpsPorts = ['443', '8443', '2053', '2083', '2087', '2096'];
panelVersion = '2.7.5';
panelVersion = '2.7.6';
hostName = request.headers.get('Host');
const url = new URL(request.url);
const searchParams = new URLSearchParams(url.search);
Expand Down

0 comments on commit 2cb307b

Please sign in to comment.