Skip to content

Commit

Permalink
将域名mybookmark.cn切换成b.lucq.fun
Browse files Browse the repository at this point in the history
  • Loading branch information
B05BEE13.卢郴群 committed May 26, 2021
1 parent dd67d8e commit 3087800
Show file tree
Hide file tree
Showing 18 changed files with 70 additions and 37 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
@@ -1,9 +1,9 @@
# 在线书签管理工具
![image](https://mybookmark.cn/images/screenshot.gif)
![image](https://b.lucq.fun/images/screenshot.gif)

1 在线体验(demo)
-------------
[在线书签管理系统](http://mybookmark.cn/ "在线书签管理系统")，体验账号：test。密码：123456。
[在线书签管理系统](http://b.lucq.fun/ "在线书签管理系统")，体验账号：test。密码：123456。

2 为什么要做个网络书签
------------------
Expand Down Expand Up @@ -31,7 +31,7 @@
- [x] 新增备忘录功能，有时候随手要做点纪录，就方便了。任意界面按快捷键A增加备忘录。双击备忘录可查看详情！亦可分享备忘。
- [x] 在设置的全局链接，可设置快捷键，用来在任何页面，快速打开设置的链接。
- [x] 增加[Chrome插件](https://chrome.google.com/webstore/detail/%E4%B9%A6%E7%AD%BE%E5%BF%AB%E9%80%9F%E6%B7%BB%E5%8A%A0/lmmobgephofdffmaednjooplcpbgbjle)，可在任意界面快速添加书签至系统。如果你无法访问该插件，可以按照[Chrome如何安装插件（开发版本/自制）](https://jingyan.baidu.com/article/f3ad7d0f58d6b609c3345b80.html)方法安装插件，插件请到[bookmark-plugin](https://github.com/luchenqun/bookmark-plugin)下载。
- [x] 适配手机平板，手机端请访问[m.mybookmark.cn](http://m.mybookmark.cn/)。
- [x] 适配手机平板，手机端请访问[mb.lucq.fun](http://mb.lucq.fun/)。


4 主要用到的软件与模块说明
Expand Down
2 changes: 1 addition & 1 deletion nginx.conf
View file
@@ -1,6 +1,6 @@
server {
listen 80;
server_name mybookmark.cn;
server_name b.lucq.fun;
root /var/www/my-bookmark;
set $node_port 2000;

Expand Down
2 changes: 1 addition & 1 deletion view/404.html
View file
Expand Up @@ -56,7 +56,7 @@
<p>
对不起，您的风筝已掉线，请时光倒流回前一秒。<br />
<span id="totalSecond">5</span>秒后自动
<a href="https://mybookmark.cn" class="backhome"><span>返回首页</span></a>
<a href="https://b.lucq.fun" class="backhome"><span>返回首页</span></a>
</p>
</div>
</div>
Expand Down
27 changes: 21 additions & 6 deletions view/index.html
View file
Expand Up @@ -37,6 +37,14 @@
var text = e.text.length >= 180 ? e.text.substr(0, 180) + "..." : e.text;
toastr.error(text + "<br/>复制失败", "提示");
});

if (window.location.hostname.indexOf("mybookmark.cn") >= 0) {
toastr.warning("域名【mybookmark.cn】将于2021年11月份到期，届时将不再续费无法访问。后续将使用新域名【http://b.lucq.fun】为您提供服务。10秒后会自动跳转到新的域名。", "提示");
$(".js-domain").removeClass("hidden");
setTimeout(function () {
window.location = "http://b.lucq.fun/#/tags";
}, 10000);
}
};
let resizeContainer = () => {
let count = 1;
Expand All @@ -53,18 +61,25 @@
</head>

<body ng-app="bookmarkApp">
<div class="ui container" id="js-container" style="position: absolute;left: 86;">
<div class="ui container" id="js-container" style="position: absolute; left: 86">
<div class="ui error hidden message js-domain" style="margin-bottom: 3px">
<div class="header">域名更换提示！</div>
<ul class="list">
<li>域名【mybookmark.cn】将于2021年11月份到期，届时将不再续费无法访问。目前已使用新域名【<a href="http://b.lucq.fun/">http://b.lucq.fun</a>】为您提供服务。</li>
<li>10秒后会自动跳转到新的域名。<a href="http://b.lucq.fun/">立即跳转</a></li>
</ul>
</div>
<!-- directive：菜单 -->
<menus></menus>
<div class="ui container" style="width: 100%; height: 2px;"></div>
<div class="ui container" style="width: 100%; height: 2px"></div>
<div class="ui container">
<div ui-view></div>
</div>
<div class="ui container" style="width: 100%; height: 10px;"></div>
<div class="foot" style="margin-bottom: 10px;">
<div class="ui segment container" style="text-align: center;">我爱佳佳与这个世界&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://m.mybookmark.cn/">移动设备访问</a>&nbsp;&nbsp;|&nbsp;&nbsp;联系我(QQ群：1026967226)&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://beian.miit.gov.cn/" target="_blank">粤ICP备18032994号</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://github.com/luchenqun/my-bookmark" target="_blank">网站源码</a>&nbsp;&nbsp;|&nbsp;&nbsp;V2.0.0&nbsp;&nbsp;|&nbsp;&nbsp;<span>加载失败，请按 Ctrl + Shift + R 强制刷新！(●'◡'●)</span><br /></div>
<div class="ui container" style="width: 100%; height: 10px"></div>
<div class="foot" style="margin-bottom: 10px">
<div class="ui segment container" style="text-align: center">我爱佳佳与这个世界&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://mb.lucq.fun/">移动设备访问</a>&nbsp;&nbsp;|&nbsp;&nbsp;联系我(QQ群：1026967226)&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://beian.miit.gov.cn/" target="_blank">粤ICP备18032994号</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://github.com/luchenqun/my-bookmark" target="_blank">网站源码</a>&nbsp;&nbsp;|&nbsp;&nbsp;V2.0.0&nbsp;&nbsp;|&nbsp;&nbsp;<span>加载失败，请按 Ctrl + Shift + R 强制刷新！(●'◡'●)</span><br /></div>
<!-- 主要用来配合clipboard.min.js复制文本的 -->
<div id="clipboard" data-clipboard-text="i love this world and jiajia!" style="opacity: 0; cursor: default;">
<div id="clipboard" data-clipboard-text="i love this world and jiajia!" style="opacity: 0; cursor: default">
<span>Copy</span>
</div>
</div>
Expand Down
9 changes: 6 additions & 3 deletions view/scripts/controllers/advice-controller.js
View file
@@ -1,8 +1,11 @@
app.controller('adviceCtr', ['$scope', '$state', '$timeout', 'pubSubService', 'dataService', function ($scope, $state, $timeout, pubSubService, dataService) {
app.controller('adviceCtr', ['$scope', '$state', '$timeout', '$window', 'pubSubService', 'dataService', function ($scope, $state, $timeout, $window, pubSubService, dataService) {
console.log("Hello adviceCtr");
console.log($window.location.hostname);
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');

Expand Down
6 changes: 4 additions & 2 deletions view/scripts/controllers/bookmarks-controller.js
View file
@@ -1,8 +1,10 @@
app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'pubSubService', 'dataService', function ($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, pubSubService, dataService) {
console.log("Hello bookmarksCtr...", $stateParams);
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');
$state.go('tags');
Expand Down
6 changes: 4 additions & 2 deletions view/scripts/controllers/home-controller.js
View file
@@ -1,8 +1,10 @@
app.controller('homeCtr', ['$scope', '$stateParams', '$filter', '$state', '$window', 'pubSubService', 'dataService', function ($scope, $stateParams, $filter, $state, $window, pubSubService, dataService) {
console.log('Hello homeCtr......');
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');

Expand Down
6 changes: 4 additions & 2 deletions view/scripts/controllers/hot-controller.js
View file
@@ -1,8 +1,10 @@
app.controller('hotCtr', ['$scope', '$state', '$sce', '$filter', '$window', '$timeout', '$document', 'pubSubService', 'dataService', function ($scope, $state, $sce, $filter, $window, $timeout, $document, pubSubService, dataService) {
console.log("Hello hotCtr...");
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');
const pageSize = 40;
Expand Down
6 changes: 4 additions & 2 deletions view/scripts/controllers/login-controller.js
View file
@@ -1,8 +1,10 @@
app.controller('loginCtr', ['$scope', '$filter', '$state', '$http', '$cookieStore', '$window', 'pubSubService', 'dataService', function ($scope, $filter, $state, $http, $cookieStore, $window, pubSubService, dataService) {
console.log("Hello loginCtr...");
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');

Expand Down
2 changes: 1 addition & 1 deletion view/scripts/controllers/menus-controller.js
View file
Expand Up @@ -99,7 +99,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time
} else if (searchOption == 3) {
$window.open('https://stackoverflow.com/search?q=' + encodeURIComponent(keyword), '_blank');
} else if (searchOption == 4) {
$window.open('http://www.baidu.com/s?tn=mybookmark.cn&ch=3&ie=utf-8&wd=' + encodeURIComponent(keyword), '_blank');
$window.open('http://www.baidu.com/s?tn=b.lucq.fun&ch=3&ie=utf-8&wd=' + encodeURIComponent(keyword), '_blank');
} else if (searchOption == 5) {
console.log('search note, word = ', keyword);
$state.go('note', { keyword }, { reload: true })
Expand Down
6 changes: 4 additions & 2 deletions view/scripts/controllers/note-controller.js
View file
@@ -1,8 +1,10 @@
app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'pubSubService', 'dataService', function ($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, pubSubService, dataService) {
console.log("Hello noteCtr...", $stateParams);
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');

Expand Down
6 changes: 4 additions & 2 deletions view/scripts/controllers/search-controller.js
View file
@@ -1,8 +1,10 @@
app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'pubSubService', 'dataService', function ($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, pubSubService, dataService) {
console.log("Hello searchCtr...", $stateParams);
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');

Expand Down
6 changes: 4 additions & 2 deletions view/scripts/controllers/settings-controller.js
View file
@@ -1,8 +1,10 @@
app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$window', '$timeout', 'pubSubService', 'dataService', function ($scope, $stateParams, $filter, $state, $window, $timeout, pubSubService, dataService) {
console.log('Hello settingsCtr......', $stateParams);
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');

Expand Down
6 changes: 4 additions & 2 deletions view/scripts/controllers/tags-controller.js
View file
@@ -1,8 +1,10 @@
app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$stateParams', '$timeout', '$document', 'ngDialog', 'pubSubService', 'dataService', function ($scope, $filter, $state, $window, $stateParams, $timeout, $document, ngDialog, pubSubService, dataService) {
console.log("Hello tagsCtr...", $stateParams);
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
return;
if ($window.location.hostname.indexOf("b.lucq.fun") >= 0) {
$window.location = "http://mb.lucq.fun/#/tags";
return;
}
}
pubSubService.publish('Menus.active');

Expand Down

0 comments on commit 3087800

Please sign in to comment.