Skip to content

Commit e676f40

Browse files
author
danbai225
committed
bug修复
1 parent bb17470 commit e676f40

File tree

5 files changed

+159
-5
lines changed

5 files changed

+159
-5
lines changed

‎src/main/java/com/danbai/ys/async/AsyncDmAllSend.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void sendInfo(String message,String dmid) throws IOException {
4040
@Async
4141
public void sendInfoNothis(String message,String dmid,TvDmSocket t) throws IOException {
4242
for (TvDmSocket item : TvDmSocket.webSocketSet) {
43-
if(item.getDmid().equals(dmid)&item!=t){
43+
if(item.getDmid().equals(dmid)&&item!=t){
4444
try {
4545
item.sendMessage(message);
4646
} catch (IOException e) {

‎src/main/java/com/danbai/ys/service/impl/AdminServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class AdminServiceImpl implements AdminService {
2929
@Override
3030
public boolean isAdmin(HttpServletRequest request) {
3131
User user = (User) request.getSession().getAttribute(User.DEFAULT_USER);
32-
if (user != null & user.getUserType() == User.ADMIN) {
32+
if (user != null && user.getUserType() == User.ADMIN) {
3333
return true;
3434
}
3535
return false;

‎src/main/java/com/danbai/ys/service/impl/UserServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void reg(User user, Model model, String yzm) {
100100
return;
101101
}
102102
String str = registerValidateService.getVerificationCode(user.getEmail());
103-
if (str != null & str.equals(yzm)) {
103+
if (str != null && str.equals(yzm)) {
104104
registerValidateService.deleteVerificationCode(user.getEmail());
105105
User user2 = new User();
106106
user2.setUsername(user.getUsername());
@@ -137,7 +137,7 @@ public String regapp(User user, String yzm) {
137137
}
138138
if (user != null) {
139139
String str = registerValidateService.getVerificationCode(user.getEmail());
140-
if (str != null & str.equals(yzm)) {
140+
if (str != null && str.equals(yzm)) {
141141
registerValidateService.deleteVerificationCode(user.getEmail());
142142
User user2 = new User();
143143
user2.setUsername(user.getUsername());

‎src/main/java/com/danbai/ys/utils/EmailUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class EmailUtil {
2121
private static final String PROTOCOL = "smtp";
2222
private static final int PORT = 465;
2323
private static final String FROM = "[email protected]";
24-
private static final String PWD = "**";
24+
private static final String PWD = "hjj225";
2525

2626
private static JavaMailSenderImpl javaMailSender;
2727

‎ys.sql

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
-- phpMyAdmin SQL Dump
2+
-- version 4.4.15.10
3+
-- https://www.phpmyadmin.net
4+
--
5+
-- Host: localhost
6+
-- Generation Time: 2019-11-23 12:37:09
7+
-- 服务器版本： 5.6.46-log
8+
-- PHP Version: 5.6.40
9+
10+
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
11+
SET time_zone = "+00:00";
12+
13+
14+
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
15+
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
16+
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
17+
/*!40101 SET NAMES utf8mb4 */;
18+
19+
--
20+
-- Database: `ys`
21+
--
22+
23+
-- --------------------------------------------------------
24+
25+
--
26+
-- 表的结构 `config`
27+
--
28+
29+
CREATE TABLE IF NOT EXISTS `config` (
30+
`Item` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '设置项名字',
31+
`value` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '值'
32+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
33+
34+
-- --------------------------------------------------------
35+
36+
--
37+
-- 表的结构 `tvb`
38+
--
39+
40+
CREATE TABLE IF NOT EXISTS `tvb` (
41+
`id` int(16) NOT NULL COMMENT 'id',
42+
`name` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '频道名',
43+
`url` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '源路径',
44+
`tpurl` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT 'http://img.p00q.cn:222/2019/11/04/4bf3fa0e9ae80.png' COMMENT '图片',
45+
`dmid` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '弹幕id'
46+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='直播源表';
47+
48+
-- --------------------------------------------------------
49+
50+
--
51+
-- 表的结构 `user`
52+
--
53+
54+
CREATE TABLE IF NOT EXISTS `user` (
55+
`id` int(11) NOT NULL COMMENT '用户id',
56+
`username` varchar(32) COLLATE utf8_bin NOT NULL COMMENT '用户名',
57+
`user_type` int(11) NOT NULL DEFAULT '1' COMMENT '用户类型 0 禁用 1普通 2 管理员',
58+
`password` varchar(128) COLLATE utf8_bin NOT NULL COMMENT '用户密码',
59+
`email` varchar(128) COLLATE utf8_bin NOT NULL,
60+
`headurl` text COLLATE utf8_bin NOT NULL
61+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
62+
63+
-- --------------------------------------------------------
64+
65+
--
66+
-- 表的结构 `video_time`
67+
--
68+
69+
CREATE TABLE IF NOT EXISTS `video_time` (
70+
`username` varchar(32) COLLATE utf8_bin NOT NULL COMMENT '用户名',
71+
`ysid` int(11) NOT NULL,
72+
`ysjiname` varchar(128) COLLATE utf8_bin NOT NULL COMMENT '影视id',
73+
`time` float NOT NULL COMMENT '观看时间',
74+
`gktime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
75+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
76+
77+
-- --------------------------------------------------------
78+
79+
--
80+
-- 表的结构 `ysb`
81+
--
82+
83+
CREATE TABLE IF NOT EXISTS `ysb` (
84+
`id` int(11) NOT NULL DEFAULT '0',
85+
`pm` text NOT NULL,
86+
`tp` text,
87+
`zt` text,
88+
`pf` float DEFAULT '0',
89+
`bm` text,
90+
`dy` text,
91+
`zy` text,
92+
`lx` text,
93+
`dq` text,
94+
`yy` text,
95+
`sytime` text,
96+
`pctime` text,
97+
`gxtime` text,
98+
`js` text,
99+
`gkdz` text,
100+
`xzdz` text
101+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
102+
103+
--
104+
-- Indexes for dumped tables
105+
--
106+
107+
--
108+
-- Indexes for table `config`
109+
--
110+
ALTER TABLE `config`
111+
ADD UNIQUE KEY `Item_2` (`Item`),
112+
ADD KEY `Item` (`Item`);
113+
114+
--
115+
-- Indexes for table `tvb`
116+
--
117+
ALTER TABLE `tvb`
118+
ADD PRIMARY KEY (`id`),
119+
ADD UNIQUE KEY `id_2` (`id`),
120+
ADD KEY `id` (`id`);
121+
122+
--
123+
-- Indexes for table `user`
124+
--
125+
ALTER TABLE `user`
126+
ADD PRIMARY KEY (`id`),
127+
ADD UNIQUE KEY `id` (`id`),
128+
ADD KEY `id_2` (`id`);
129+
130+
--
131+
-- Indexes for table `ysb`
132+
--
133+
ALTER TABLE `ysb`
134+
ADD PRIMARY KEY (`id`),
135+
ADD UNIQUE KEY `id` (`id`),
136+
ADD KEY `id_2` (`id`);
137+
138+
--
139+
-- AUTO_INCREMENT for dumped tables
140+
--
141+
142+
--
143+
-- AUTO_INCREMENT for table `tvb`
144+
--
145+
ALTER TABLE `tvb`
146+
MODIFY `id` int(16) NOT NULL AUTO_INCREMENT COMMENT 'id';
147+
--
148+
-- AUTO_INCREMENT for table `user`
149+
--
150+
ALTER TABLE `user`
151+
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户id';
152+
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
153+
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
154+
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

0 commit comments

Comments
 (0)