Skip to content

Commit

Permalink
Merge pull request #2078 from sspanel-uim/dev
Browse files Browse the repository at this point in the history
Dev 20230712
  • Loading branch information
M1Screw committed Jul 12, 2023
2 parents 8e985d1 + 34440f3 commit 6bddfb8
Show file tree
Hide file tree
Showing 11 changed files with 317 additions and 206 deletions.
36 changes: 18 additions & 18 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public function up(): int
ALTER TABLE user MODIFY COLUMN `email` varchar(255) NOT NULL COMMENT 'Email';
ALTER TABLE user MODIFY COLUMN `pass` varchar(255) NOT NULL COMMENT '登录密码';
ALTER TABLE user MODIFY COLUMN `passwd` varchar(255) NOT NULL COMMENT '节点密码';
ALTER TABLE user MODIFY COLUMN `t` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT '最后使用时间';
ALTER TABLE user MODIFY COLUMN `u` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT '账户当前上传流量';
ALTER TABLE user MODIFY COLUMN `d` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT '账户当前下载流量';
ALTER TABLE user MODIFY COLUMN `transfer_today` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT '账户今日所用流量';
Expand Down
12 changes: 0 additions & 12 deletions db/migrations/2023061800-update_new_shop_data_type.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ public function up(): int
ALTER TABLE email_queue MODIFY COLUMN `template` varchar(255) NOT NULL DEFAULT '' COMMENT '邮件模板';
ALTER TABLE email_queue MODIFY COLUMN `array` longtext NOT NULL DEFAULT '{}' COMMENT '模板参数' CHECK (json_valid(`array`));
ALTER TABLE email_queue MODIFY COLUMN `time` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '添加时间';
ALTER TABLE email_verify MODIFY COLUMN `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '记录ID';
ALTER TABLE email_verify MODIFY COLUMN `email` varchar(255) NOT NULL DEFAULT '' COMMENT '邮箱';
ALTER TABLE email_verify MODIFY COLUMN `ip` varchar(255) NOT NULL DEFAULT '' COMMENT 'IP';
ALTER TABLE email_verify MODIFY COLUMN `code` varchar(255) NOT NULL DEFAULT '' COMMENT '验证码';
ALTER TABLE email_verify MODIFY COLUMN `expire_in` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '过期时间';
ALTER TABLE gift_card MODIFY COLUMN `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '礼品卡ID';
ALTER TABLE gift_card MODIFY COLUMN `card` text NOT NULL DEFAULT '' COMMENT '卡号';
ALTER TABLE gift_card MODIFY COLUMN `balance` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '余额';
Expand Down Expand Up @@ -177,13 +172,6 @@ public function up(): int
ALTER TABLE user_invite_code MODIFY COLUMN `created_at` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() COMMENT '创建时间';
ALTER TABLE user_invite_code MODIFY COLUMN `updated_at` timestamp NOT NULL DEFAULT '1989-06-04 00:05:00' COMMENT '更新时间';
ALTER TABLE user_money_log MODIFY COLUMN `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '记录ID';
ALTER TABLE user_password_reset MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '记录ID';
ALTER TABLE user_password_reset MODIFY COLUMN `email` varchar(255) NOT NULL DEFAULT '' COMMENT '用户邮箱';
ALTER TABLE user_password_reset MODIFY COLUMN `token` varchar(255) NOT NULL DEFAULT '' COMMENT '重置密码的 token';
ALTER TABLE user_password_reset MODIFY COLUMN `init_time` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '创建时间';
ALTER TABLE user_password_reset MODIFY COLUMN `expire_time` int(11) unsigned NOT NULL DEFAULT 0 COMMENT '过期时间';
ALTER TABLE user_password_reset ADD KEY IF NOT EXISTS `email` (`email`);
ALTER TABLE user_password_reset ADD KEY IF NOT EXISTS `token` (`token`);
ALTER TABLE user_subscribe_log MODIFY COLUMN `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '记录ID';
ALTER TABLE user_subscribe_log MODIFY COLUMN `user_name` varchar(255) NOT NULL DEFAULT '' COMMENT '用户名';
ALTER TABLE user_subscribe_log MODIFY COLUMN `user_id` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT '用户ID';
Expand Down
166 changes: 85 additions & 81 deletions public/assets/js/fuck.js
Original file line number Diff line number Diff line change
@@ -1,100 +1,104 @@
(function (window, navigator) {
var userAgent = navigator.userAgent;
var is360 = false;
const userAgent = navigator.userAgent;
let is360 = false;

var hasMime = function (option, value) {
var mimeTypes = navigator.mimeTypes;
for (var mt in mimeTypes) {
if (mimeTypes[mt][option] == value) {
return true;
}
const hasMime = function (option, value) {
const mimeTypes = navigator.mimeTypes;
for (const mt in mimeTypes) {
if (mimeTypes[mt][option] == value) {
return true;
}
}
return false;
};

const matchUserAgent = function (string) {
return userAgent.indexOf(string) > -1;
};

if (
matchUserAgent('QihooBrowser') ||
matchUserAgent('QHBrowser') ||
matchUserAgent('Qihoo') ||
matchUserAgent('QIHU') ||
matchUserAgent('360browser') ||
matchUserAgent('360EE') ||
matchUserAgent('360SE')
) {
is360 = true;
}
return false;
};

var matchUserAgent = function (string) {
return userAgent.indexOf(string) > -1;
};
if (
hasMime('type', 'application/gameplugin') ||
hasMime('type', 'application/360softmgrplugin') ||
hasMime('type', 'application/mozilla-npqihooquicklogin')
) {
is360 = true;
}

if (
matchUserAgent('QihooBrowser') ||
matchUserAgent('QHBrowser') ||
matchUserAgent('Qihoo') ||
matchUserAgent('QIHU') ||
matchUserAgent('360browser') ||
matchUserAgent('360EE') ||
matchUserAgent('360SE')
) {
is360 = true;
}
if (window.chrome) {
const chrome_version = userAgent.replace(/^.*Chrome\/([\d]+).*$/, '$1');

if (
hasMime('type', 'application/gameplugin') ||
hasMime('type', 'application/360softmgrplugin') ||
hasMime('type', 'application/mozilla-npqihooquicklogin')
) {
is360 = true;
}
if (chrome_version > 36 && window.showModalDialog) {
is360 = true;
}

if (window.chrome) {
var chrome_version = userAgent.replace(/^.*Chrome\/([\d]+).*$/, '$1');
if (chrome_version > 45) {
if (hasMime('type', 'application/vnd.chromium.remoting-viewer')) {
is360 = true;
}
}

if (chrome_version > 36 && window.showModalDialog) {
is360 = true;
}

if (chrome_version > 45) {
if (hasMime('type', 'application/vnd.chromium.remoting-viewer')) {
is360 = true;
}
if (!is360 && chrome_version > 69) {
if (
hasMime('type', 'application/hwepass2001.installepass2001') ||
hasMime('type', 'application/asx')
) {
is360 = true;
}
}
}


if (!is360 && chrome_version > 69) {
if (
hasMime('type', 'application/hwepass2001.installepass2001') ||
hasMime('type', 'application/asx')
) {
if (
navigator &&
typeof navigator['connection'] !== 'undefined' &&
typeof navigator['connection']['saveData'] == 'undefined'
) {
is360 = true;
}
}
}

if (
navigator &&
typeof navigator['connection'] !== 'undefined' &&
typeof navigator['connection']['saveData'] == 'undefined'
) {
is360 = true;
}
for (const key in navigator.plugins) {
if (navigator.plugins[key].filename == 'internal-nacl-plugin') {
is360 = true;
}
}

if (
matchUserAgent('MSIE') ||
matchUserAgent('Trident') ||
matchUserAgent('Edge') ||
matchUserAgent('Edg/')
) {
var navigator_top = window.screenTop - window.screenY;
switch (navigator_top) {
case 71: // 无收藏栏 贴边
case 99: // 有收藏栏 贴边
case 102: // 有收藏栏 非贴边
is360 = true;
break;
case 75: // 无收藏栏 贴边
case 105: // 有收藏栏 贴边
case 104: // 有收藏栏 非贴边
is360 = true;
break;
if (
matchUserAgent('MSIE') ||
matchUserAgent('Trident') ||
matchUserAgent('Edge') ||
matchUserAgent('Edg/')
) {
const navigator_top = window.screenTop - window.screenY;
switch (navigator_top) {
case 71: // 无收藏栏 贴边
case 75: // 无收藏栏 贴边
case 99: // 有收藏栏 贴边
case 102: // 有收藏栏 非贴边
case 104: // 有收藏栏 非贴边
case 105: // 有收藏栏 贴边
is360 = true;
break;
}
}
}

var redirectUrl = "https://www.mozilla.org/en-US/firefox/new/";
const redirectUrl = "https://www.mozilla.org/en-US/firefox/new/";

if (is360) {
setTimeout(function() {
window.alert('检测到 360 浏览器访问\n请使用 Firefox 浏览器');
window.location.href = redirectUrl;
}, 0);
}
if (is360) {
setTimeout(function () {
window.alert('检测到 360 浏览器访问\n请使用 Firefox 浏览器');
window.location.href = redirectUrl;
}, 0);
}
})(window, navigator);
2 changes: 1 addition & 1 deletion public/assets/js/fuck.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6bddfb8

Please sign in to comment.