Skip to content

Commit fba67b2

Browse files
Stallion-XStallion-X
committed
static changes
1 parent b17796e commit fba67b2

File tree

22 files changed

+301
-333
lines changed

22 files changed

+301
-333
lines changed

‎src/main/resources/application.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
spring.application.name=CiliCili
22
spring.mvc.view.prefix=/views/
33
spring.mvc.view.suffix=.jsp
4-
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
5-
spring.servlet.multipart.max-file-size=8000MB
6-
spring.servlet.multipart.max-request-size=8000MB
4+
# mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
5+
spring.servlet.multipart.max-file-size=100000MB
6+
spring.servlet.multipart.max-request-size=100000MB

‎src/main/resources/application.yml

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ mybatis-plus:
33
configuration:
44
cache-enabled: true
55
map-underscore-to-camel-case: true
6+
log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
67
type-aliases-package: com.cilicili.Beans
78
spring.datasource:
89
type: com.alibaba.druid.pool.DruidDataSource
@@ -21,3 +22,12 @@ spring:
2122
sql:
2223
init:
2324
platform: mysql
25+
server:
26+
ssl:
27+
key-store: classpath:cert.p12 # 证书存放的位置
28+
key-store-type: PKCS12 # P12证书格式
29+
key-store-password:
30+
enabled: true
31+
logging:
32+
level:
33+
com.cilicili.DAO.Mapper: debug

‎src/main/webapp/videos/Upload Video

Whitespace-only changes.

‎src/main/webapp/views/adminLogin.jsp

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
href="https://cpwebassets.codepen.io/assets/favicon/apple-touch-icon-5ae1a0698dcc2402e9712f7d01ed509a57814f994c660df9f7a952f3060705ee.png"/>
1414
<link rel="mask-icon" type="image/x-icon"
1515
href="https://cpwebassets.codepen.io/assets/favicon/logo-pin-8f3771b1072e3c38bd662872f6b673a722f4b3ca2421637d5596661b4e2132cc.svg"/>
16-
<%-- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">--%>
17-
<%-- <link rel="stylesheet" href="/views/css/fontawesome-free-6.4.0-web/css/all.css">--%>
16+
<%-- <link rel="stylesheet" href="/views/css/fontawesome-free-6.4.0-web/css/all.css" type="text/css"/>--%>
1817
<link rel="stylesheet" href="/views/css/font-awesome-4.7.0/css/font-awesome.min.css" type="text/css"/>
1918
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
2019
</head>

‎src/main/webapp/views/home.jsp

+277-277
Large diffs are not rendered by default.

‎src/main/webapp/views/img/avatar/1.jpg

-45.4 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/1.gif

-684 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/1.jpg

-64.5 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/1.png

-225 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/2.jpg

-55.2 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/2.png

-225 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/3.jpg

-26.3 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/4.jpg

-38 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/5.png

-42.2 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/6.jpg

-25.3 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/6.png

-45 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/7.jpg

-45.4 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/8.jpg

-26.2 KB
Binary file not shown.

‎src/main/webapp/views/img/cover/9.jpg

-26.2 KB
Binary file not shown.

‎src/main/webapp/views/video.jsp

