From a98077a206242fa3bd013ffeadb5c03caf2132a0 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Sun, 25 Apr 2021 09:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constants/PropertiesConstants.java        |  14 +-
 .../service/impl/ArticleServiceImpl.java      |   4 +-
 .../freemarker/{create.flt => createedit.flt} |   0
 .../static/freemarker/createview.flt          | 152 ++++++++++++++++++
 4 files changed, 164 insertions(+), 6 deletions(-)
 rename ruoyi-content/src/main/resources/static/freemarker/{create.flt => createedit.flt} (100%)
 create mode 100644 ruoyi-content/src/main/resources/static/freemarker/createview.flt

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java b/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
index 9abf1ddaa..b4155a0df 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
@@ -12,11 +12,17 @@ public class PropertiesConstants {
 //
 //    public static final String FILE_PATH = "/app/contentMKTCms/webapp/WEB-INF/static/";
 //    public static final String PROJECT_LOCALPATH = "/app/contentMKTCms/webapp";
-    public static final String TEMPLATE_VIEW_PATH = "view.flt";
-    public static final String TEMPLATE_EDIT_PATH = "edit.flt";
 
-    public static final String FILE_PATH = "/Users/liushenlu/Desktop/";
-    public static final String PROJECT_LOCALPATH = "/Users/liushenlu/Desktop";
+    //public static final String FILE_PATH = "/Users/liushenlu/Desktop/";
+    //public static final String PROJECT_LOCALPATH = "/Users/liushenlu/Desktop";
+    public static final String FILE_PATH = "/app/contentMKTCms/";
+    public static final String PROJECT_LOCALPATH = "/app/contentMKTCms";
+
+    public static final String TEMPLATE_VIEW_PATH = "template/view.flt";
+    public static final String TEMPLATE_EDIT_PATH = "template/edit.flt";
+    public static final String TEMPLATE_CREATE_EDIT_PATH = "template/createedit.flt";
+    public static final String TEMPLATE_CREATE_VIEW_PATH = "template/createview.flt";
+
     public static final String ONLINE_IMG_PATH = "network/article/";
     public static final String OSS_URL = "http://cdn.sinosoftec.com/";
     public static final String OSS_URL_HTTPS = "https://cdn.sinosoftec.com/";
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index 08a62cef7..7b1fbef6f 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -1256,9 +1256,9 @@ public class ArticleServiceImpl implements ArticleService {
             // 静态页生成路径
             String viewPath = PathUtil.getArticleViewUrl(versionNumber, String.valueOf(articleId));
             String createPath = PathUtil.getArticleCreateUrl(versionNumber, articleId + versionNumber.substring(8, 14));
-            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_VIEW_PATH,
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_CREATE_VIEW_PATH,
                     PropertiesConstants.FILE_PATH + viewPath, pageData);
-            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_CREATE_PATH,
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_CREATE_EDIT_PATH,
                     PropertiesConstants.FILE_PATH + createPath, pageData);
             // 把静态页上传到oss
             OSSUtil.uploadFileHtml(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
diff --git a/ruoyi-content/src/main/resources/static/freemarker/create.flt b/ruoyi-content/src/main/resources/static/freemarker/createedit.flt
similarity index 100%
rename from ruoyi-content/src/main/resources/static/freemarker/create.flt
rename to ruoyi-content/src/main/resources/static/freemarker/createedit.flt
diff --git a/ruoyi-content/src/main/resources/static/freemarker/createview.flt b/ruoyi-content/src/main/resources/static/freemarker/createview.flt
new file mode 100644
index 000000000..783a27bd2
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/freemarker/createview.flt
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>文章编辑</title>
+    <base href="../../../../ms/" />
+    <link rel="stylesheet" href="css/style.css">
+   
+	 <script src="js/common.js"></script>
+     <script src="js/common.1.js"></script>
+      <link rel="stylesheet" href="css/base.css">
+     <style type="text/css">
+			.lables {
+			    height: 200px;width: 200px;border: 1px solid #ccc;position: fixed;top: 50%;left: 50%;margin-top: -100px;margin-left: -100px;background: white;z-index: 555;
+			}
+			table {
+			    border-top: 1px solid #ccc;border-left: 1px solid #ccc;
+			}
+            table td, table th {
+                border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; padding: 3px 5px;
+            }
+            table th {
+                border-bottom: 2px solid #ccc; text-align: center;
+            }
+            blockquote {
+                display: block;border-left: 8px solid #d0e5f2;padding: 5px 10px;margin: 10px 0;
+                line-height: 1.4;font-size: 100%;background-color: #f1f1f1;
+            }
+            code {
+                display: inline-block;*display: inline;*zoom: 1;background-color: #f1f1f1;
+                border-radius: 3px;padding: 3px 5px;margin: 0 3px;
+            }
+            pre code {
+                display: block;
+            }
+            ul, ol {
+                margin: 10px 0 10px 20px;
+            }
+            #activity-name, #meta_content {
+                display: block;width: 100%;font-size: 20px;color: #000;
+                min-height: 30px;margin-bottom: 5px;outline: none;resize: none;border: none;
+            }
+            #activity-name {
+                font-size: 24px;
+            }
+            #bodycontent {
+                font-size: 18px;line-height: 20px;padding-top: 10px;
+            }
+            #bodycontent div {
+                min-height: 27.43px;
+            }
+	</style>
+</head>
+
+<body id="edit">
+<input type="hidden" name="shareTitle" value="${articleInfo.shareTitle}" class="shareTitle"/>	<#--分享标题-->	
+<input type="hidden" name="shareImgUrl" value="${articleInfo.shareImgUrl}" class="shareImgUrl"/>	<#--分享图片-->	
+<input type="hidden" name="shareDes" value="${articleInfo.shareDes}" class="shareDes"/>	<#--分享描述-->
+<input type="hidden" name="articleId" value="${articleInfo.articleId}" class="articleId"/>	<#--文章id-->	
+<input type="hidden" name="adId" value="${articleInfo.adId}" class="adId"/>	<#--广告id-->	
+<input type="hidden" name="companyId" value="${articleInfo.companyId}" class="companyId"/>	<#--公司id-->	
+<input type="hidden" name="publishId" value="${articleInfo.publishId}" class="publishId"/>	<#--发布id-->
+<input type="hidden" name="isAuthorization" value="${articleInfo.isAuthorization}" class="isAuthorization"/>	<#--是否授权 0未授权 1授权-->	
+<input type="hidden" name="isReserve" value="${articleInfo.isReserve}" class="isReserve"/>	<#--是否预约 0不预约 1预约-->	
+<input type="hidden" name="automaticName" value="${articleInfo.automaticName}" class="automaticName"/>	<#--自定义名称-->	
+<input type="hidden" name="introduction" value="${articleInfo.introduction}" class="introduction"/>	<#--介绍-->	
+    <div id="edit_head">
+        <button class="a">
+            <img src="img/share_icon4.png">
+        </button>
+        <p class="b">文章编辑</p>
+        <button class="c">
+            <img src="img/edit_icon_temp.png">
+        </button>
+    </div>
+    <p id="edit_cue">点击文章段落，可删除不需要的内容</p>
+    <div id="edit_body">
+        
+
+        <div class="a">
+            
+            <div class="b">&emsp;可编辑区域&emsp;</div>
+            <div id="articleEditor">
+              ${articleInfo.articleContent}
+            </div>
+        </div>
+        <button id="addAd">
+        <span>+</span>新增</button>
+    </div>
+    <div id="adSelect" class="form-group" style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">广告添加<i class="red"></i></label>
+		<div class="col-sm-5">
+			<select name="advertisementTypeInit" id="advertisementTypeInit" multiple="multiple">
+			</select><br>
+		</div>
+	</div>
+
+	<div  id="whetherOrNotAuthorization" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 145px;">必须授权才能观看<i class="red"></i></label>
+		 <div class="col-sm-4"> 
+			<input type="checkbox" id="isAuthorization"><br>
+		</div> 
+	</div>
+	
+	<div  id="whetherOrNotReserve" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 145px;">是否添加预约按钮<i class="red"></i></label>
+		 <div class="col-sm-4"> 
+			<input type="checkbox" id="isReserve"><br>
+		</div> 
+	</div>
+	
+	<div  id="button_name" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">按钮名称<i class="red">*</i></label>
+		 <div class="col-sm-4"> 
+			<input type="text" style="width: 200px;border:1px solid #ccc"
+					value="${articleInfo.automaticName}"></input>
+		</div> 
+	</div>
+	
+	<div  id="reserve_introduction" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">预约介绍<i class="red">*</i></label>
+		 <div class="col-sm-4"> 
+			<textarea type="text" style="width: 250px;border:1px solid #ccc"
+					 >${articleInfo.introduction}</textarea>
+		</div> 
+	</div>
+
+<form style="display: none;" class="lables">
+	       标签：<label><input type="radio" name="1" value="旅游" checked="checked">旅游</label> 
+		        <label><input type="radio" name="1" value="美食" checked="checked" >美食</label>
+				<button id="sures" type="button">确定</button>
+	            
+	</form>
+
+	<link rel="stylesheet" href="css/fSelect.css">
+    <link rel="stylesheet" href="css/bootstrap.min.css">
+
+    <!-- 文章编辑组件 -->
+    <script src="js/jquery.min.js"></script>
+    <script src="js/Eleditor.min.js"></script>
+    <script src="js/webuploader.min.js"></script>
+    <!-- 页面组件 -->
+    <script src="js/common.2.js"></script>
+    <script src="js/fSelect.js"></script>
+    <script src="js/new/edit_ms.js?v=0.5"></script>
+
+</body>
+
+</html>
\ No newline at end of file