static changes

Stallion-X · Sep 21, 2023 · fba67b2 · fba67b2
1 parent b17796e
commit fba67b2
Show file tree

Hide file tree

Showing 22 changed files with 301 additions and 333 deletions.
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 spring.application.name=CiliCili
 spring.mvc.view.prefix=/views/
 spring.mvc.view.suffix=.jsp
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-spring.servlet.multipart.max-file-size=8000MB
-spring.servlet.multipart.max-request-size=8000MB
+# mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+spring.servlet.multipart.max-file-size=100000MB
+spring.servlet.multipart.max-request-size=100000MB
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -3,6 +3,7 @@ mybatis-plus:
   configuration:
     cache-enabled: true
     map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
   type-aliases-package: com.cilicili.Beans
 spring.datasource:
   type: com.alibaba.druid.pool.DruidDataSource
@@ -21,3 +22,12 @@ spring:
   sql:
     init:
       platform: mysql
+server:
+  ssl:
+    key-store: classpath:cert.p12 # 证书存放的位置
+    key-store-type: PKCS12 # P12证书格式
+    key-store-password:
+    enabled: true
+logging:
+  level:
+    com.cilicili.DAO.Mapper: debug
diff --git a/src/main/webapp/videos/Upload Video b/src/main/webapp/videos/Upload Video
diff --git a/src/main/webapp/views/adminLogin.jsp b/src/main/webapp/views/adminLogin.jsp
@@ -13,8 +13,7 @@
         href="https://cpwebassets.codepen.io/assets/favicon/apple-touch-icon-5ae1a0698dcc2402e9712f7d01ed509a57814f994c660df9f7a952f3060705ee.png"/>
   <link rel="mask-icon" type="image/x-icon"
         href="https://cpwebassets.codepen.io/assets/favicon/logo-pin-8f3771b1072e3c38bd662872f6b673a722f4b3ca2421637d5596661b4e2132cc.svg"/>
-<%--  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">--%>
-<%--  <link rel="stylesheet" href="/views/css/fontawesome-free-6.4.0-web/css/all.css">--%>
+<%--  <link rel="stylesheet" href="/views/css/fontawesome-free-6.4.0-web/css/all.css" type="text/css"/>--%>
   <link rel="stylesheet" href="/views/css/font-awesome-4.7.0/css/font-awesome.min.css" type="text/css"/>
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
 </head>

diff --git a/src/main/webapp/views/home.jsp b/src/main/webapp/views/home.jsp
diff --git a/src/main/webapp/views/img/avatar/1.jpg b/src/main/webapp/views/img/avatar/1.jpg
diff --git a/src/main/webapp/views/img/cover/1.gif b/src/main/webapp/views/img/cover/1.gif
diff --git a/src/main/webapp/views/img/cover/1.jpg b/src/main/webapp/views/img/cover/1.jpg
diff --git a/src/main/webapp/views/img/cover/1.png b/src/main/webapp/views/img/cover/1.png
diff --git a/src/main/webapp/views/img/cover/2.jpg b/src/main/webapp/views/img/cover/2.jpg
diff --git a/src/main/webapp/views/img/cover/2.png b/src/main/webapp/views/img/cover/2.png
diff --git a/src/main/webapp/views/img/cover/3.jpg b/src/main/webapp/views/img/cover/3.jpg
diff --git a/src/main/webapp/views/img/cover/4.jpg b/src/main/webapp/views/img/cover/4.jpg
diff --git a/src/main/webapp/views/img/cover/5.png b/src/main/webapp/views/img/cover/5.png
diff --git a/src/main/webapp/views/img/cover/6.jpg b/src/main/webapp/views/img/cover/6.jpg
diff --git a/src/main/webapp/views/img/cover/6.png b/src/main/webapp/views/img/cover/6.png
diff --git a/src/main/webapp/views/img/cover/7.jpg b/src/main/webapp/views/img/cover/7.jpg
diff --git a/src/main/webapp/views/img/cover/8.jpg b/src/main/webapp/views/img/cover/8.jpg
diff --git a/src/main/webapp/views/img/cover/9.jpg b/src/main/webapp/views/img/cover/9.jpg
diff --git a/src/main/webapp/views/video.jsp b/src/main/webapp/views/video.jsp
@@ -24,8 +24,8 @@
     <link rel="stylesheet" href="/views/css/font/iconfont.css">
     <link rel="shortcut icon" href="/views/img/favicon.ico">
     <title>${videoEntity.vtitle}_CiliCili-视频播放</title>
