From 3bbc183a912e59d6345f0731f24a1863426310f8 Mon Sep 17 00:00:00 2001
From: phpzc <zhang5474jj@163.com>
Date: Mon, 25 Nov 2019 11:21:50 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E7=9A=84=20jobs=E8=A1=A8=E7=BB=93=E6=9E=84=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0sql=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/webbug.sql | 86 +++++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/resource/webbug.sql b/resource/webbug.sql
index 74d404d..812308d 100644
--- a/resource/webbug.sql
+++ b/resource/webbug.sql
@@ -1,30 +1,30 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : phpzc.net
+ Source Server         : localhost
  Source Server Type    : MySQL
- Source Server Version : 50719
- Source Host           : www.phpzc.net
- Source Database       : webbug
+ Source Server Version : 80013
+ Source Host           : localhost:3306
+ Source Schema         : webbug
 
  Target Server Type    : MySQL
- Target Server Version : 50719
- File Encoding         : utf-8
+ Target Server Version : 80013
+ File Encoding         : 65001
 
- Date: 01/14/2018 15:18:08 PM
+ Date: 25/11/2019 09:15:41
 */
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
---  Table structure for `wb_bug`
+-- Table structure for wb_bug
 -- ----------------------------
 DROP TABLE IF EXISTS `wb_bug`;
 CREATE TABLE `wb_bug` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `bug_title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `bug_content` text COLLATE utf8mb4_unicode_ci,
+  `bug_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `bug_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `create_time` datetime DEFAULT NULL,
   `create_user_id` int(11) DEFAULT NULL,
   `project_id` int(11) DEFAULT NULL,
@@ -35,10 +35,10 @@ CREATE TABLE `wb_bug` (
   `module_id` int(11) DEFAULT NULL COMMENT '模块id',
   `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='bug表';
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='bug表';
 
 -- ----------------------------
