Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/dev' into dev

huZhiHao 5 anni fa
parent
commit
9e9d86bb77

+ 1 - 0
src/main/java/platform/common/security/xss/XssFilter.java

@@ -77,6 +77,7 @@ public class XssFilter implements Filter {
                         || request.getServletPath().contains("/company/projectFilling")
                         || request.getServletPath().contains("/government/projectProvinces")
                         || request.getServletPath().contains("/land_supply")
+                        || request.getServletPath().contains("/activity")
         ) {
 
             chain.doFilter(request, response);

+ 4 - 7
src/main/java/platform/modules/government/web/ActivityReviewController.java

@@ -131,19 +131,16 @@ public class ActivityReviewController extends BaseController{
     @PostMapping("/update")
     @ResponseBody
     public Object updateReview(ActivityReview review){
-        review.setHas_video(review.getVideoDown() != null );
         // ###**************
         // ### 保存视频 wangjiang
-        Boolean hasVideo = review.getVideoDown() != null;
-        review.setHas_video(hasVideo);
-        if (hasVideo) {
+        Boolean hasVideo = review.getHas_video();
+        if (hasVideo && review.getVideoDown() != null) {
             review.setVideo_attachment_id(review.getVideoDown().getFile_id());
             Attachment att = attachmentService.findById(review.getVideoDown().getFile_id());
             review.setVideo_url(att.getFile_url());
-        } else {
-            review.setVideo_url("");
-            review.setVideo_attachment_id(null);
         }
+        // ###**************
+
         // todo 删除原文件
         // ###**************
         activityReviewService.updateSelective(review);

+ 5 - 3
src/main/resources/application.yml

@@ -160,7 +160,8 @@ spring:
     #    url: jdbc:mysql://192.168.1.115:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://222.92.16.3:33061/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://10.44.104.42:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
-    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+#    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://47.105.241.108:33060/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
   #redis
@@ -185,14 +186,15 @@ password: WD7ZuG4T27mDBFRXye2IfZZgrDsmPCtkMDfj8fGss8Iz/4aF27TLznaZ2mUbU273q5spfM
 
 #上传文件配置信息
 #文件仓库地址
-repositoryPath:  /opt/xinqu_pic
+#repositoryPath:  /opt/xinqu_pic
+repositoryPath:  /Users/chenqing/codeCache/uploads
 #新区接口地址
 api_url: http://snd.ideatob.com/mp/api/
 #apk文件存放地址
 apk_url: E:\UPLOAD\
 
 #访问路径
-fileUrl: http://192.168.1.116:8001/uploads
+fileUrl: http://47.105.241.108/uploads
 
 #域名
 service_name: 127.0.0.1

+ 14 - 5
src/main/resources/templates/admin/government/activity_review/edit.html

@@ -18,7 +18,7 @@
 <body layout:fragment="content">
 
 <article class="page-container">
-    <form class="form form-horizontal" id="form-review-add">
+    <form class="form form-horizontal" id="form-review-add" enctype="multipart/form-data">
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>关联活动:</label>
             <div class="formControls col-xs-8 col-sm-7">
@@ -50,7 +50,10 @@
                     <div id="filePicker" class="margin-right-10">重新选择图片</div>
                     <input type="hidden" th:id="img" th:name="img" />
                     <input type="hidden" value="" th:id="imgName" th:name="imgName"/>
-                    <div id="fileListPre"><img id="preImg" height=100 width=200  th:src="${fileUrl} +${review.fileDown.file_url}"/></div>
+                    <div id="fileListPre">
+                        <img id="preImg" height=100 width=200  th:src="${fileUrl} +${review.fileDown.file_url}"/>
+                        <input type="hidden" name="fileDown.file_id" id="files" th:value="${review.fileDown.file_id}">
+                    </div>
                 </div>
             </div>
         </div>
@@ -80,8 +83,9 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>内容:</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <textarea id="content" name="content" th:value="${review.content}"></textarea>
+                <textarea id="content" name="content" th:name="content"  th:utext="*{review.content}"></textarea>
             </div>
+            <!--[[${review?.content}]]-->
         </div>
         <input type="hidden" id="isPush">
         <div class="row cl">
@@ -119,7 +123,8 @@
             width: "750px",
             height: "350px",
             items: array,
-            syncType: "auto",
+            syncType: "form",
+            // syncType: "auto",
             afterBlur: function () {
                 this.sync();
             }
@@ -208,7 +213,9 @@
         if (hasVideo) {
             $("#videoArea").show()
         } else {
-            $("#videoArea").hide()
+            setTimeout(function () {
+                $("#videoArea").hide()
+            }, 500)
         }
 
         $('input[type=radio][name=has_video]').change(function() {
@@ -255,10 +262,12 @@
         }
         var content = $("#content").val();
         console.log(content);
+        content = editor.html();
         if (content.replace(/\s+/g,"") == ''){
             errorMessage("内容不能为空");
             return;
         }
+        $("#content").val(content);
         $("#form-review-add").ajaxSubmit({
             type: 'post',
             url: pagePath + "/activity/review/update",

+ 4 - 2
src/main/resources/templates/home/common/common.html

@@ -58,8 +58,10 @@
         $(function () {
             if (loginUserName) {
                 // document.getElementsByClassName('.loginIcon')[0].src = loginUserName;
-                document.getElementsByClassName('loginName')[0].innerText = loginUserName;
-                document.getElementById('login-link').style.display = 'none'
+                if (document.getElementsByClassName("loginName")[0] != undefined) {
+                    document.getElementsByClassName('loginName')[0].innerText = loginUserName;
+                    document.getElementById('login-link').style.display = 'none'
+                }
             } else {
                 document.getElementsByClassName('toAdmin')[0].style.display = 'none'
                 document.getElementsByClassName('loginIcon')[0].style.display = 'none'