diff --git a/nginx.conf b/nginx.conf index ca83eb8..6521f82 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,7 +1,7 @@ server { listen 80; - server_name example.com www.example.com; - root D:\Work\Code\my-bookmark; + server_name book.mybookmark.cn; + root /var/www/my-bookmark; set $node_port 8360; index index.js index.html index.htm; diff --git a/pm2.json b/pm2.json index 378894b..bb20eb0 100644 --- a/pm2.json +++ b/pm2.json @@ -2,7 +2,7 @@ "apps": [{ "name": "my-bookmark", "script": "production.js", - "cwd": "D:\Work\Code\my-bookmark", + "cwd": "/var/www/my-bookmark", "exec_mode": "fork", "max_memory_restart": "1G", "autorestart": true, diff --git a/schema.sql b/schema.sql index 836d997..e1807f2 100644 --- a/schema.sql +++ b/schema.sql @@ -5,16 +5,15 @@ CREATE TABLE `users` ( `username` varchar(255) NOT NULL, -- 用户名 `password` varchar(255) NOT NULL, -- 密码 `email` varchar(255) NOT NULL, -- 邮箱 - `created_at` datetime DEFAULT now(), -- 创建时间 - `lastLogin` datetime DEFAULT NULL, -- 最后一次登录时间 - `searchHistory` varchar(512) DEFAULT NULL, -- 历史搜索记录 + `createdAt` datetime DEFAULT now(), -- 创建时间 + `lastLogin` datetime DEFAULT now(), -- 最后一次登录时间 + `searchHistory` varchar(512) DEFAULT NULL, -- 历史搜索记录 `avatar` varchar(512) DEFAULT NULL, -- 头像地址 `quickUrl` varchar(2048) DEFAULT '{\"B\":\"https://www.baidu.com/\",\"G\":\"https://www.google.com.hk/\",\"V\":\"https://www.v2ex.com/\",\"L\":\"http://luchenqun.com/\",\"H\":\"https://github.com/\",\"Q\":\"http://www.iqiyi.com/\",\"J\":\"https://www.jd.com/\"}', -- 全局快捷地址 PRIMARY KEY (`id`), UNIQUE KEY `username` (`username`), UNIQUE KEY `email` (`email`) ); -INSERT INTO `mybookmarks`.`users` (`id`, `username`, `password`, `email`, `created_at`, `lastLogin`, `searchHistory`, `avatar`, `quickUrl`) VALUES ('1', 'lcq', 'e10adc3949ba59abbe56e057f20f883e', 'lcq@qq.com', '2020-03-25 21:19:16', NULL, NULL, NULL, '{\"B\":\"https://www.baidu.com/\",\"G\":\"https://www.google.com.hk/\",\"V\":\"https://www.v2ex.com/\",\"L\":\"http://luchenqun.com/\",\"H\":\"https://github.com/\",\"Q\":\"http://www.iqiyi.com/\",\"J\":\"https://www.jd.com/\"}'); -- 书签表 drop table if exists bookmarks; @@ -63,17 +62,14 @@ CREATE TABLE `advices` ( drop table if exists hot_bookmarks; CREATE TABLE `hot_bookmarks` ( `id` int(11) NOT NULL AUTO_INCREMENT, -- id(articleId) - `date` int(11) NOT NULL DEFAULT 0, -- 日期(自己添加) `title` varchar(255) DEFAULT NULL, -- 标题(title) - `description` varchar(4096) DEFAULT NULL, -- 描述(自己添加) `url` varchar(1024) DEFAULT NULL, -- 链接(url) - `favCount` smallint DEFAULT 1, -- 总共收藏人数(favCount) - `createdBy` varchar(64) DEFAULT NULL, -- 创建者(sourceName) + `clickCount` smallint DEFAULT 1, -- 总共点击次数(总共收藏人数) + `tagName` varchar(32) DEFAULT NULL, -- 标签(创建者) `createdAt` datetime DEFAULT now(), -- 创建时间(updatetime) `lastClick` datetime DEFAULT now(), -- 最后一次点击时间(createtime) - `snapUrl` varchar(1024) DEFAULT NULL, -- 截图链接(imageList[0]) - `faviconUrl` varchar(1024) DEFAULT NULL, -- icon链接(sourceLogo) - `status` tinyint(4) DEFAULT '0', -- 状态 + `snap` varchar(1024) DEFAULT NULL, -- 截图链接(imageList[0]) + `icon` varchar(1024) DEFAULT NULL -- icon链接(sourceLogo) PRIMARY KEY (`id`) ); diff --git a/update.sql b/update.sql new file mode 100644 index 0000000..90bfd1e --- /dev/null +++ b/update.sql @@ -0,0 +1,55 @@ +ALTER TABLE `users` +DROP COLUMN `show_style`, +MODIFY COLUMN `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `id`, +MODIFY COLUMN `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `username`, +MODIFY COLUMN `email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `password`, +CHANGE COLUMN `created_at` `createdAt` datetime NULL DEFAULT CURRENT_TIMESTAMP AFTER `email`, +CHANGE COLUMN `last_login` `lastLogin` datetime NULL DEFAULT CURRENT_TIMESTAMP AFTER `createdAt`, +CHANGE COLUMN `search_history` `searchHistory` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `lastLogin`, +CHANGE COLUMN `quick_url` `quickUrl` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '{\"B\":\"https://www.baidu.com/\",\"G\":\"https://www.google.com.hk/\",\"V\":\"https://www.v2ex.com/\",\"L\":\"http://luchenqun.com/\",\"H\":\"https://github.com/\",\"Q\":\"http://www.iqiyi.com/\",\"J\":\"https://www.jd.com/\"}' AFTER `searchHistory`, +ADD COLUMN `avatar` varchar(512) NULL DEFAULT NULL AFTER `searchHistory`; + +ALTER TABLE `advices` +DROP COLUMN `category`, +CHANGE COLUMN `user_id` `userId` int(11) NOT NULL AFTER `id`, +CHANGE COLUMN `created_at` `createdAt` datetime NULL DEFAULT CURRENT_TIMESTAMP AFTER `comment`; + +ALTER TABLE `bookmarks` +DROP COLUMN `snap_state`, +DROP COLUMN `favicon_state`, +CHANGE COLUMN `user_id` `userId` int(11) NOT NULL AFTER `id`, +MODIFY COLUMN `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `userId`, +MODIFY COLUMN `url` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `description`, +MODIFY COLUMN `public` tinyint(4) NULL DEFAULT 0 AFTER `url`, +CHANGE COLUMN `click_count` `clickCount` smallint(6) NULL DEFAULT 1 AFTER `public`, +CHANGE COLUMN `created_at` `createdAt` datetime NULL DEFAULT CURRENT_TIMESTAMP AFTER `clickCount`, +CHANGE COLUMN `last_click` `lastClick` datetime NULL DEFAULT CURRENT_TIMESTAMP AFTER `createdAt`, +ADD COLUMN `tagId` int(11) NOT NULL AFTER `userId`; +UPDATE bookmarks AS b INNER JOIN tags_bookmarks AS tb ON b.id = tb.bookmark_id SET b.tagId = tb.tag_id; + +ALTER TABLE `notes` +CHANGE COLUMN `user_id` `userId` int(11) NOT NULL AFTER `id`, +CHANGE COLUMN `tag_id` `tagId` int(11) NULL DEFAULT NULL AFTER `content`, +CHANGE COLUMN `created_at` `createdAt` datetime NULL DEFAULT CURRENT_TIMESTAMP AFTER `tagId`; + +ALTER TABLE `tags` +CHANGE COLUMN `user_id` `userId` int(11) NOT NULL AFTER `id`, +CHANGE COLUMN `last_use` `lastUse` datetime NULL DEFAULT CURRENT_TIMESTAMP AFTER `name`; + +ALTER TABLE `hot_bookmarks` +DROP COLUMN `date`, +DROP COLUMN `description`, +DROP COLUMN `status`, +CHANGE COLUMN `fav_count` `clickCount` smallint(6) NULL DEFAULT 1 AFTER `url`, +CHANGE COLUMN `created_by` `tagName` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `clickCount`, +CHANGE COLUMN `snap_url` `snap` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `last_click`, +CHANGE COLUMN `favicon_url` `icon` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `snap`, +ADD COLUMN `createAt` datetime NULL AFTER `tagName`, +ADD COLUMN `lastClick` datetime NULL AFTER `createAt`, +MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST; +UPDATE hot_bookmarks SET createAt = FROM_UNIXTIME(created_at/1000), lastClick = FROM_UNIXTIME(last_click/1000); +ALTER TABLE `hot_bookmarks` +DROP COLUMN `created_at`, +DROP COLUMN `last_click`; + +drop table if exists tags_bookmarks; \ No newline at end of file