---  Table structure for `wb_bug_log`
+-- Table structure for wb_bug_log
 -- ----------------------------
 DROP TABLE IF EXISTS `wb_bug_log`;
 CREATE TABLE `wb_bug_log` (
@@ -46,7 +46,7 @@ CREATE TABLE `wb_bug_log` (
   `bug_id` bigint(20) DEFAULT NULL,
   `old_user_id` int(11) DEFAULT NULL COMMENT '原BUG所属用户',
   `new_user_id` int(11) DEFAULT NULL COMMENT '分配给的新的用户',
-  `content` text COLLATE utf8mb4_unicode_ci,
+  `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `create_time` datetime DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   `old_bug_status` tinyint(2) DEFAULT NULL COMMENT '原BUG处理状态',
@@ -55,47 +55,63 @@ CREATE TABLE `wb_bug_log` (
 ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='bug修改日志';
 
 -- ----------------------------
---  Table structure for `wb_login_log`
+-- Table structure for wb_jobs
+-- ----------------------------
+DROP TABLE IF EXISTS `wb_jobs`;
+CREATE TABLE `wb_jobs` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `queue` varchar(255) NOT NULL,
+  `payload` longtext NOT NULL,
+  `attempts` tinyint(3) unsigned NOT NULL,
+  `reserved` tinyint(3) unsigned NOT NULL,
+  `reserved_at` int(10) unsigned DEFAULT NULL,
+  `available_at` int(10) unsigned NOT NULL,
+  `created_at` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COMMENT='tp队列任务表';
+
+-- ----------------------------
+-- Table structure for wb_login_log
 -- ----------------------------
 DROP TABLE IF EXISTS `wb_login_log`;
 CREATE TABLE `wb_login_log` (
   `id` bigint(20) NOT NULL,
   `user_id` int(11) DEFAULT NULL,
   `login_date` datetime DEFAULT NULL,
-  `login_ip` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `login_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='登陆记录';
 
 -- ----------------------------
---  Table structure for `wb_project`
+-- Table structure for wb_project
 -- ----------------------------
 DROP TABLE IF EXISTS `wb_project`;
 CREATE TABLE `wb_project` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `project_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `project_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `user_id` int(11) DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
-  `create_ip` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `create_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='项目表';
+) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='项目表';
 
 -- ----------------------------
---  Table structure for `wb_project_module`
+-- Table structure for wb_project_module
 -- ----------------------------
 DROP TABLE IF EXISTS `wb_project_module`;
 CREATE TABLE `wb_project_module` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `project_id` int(11) DEFAULT NULL,
-  `module_name` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `module_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   `user_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 -- ----------------------------
---  Table structure for `wb_project_user`
+-- Table structure for wb_project_user
 -- ----------------------------
 DROP TABLE IF EXISTS `wb_project_user`;
 CREATE TABLE `wb_project_user` (
@@ -105,38 +121,38 @@ CREATE TABLE `wb_project_user` (
   `create_time` datetime DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 -- ----------------------------
---  Table structure for `wb_project_version`
+-- Table structure for wb_project_version
 -- ----------------------------
 DROP TABLE IF EXISTS `wb_project_version`;
 CREATE TABLE `wb_project_version` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `project_id` int(11) DEFAULT NULL,
-  `version_name` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `version_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   `user_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 -- ----------------------------
---  Table structure for `wb_user`
+-- Table structure for wb_user
 -- ----------------------------
 DROP TABLE IF EXISTS `wb_user`;
 CREATE TABLE `wb_user` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `username` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `password` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `github` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `username` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `github` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `create_time` datetime DEFAULT NULL,
-  `create_ip` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `email` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `create_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `email_status` tinyint(1) DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
-  `nickname` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '昵称',
+  `nickname` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '昵称',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='用户表';
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='用户表';
 
 SET FOREIGN_KEY_CHECKS = 1;

From 8a26a40b3359e99c8c6b7b3e6ff1ae7dd244b635 Mon Sep 17 00:00:00 2001
From: phpzc <zhang5474jj@163.com>
Date: Mon, 25 Nov 2019 11:30:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a0d7d09..c568e2f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <h1 align="center">Welcome to WebBug 👋</h1>
 <p>
-  <img src="https://img.shields.io/badge/version-1.6-blue.svg?cacheSeconds=2592000" />
+  <img src="https://img.shields.io/badge/version-1.7-blue.svg?cacheSeconds=2592000" />
 </p>
 
 > WebBug 项目管理系统
@@ -31,4 +31,4 @@
 Give a ⭐️ if this project helped you!
 
 ***
-_This README was generated with ❤️ by [readme-md-generator](https://github.com/kefranabg/readme-md-generator)_
\ No newline at end of file
+_This README was generated with ❤️ by [readme-md-generator](https://github.com/kefranabg/readme-md-generator)_

From 787298042fa7234742464c4939b60a21e1779da4 Mon Sep 17 00:00:00 2001
From: phpzc <zhang5474jj@163.com>
Date: Mon, 25 Nov 2019 11:31:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c568e2f..1b48858 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <h1 align="center">Welcome to WebBug 👋</h1>
 <p>
-  <img src="https://img.shields.io/badge/version-1.7-blue.svg?cacheSeconds=2592000" />
+  <img src="https://img.shields.io/badge/version-1.8-blue.svg?cacheSeconds=2592000" />
 </p>
 
 > WebBug 项目管理系统

From e6d04147d2c84925e28d9d903f336f83311bb864 Mon Sep 17 00:00:00 2001
From: phpzc <zhang5474jj@163.com>
Date: Mon, 30 Mar 2020 16:30:01 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/extend/bootstrap.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/index/view/extend/bootstrap.html b/application/index/view/extend/bootstrap.html
index 1e105aa..c425654 100644
--- a/application/index/view/extend/bootstrap.html
+++ b/application/index/view/extend/bootstrap.html
@@ -22,9 +22,9 @@
     <link href="http://github.com/__CSS__/demo.css" rel="stylesheet" />
     <!--     Fonts and icons     -->
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700%7CMaterial+Icons" />
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-</head>
+    <!--<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700%7CMaterial+Icons" />-->
+    <!--<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">-->
+<!--</head>-->
 
 <body class="off-canvas-sidebar">
 <nav class="navbar navbar-primary navbar-transparent navbar-absolute">

From 27421a87f7d8b38f8346a3fcba3ec27f941d54a3 Mon Sep 17 00:00:00 2001
From: phpzc <zhang5474jj@163.com>
Date: Tue, 31 Mar 2020 11:11:34 +0800
Subject: [PATCH 5/5] fixbug

---
 application/index/view/bug/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/index/view/bug/index.html b/application/index/view/bug/index.html
index 65ed1ca..a251c8c 100644
--- a/application/index/view/bug/index.html
+++ b/application/index/view/bug/index.html
@@ -43,10 +43,10 @@ <h4 class="card-title">{:lang('My Bug')}</h4>
                                 {volist name="bugs" id="bug"}
                                 <tr>
                                     <td>{$bug.id}</td>
-                                    <td>{$bug->project->project_name}</td>
+                                    <td>{$bug->project ? $bug->project->project_name:''}</td>
                                     <td>{$bug.bug_title}</td>
-                                    <td>{$bug->module->module_name}</td>
-                                    <td>{$bug->version->version_name}</td>
+                                    <td>{$bug->module ? $bug->module->module_name : ''}</td>
+                                    <td>{$bug->version ? $bug->version->version_name : ''}</td>
                                     <td>{$bug->getBugStatusWord()}</td>
                                     <td>{$bug->create_time}</td>
                                     <td class="text-right">