+4-45
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<link rel="stylesheet" href="/views/css/font/iconfont.css">
2525
<link rel="shortcut icon" href="/views/img/favicon.ico">
2626
<title>${videoEntity.vtitle}_CiliCili-视频播放</title>
27-
<%--<script
28-
src="/views/js/bluebird.min.js"></script>--%>
27+
<script
28+
src="/views/js/bluebird.min.js"></script>
2929
<script type="text/javascript">
3030
function isIE() {
3131
if (!!window.ActiveXObject || "ActiveXObject" in window) {
@@ -732,7 +732,7 @@
732732
<body>
733733
<iframe scrolling="no" style="border: medium none; margin:0; padding:0;" src="/views/navigation.jsp" width="100%" height="5%" name="topframe"></iframe>
734734
<div id="app"></div>
735-
<%--<script type="text/javascript">
735+
<script type="text/javascript">
736736
function isIE() {
737737
if (!!window.ActiveXObject || "ActiveXObject" in window) {
738738
return true;
@@ -748,7 +748,7 @@
748748
document.getElementsByTagName('head')[0].appendChild(script);
749749
}
750750
751-
</script>--%>
751+
</script>
752752

753753

754754
<script src="/views/js/DPlayer.min.js"></script>
@@ -1750,47 +1750,6 @@
17501750
.replace(/\b(\d)\b/g, "0$1");
17511751
}
17521752
1753-
// function loaddanmu() {
1754-
// $.ajax({
1755-
// url: "/v3",
1756-
// type: 'GET',
1757-
// data: {'id': '${vid}'},
1758-
// success: function (data) {
1759-
// var obj = JSON.parse(data);
1760-
// //alert(obj.data)
1761-
// if (obj.code == 0) {
1762-
// var danmaku = obj.data;
1763-
// //ddd=obj.data;
1764-
// //console.log(dd)
1765-
// var autor = "普通用户";
1766-
// $(".danmuku_num").text(danmaku.length);
1767-
// $('#dmnum').html(danmaku.length);
1768-
// //有空改成懒加载
1769-
// $(danmaku).each(function (index, item) {
1770-
// //console.log(item)
1771-
// if (item[1]) {
1772-
// } else {
1773-
// autor = "普通用户"
1774-
// }
1775-
// var oLi = '<ol class="danmuku_list" time="'+item[0]+'"><li>' + formatTime(item[0]) + '</li><li title="' + item[4] + '">' + item[4] + '</li><li>' + autor + '</li></ol>';
1776-
// $(".list_ovefiow").append(oLi);
1777-
// autor = "普通用户";
1778-
// });
1779-
// } else {
1780-
// alert_back("弹幕加载失败 -v-!");
1781-
// }
1782-
// $(".danmuku_list").click(function () {
1783-
//
1784-
// dp.seek($(this).attr("time"))
1785-
// });
1786-
// }
1787-
// });
1788-
// }
1789-
// function freshdanmu() {
1790-
// $(".list_ovefiow").html('');
1791-
// loaddanmu();
1792-
// }
1793-
17941753
var danmaku;
17951754
function loaddanmu() {
17961755
$.ajax({

‎src/main/webapp/views/videoUpload.jsp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
22
<%@ page language="java" contentType="text/html; charset=UTF-8"
33
pageEncoding="UTF-8" %>
44
<%
@@ -112,7 +112,7 @@
112112
</a>
113113
</form>
114114
</div>
115-
<div style="display: none;" id="daxiaobuneng"><b style="color: red;">总大小不能超过1g</b></div>
115+
<div style="display: none;" id="daxiaobuneng"><b style="color: red;">总大小不能超过16g</b></div>
116116
</div>
117117
<script type="text/javascript">
118118
$("#fanhui").click(function () {
@@ -154,11 +154,11 @@
154154
//判断图片
155155
var img = $("#img").val();
156156
if (img != "") {
157-
if (!/\.(gif|jpg|jpeg|png|GIF|JPG|JPEG|PNG|webp)$/.test(img)) {
157+
if (!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(img)) {
158158
let vm = new Vue({
159159
el:"#app",
160160
mounted() {
161-
this.$alert('图片类型必须是.gif,jpeg,jpg,png,webp中的一种！', '提醒',{
161+
this.$alert('图片类型必须是.gif,jpeg,jpg,png中的一种！', '提醒',{
162162
confirmButtonText: '确定',
163163
callback: action => {
164164
}
@@ -184,7 +184,7 @@
184184
});
185185
return false;
186186
}
187-
//判断文件总大小 不能超1g
187+
//判断文件总大小 不能超16g
188188
//用户上传的视频
189189
var addImags = $("#video").prop('files');
190190
var fileSize = 0;
@@ -199,7 +199,7 @@
199199
}
200200
201201
var zonggongdaxiao = fileSize + fileSize2;
202-
var Maxzong = 8589934592;
202+
var Maxzong = 17179869184;
203203
if (zonggongdaxiao > Maxzong) {
204204
$("#daxiaobuneng").show();
205205
let vm = new Vue({

‎target/classes/cert.p12

Whitespace-only changes.

0 commit comments

Comments
 (0)