-    <%--<script
-            src="/views/js/bluebird.min.js"></script>--%>
+    <script
+            src="/views/js/bluebird.min.js"></script>
     <script type="text/javascript">
         function isIE() {
             if (!!window.ActiveXObject || "ActiveXObject" in window) {
@@ -732,7 +732,7 @@
 <body>
 <iframe scrolling="no" style="border: medium none; margin:0; padding:0;" src="/views/navigation.jsp" width="100%" height="5%" name="topframe"></iframe>
 <div id="app"></div>
-<%--<script type="text/javascript">
+<script type="text/javascript">
     function isIE() {
         if (!!window.ActiveXObject || "ActiveXObject" in window) {
             return true;
@@ -748,7 +748,7 @@
         document.getElementsByTagName('head')[0].appendChild(script);
     }
 
-</script>--%>
+</script>
 
 
 <script src="/views/js/DPlayer.min.js"></script>
@@ -1750,47 +1750,6 @@
             .replace(/\b(\d)\b/g, "0$1");
     }
 
-    // function loaddanmu() {
-    //     $.ajax({
-    //         url: "/v3",
-    //         type: 'GET',
-    //         data: {'id': '${vid}'},
-    //         success: function (data) {
-    //             var obj = JSON.parse(data);
-    //             //alert(obj.data)
-    //             if (obj.code == 0) {
-    //                 var danmaku = obj.data;
-    //                 //ddd=obj.data;
-    //                 //console.log(dd)
-    //                 var autor = "普通用户";
-    //                 $(".danmuku_num").text(danmaku.length);
-    //                 $('#dmnum').html(danmaku.length);
-    //                 //有空改成懒加载
-    //                 $(danmaku).each(function (index, item) {
-    //                     //console.log(item)
-    //                     if (item[1]) {
-    //                     } else {
-    //                         autor = "普通用户"
-    //                     }
-    //                     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>';
-    //                     $(".list_ovefiow").append(oLi);
-    //                     autor = "普通用户";
-    //                 });
-    //             } else {
-    //                 alert_back("弹幕加载失败 -v-!");
-    //             }
-    //             $(".danmuku_list").click(function () {
-    //
-    //                 dp.seek($(this).attr("time"))
-    //             });
-    //         }
-    //     });
-    // }
-    // function freshdanmu() {
-    //     $(".list_ovefiow").html('');
-    //     loaddanmu();
-    // }
-
     var danmaku;
     function loaddanmu() {
         $.ajax({

diff --git a/src/main/webapp/views/videoUpload.jsp b/src/main/webapp/views/videoUpload.jsp
@@ -1,4 +1,4 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
          pageEncoding="UTF-8" %>
 <%
@@ -112,7 +112,7 @@
             </a>
         </form>
     </div>
-    <div style="display: none;" id="daxiaobuneng"><b style="color: red;">总大小不能超过1g</b></div>
+    <div style="display: none;" id="daxiaobuneng"><b style="color: red;">总大小不能超过16g</b></div>
 </div>
 <script type="text/javascript">
     $("#fanhui").click(function () {
@@ -154,11 +154,11 @@
             //判断图片
             var img = $("#img").val();
             if (img != "") {
-                if (!/\.(gif|jpg|jpeg|png|GIF|JPG|JPEG|PNG|webp)$/.test(img)) {
+                if (!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(img)) {
                     let vm = new Vue({
                         el:"#app",
                         mounted() {
-                            this.$alert('图片类型必须是.gif,jpeg,jpg,png,webp中的一种！', '提醒',{
+                            this.$alert('图片类型必须是.gif,jpeg,jpg,png中的一种！', '提醒',{
                                 confirmButtonText: '确定',
                                 callback: action => {
                                 }
@@ -184,7 +184,7 @@
                 });
                 return false;
             }
-            //判断文件总大小 不能超1g
+            //判断文件总大小 不能超16g
             //用户上传的视频
             var addImags = $("#video").prop('files');
             var fileSize = 0;
@@ -199,7 +199,7 @@
             }
 
             var zonggongdaxiao = fileSize + fileSize2;
-            var Maxzong = 8589934592;
+            var Maxzong = 17179869184;
             if (zonggongdaxiao > Maxzong) {
                 $("#daxiaobuneng").show();
                 let vm = new Vue({

diff --git a/target/classes/cert.p12 b/target/classes/cert.p12