Merge remote-tracking branch 'origin/master'

src/main/java/com/palmnest/application/core/util/FileUploadUtils.java

@@ -3,10 +3,7 @@ package com.palmnest.application.core.util;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.io.*;
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 import javax.annotation.PostConstruct;
 import javax.imageio.ImageIO;
@@ -43,6 +40,7 @@ public class FileUploadUtils {
 	private static String         ATTACHMENT_ROOT; // 文件存储父路径
 	private static String         VISIT_PREFIX        = PropertiesKit.readPropertiesValue("image_server", "wechat.properties"); // 前端访问路径
 	private        String         ATTACHMENT_ROOT_KEY = "attachment.root";
+	private static List<String> allow_upload_suffix = new ArrayList<>(Arrays.asList(".png", ".jpg", ".jpeg"));
 	private static PathGeneration pathGeneration;
 
 	private static final String CHARSET     = "utf-8";
@@ -219,6 +217,11 @@ public class FileUploadUtils {
 			return "";
 		}
 
+		ext = ext.toLowerCase();
+		if (!allow_upload_suffix.contains(ext)) {
+			LOG.info("不允许上传扩展名文件:" + ext);
+			return "";
+		}
 		String _ext = "";
 		if (StringUtils.isNotEmpty(ext)) {
 			_ext = ext.startsWith(".") ? ext : "." + ext;

src/main/java/com/palmnest/webapp/controller/notice/WxNoticeController.java

@@ -142,29 +142,39 @@ public class WxNoticeController extends BaseFormController{
 		String openId=request.getParameter("openId");
 		String orgId=request.getParameter("orgId");
 		WxUser wxUser=scWxuserManager.getScWxuserByOpenId(openId);
-		if(StringUtils.isEmpty(pageNo)){
-			pageNo="1";
-		}
-		if(StringUtils.isEmpty(pageSize)){
-			pageSize="10";
-		}
-		HashMap<String, Object> map = new HashMap<String,Object>();
-		if(!StringUtils.isEmpty(state)){
-			map.put("state", state);
-		}
-		//优先传入的orgId参数，如果没有就通过openId拿orgId
-		if (StringUtils.isNotEmpty(orgId)) {
-			map.put("orgId", orgId);
-		}else{
-			if (wxUser != null && null != wxUser.getOrganizationId()) {
-				map.put("orgIds", wxUser.getOrganizationId());
+		try{
+			int i=0;
+			if(StringUtils.isEmpty(pageNo)){
+				pageNo="1";
+			}
+			if(StringUtils.isEmpty(pageSize)){
+				pageSize="10";
+			}
+			i = Integer.parseInt(pageSize);
+			i = Integer.parseInt(pageNo);
+
+			HashMap<String, Object> map = new HashMap<String,Object>();
+			if(!StringUtils.isEmpty(state)){
+				map.put("state", state);
+
+				i = Integer.parseInt(state);
+			}
+			//优先传入的orgId参数，如果没有就通过openId拿orgId
+			if (StringUtils.isNotEmpty(orgId)) {
+				map.put("orgId", orgId);
+				i = Integer.parseInt(orgId);
+			}else{
+				if (wxUser != null && null != wxUser.getOrganizationId()) {
+					map.put("orgIds", wxUser.getOrganizationId());
+				}else{
+					throw new Exception("参数不正确！");
+				}
 			}
-		}
 
 
 		map.put("type", 4);//微信首页列表
 		map.put("receiveType", 1);//只看全部的，不看部分的
-		try{
+
 			Page page=wxtemplateMessageManager.getDataList(map,Integer.parseInt(pageNo),Integer.parseInt(pageSize));
 
 			ArrayList<TempSaverList> resultList = new ArrayList<TempSaverList>();
@@ -216,7 +226,7 @@ public class WxNoticeController extends BaseFormController{
 		}catch(Exception e){
 			json.put("code", "1");
 			json.put("msg", "fail");
-			json.put("data", e.getMessage());
+			//json.put("data", e.getMessage());
 			StringUtil.charSet(json, request, response);
 			log.error(e.getMessage());
 			e.printStackTrace();

src/main/java/com/palmnest/webapp/controller/wechat/FrontSecurityController.java

@@ -107,6 +107,12 @@ public class FrontSecurityController {
 				serviceCode = state.split(";")[1]; // 切割state参数来获取服务编码
 			}
 
+			try{
+				int i = Integer.parseInt(publicId);
+			}catch (Exception ex)
+			{
+				throw new Exception("参数非法");
+			}
 			// ---重要
 			//2019.11.08融合公众号菜单重定向到新系统首页链接  start-------
 

src/main/resources/quartz_job2.xml

@@ -48,7 +48,7 @@
             <!-- 从0点开始，每隔1小时执行任务调度
             <value>0 0 0/1 * * ?</value> -->
             <!--每隔10分钟运行一次-->
-             <value>0 0/10 * * * ?</value>
+            <value>0 0/10 * * * ?</value>
         </property>
     </bean>
 
@@ -82,7 +82,6 @@
     </bean>
     -->
 
-
     <!-- 定时扫描通知信息表，发送通知消息 -->
     <bean id="executeSendAnnoTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
@@ -125,7 +124,6 @@
     </bean>
 
 
-
     <!--空调加时单 申请时间大于当前时间  把状态改为已完成-->
     <bean id="airConditionerAddTimeTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
@@ -140,6 +138,7 @@
         </property>
     </bean>
 
+
     <bean id="airConditionerOrderTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="airConditionerOrderTask"/>
@@ -179,7 +178,7 @@
     <bean id="orderDinnerRechargeTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
         <property name="jobDetail" ref="orderDinnerRechargeTimer"/>
         <property name="cronExpression">
-           <value>0 10 0 21 * ? </value>          
+            <value>0 10 0 21 * ? </value>
             <!-- <value>0 10 0 ? * MON</value> -->
             <!-- 0 10 0 ? * MON   每周一0点10分执行一次充值积分 -->
         </property>
@@ -228,7 +227,26 @@
         </property>
     </bean>
 
+    <!-- 定时推送模板消息给开启订餐的用户，通知他们提前订明天的餐 -->
+    <!-- 每天15:30推一次消息 -->
+    <!--
+    <bean id="orderDinnerPushTempMsgTimer"
+          class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+        <property name="targetObject" ref="orderDinnerPushTempMsgTimerTask"/>
+        <property name="targetMethod" value="run"/>
+    </bean>
+
+    <bean id="orderDinnerPushTempMsgTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+        <property name="jobDetail" ref="orderDinnerPushTempMsgTimer"/>
+        <property name="cronExpression">
+            <value>0 30 15 * * ?</value>
+
+        </property>
+    </bean> -->
+
     <!-- 定时每天10执行一次  提醒用户需要订餐了 -->
+    <!-- 每天10点推一次消息 -->
+    <!--
     <bean id="orderDinnerPushTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="orderDinnerDatePushTimerTask"/>
@@ -239,10 +257,13 @@
         <property name="jobDetail" ref="orderDinnerPushTimer"/>
         <property name="cronExpression">
             <value>0 0 10 * * ?</value>
-            <!-- 每天10点推一次消息 -->
+
         </property>
     </bean>
+     -->
     <!-- 定时每天22点执行一次  将所有当天未及时确认的待确认订单置为待评价-->
+    <!-- 每天22点执行一次-->
+    <!--
     <bean id="dinnerConfirmServiceTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="dinnerConfirmServiceTimerTask"/>
@@ -253,9 +274,11 @@
         <property name="jobDetail" ref="dinnerConfirmServiceTimer"/>
         <property name="cronExpression">
             <value>0 0 22 * * ?</value>
-            <!-- 每天22点执行一次-->
-        </property>
+         </property>
     </bean>
+    -->
+    <!-- 每周日执行一次 -->
+    <!--
     <bean id="dinnerMealTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="dinnerMealTimerTask"/>
@@ -265,14 +288,14 @@
     <bean id="dinnerMealTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
         <property name="jobDetail" ref="dinnerMealTimer"/>
         <property name="cronExpression">
-            <!-- <value>0 0/2 * * * ?</value> -->
             <value>0 0 15 ? * THU</value>
-            <!-- 每周日执行一次 -->
+
         </property>
     </bean>
-    <!-- 每周一 2点清订餐缓存 -->   
-    
-    
+    -->
+    <!-- 每周一 2点清订餐缓存 -->
+
+
     <bean id="snycKoalaPassLogTaskTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="snycKoalaPassLogTask"/>
@@ -286,7 +309,7 @@
             <!-- 每10分钟更新一次 -->
         </property>
     </bean>
-    
+
 
     <bean id="cleanRedisTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
@@ -319,6 +342,7 @@
     </bean>
 
     <!-- 项目服务过期状态更新 -->
+    <!--
     <bean id="updateServiceProjectExpire"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="updateServiceProjectExpireTask"/>
@@ -329,12 +353,14 @@
         <property name="jobDetail" ref="updateServiceProjectExpire"/>
         <property name="cronExpression">
             <value>0 0 0 * * ? *</value>
-            <!-- 每天0点执行任务调度 -->
         </property>
     </bean>
+    -->
+
 
 
     <!-- 保存微信端服务模块用户活跃量 -->
+    <!--
     <bean id="moduleUserCountExpire"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="moduleUserCountTask"/>
@@ -344,47 +370,25 @@
     <bean id="moduleUserCountExpireTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
         <property name="jobDetail" ref="moduleUserCountExpire"/>
         <property name="cronExpression">
-            <value>0 0/10 * * * ? *</value><!-- 每十分钟执行一次 -->
+            <value>0 0/10 * * * ? *</value>
         </property>
     </bean>
-
-    <!-- 定时推送模板消息给开启订餐的用户，通知他们提前订明天的餐 -->
-    <bean id="orderDinnerPushTempMsgTimer"
-          class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-        <property name="targetObject" ref="orderDinnerPushTempMsgTimerTask"/>
-        <property name="targetMethod" value="run"/>
-    </bean>
-
-    <bean id="orderDinnerPushTempMsgTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
-        <property name="jobDetail" ref="orderDinnerPushTempMsgTimer"/>
-        <property name="cronExpression">
-            <value>0 30 15 * * ?</value>
-            <!-- 每天15:30推一次消息 -->
-        </property>
-    </bean>
-
+    -->
 
     <!--定时每分钟执行获取飞亚达订餐的订餐数据-->
+    <!--
     <bean id="orderDinnerGetOrderInfoTimer"
           class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
         <property name="targetObject" ref="orderDinnerGetOrderInfoTask"/>
         <property name="targetMethod" value="run"/>
     </bean>
-<!--    <bean id="orderDinnerGetOrderInfoTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">-->
-<!--        <property name="jobDetail" ref="orderDinnerGetOrderInfoTimer"/>-->
-<!--        <property name="cronExpression">-->
-<!--            <value>0 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 10 * * ?</value>-->
-<!--            &lt;!&ndash; 从10点开始执行，每1分钟执行一次，只执行到10点30 &ndash;&gt;-->
-<!--        </property>-->
-<!--    </bean>-->
-
     <bean id="orderDinnerGetOrderInfoTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
         <property name="jobDetail" ref="orderDinnerGetOrderInfoTimer"/>
         <property name="cronExpression">
-            <value>0 40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58 16 * * ?</value>
-            <!-- 从16点40开始执行，每1分钟执行一次，只执行到16点50 -->
+            <value>0 40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59 16 * * ?</value>
         </property>
     </bean>
+    -->
 
     <!-- quartz的调度工厂 调度工厂只能有一个，多个调度任务在list中添加 -->
     <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
@@ -397,20 +401,23 @@
                 <ref local="updateSignContractTrigger"/>
                 <!-- <ref local="updateWxUserInfoTrigger"/> -->
                 <ref local="executeSendAnnoTrigger"/>
-                <ref local="updateServiceProjectExpireTrigger"/>
+                <!--
+                 <ref local="updateServiceProjectExpireTrigger"/> -->
                 <ref local="airConditionerAddTimeTrigger"/>
                 <ref local="airConditionerOrderTrigger"/>
-                <ref local="orderDinnerDatePushTrigger"/>
-                <ref local="orderDinnerPushMessageTrigger"/>
-                <ref local="orderDinnerPushTempMsgTrigger"/>
-                <ref local="orderDinnerPushTrigger"/>
-                <ref local="dinnerConfirmServiceTrigger"/>
-                <ref local="dinnerTransferAccountsTrigger"/>
-                <ref local="orderDinnerRechargeTrigger"/>
-                <ref local="dinnerMealTrigger"/>
+                <!--
+                 <ref local="orderDinnerDatePushTrigger"/>
+                 <ref local="orderDinnerPushMessageTrigger"/>
+                 <ref local="orderDinnerPushTrigger"/>
+                 <ref local="orderDinnerPushTempMsgTrigger"/>
+                 <ref local="dinnerConfirmServiceTrigger"/>
+                 <ref local="dinnerTransferAccountsTrigger"/>
+                 <ref local="orderDinnerRechargeTrigger"/>
+                 <ref local="dinnerMealTrigger"/>
+                -->
                 <ref local="cleanRedisTrigger"/>
-                <ref local="moduleUserCountExpireTrigger"/>
-                <ref local="orderDinnerGetOrderInfoTrigger"/>
+                <!--  <ref local="moduleUserCountExpireTrigger"/>
+                 <ref local="orderDinnerGetOrderInfoTrigger"/>  -->
                 <ref local="snycKoalaPassLogTaskTrigger"/>
                 <ref local="repairAutomaticHighPraiseTrigger"/>
                 <!-- <ref local="repairGrabBillPushTrigger" />
@@ -419,4 +426,4 @@
             </list>
         </property>
     </bean>
-</beans>
+</beans>

src/main/webapp/WEB-INF/pages/admin/notice/noticeAppPublish.jsp

@@ -14,13 +14,13 @@
 				/>
 				<!-- Theme style -->
 				<link href="<c:url value='/styles/AdminLTE.css'/>" rel="stylesheet" type="text/css" />
-				<link href="<c:url value='/styles/notice/noticeAppPublish.css?v=222222'/>" rel="stylesheet" type="text/css" />
+				<link href="<c:url value='/styles/notice/noticeAppPublish.css?v=20230526'/>" rel="stylesheet" type="text/css" />
 				<link href="<c:url value='/scripts/lib/plugins/noticePhotoClip/cropper.css'/>" rel="stylesheet" type="text/css" />
 				<link href="<c:url value='/scripts/lib/plugins/noticePhotoClip/myCrop.css'/>" rel="stylesheet" type="text/css" />
 
 				<script type="text/javascript" src="<c:url value='/scripts/lib/jquery-1.8.2.min.js'/>"></script>
-				<script type="text/javascript" src="<c:url value='/scripts/lib/ueditor/ueditor.config.js?v=1.4'/>"></script>
-				<script type="text/javascript" src="<c:url value='/scripts/lib/ueditor/ueditor.all.js'/>"></script>
+				<script type="text/javascript" src="<c:url value='/scripts/lib/ueditor/ueditor.config.js?v=20230526.3'/>"></script>
+				<script type="text/javascript" src="<c:url value='/scripts/lib/ueditor/ueditor.all.js?v=20230526.3'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/layui/layui.js'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/template-native.js'/>"></script>
 
@@ -343,7 +343,7 @@
 									<span class="add-notice-btn"></span>
 								</div>
 							</div>
-							<div class="announcement-right main-content-mode-wp">
+							<div class="announcement-right main-content-mode-wp" style="width: calc(100% - 400px);">
 								<div class="announcement-list">
 									<div class="announcement-item">
 										<div class="cover-wp clearfloat">
@@ -368,7 +368,7 @@
 										</div>
 										<div class="content-wp clearfloat">
 											<span class="tips">正文</span>
-											<div id="myeditor_a_1" class="u_editor"></div>
+											<div id="myeditor_a_1" class="u_editor" style=""></div>
 										</div>
 										<div class="summary-wp clearfloat">
 											<span class="tips">摘要</span>

src/main/webapp/scripts/lib/ueditor/ueditor.all.js

@@ -6914,7 +6914,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
                 container.style.zIndex = options.zIndex;
 
                 var html = ( ie && browser.version < 9  ? '' : '<!DOCTYPE html>') +
-                    '<html xmlns=\'http://www.w3.org/1999/xhtml\' class=\'view\' style=\'overflow:hidden\'><head>' +
+                    '<html xmlns=\'http://www.w3.org/1999/xhtml\' class=\'view\' style=\'overflow:auto\'><head>' +
                     '<style type=\'text/css\'>' +
                     //设置四周的留边
                     '.view{padding:0;word-wrap:break-word;cursor:text;height:90%}\n' +
@@ -6941,7 +6941,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
                         'document.write("' + html + '");document.close();}())'
                 }));
                 container.style.overflow = 'hidden';
-                
+
                 //解决如果是给定的百分比，会导致高度算不对的问题
                 setTimeout(function(){
                     if( /%$/.test(options.initialFrameWidth)){
@@ -12667,7 +12667,7 @@ UE.plugins['paragraph'] = function() {
                         } );
                     }
                     tmpRange.setEndAfter( tmpNode );
-                    
+
                     para = range.document.createElement( style );
                     if(attrs){
                         domUtils.setAttributes(para,attrs);
@@ -12679,7 +12679,7 @@ UE.plugins['paragraph'] = function() {
                     //需要内容占位
                     if(domUtils.isEmptyNode(para)){
                         domUtils.fillChar(range.document,para);
-                        
+
                     }
 
                     tmpRange.insertNode( para );
@@ -12803,7 +12803,7 @@ UE.plugins['paragraph'] = function() {
 
         },
         doDirectionality = function(range,editor,forward){
-            
+
             var bookmark,
                 filterFn = function( node ) {
                     return   node.nodeType == 1 ? !domUtils.isBookmarkNode(node) : !domUtils.isWhitespace(node);
@@ -17988,6 +17988,9 @@ UE.plugins['video'] = function (){
     UETable.prototype = {
         getMaxRows:function () {
             var rows = this.table.rows, maxLen = 1;
+            if (rows.length===0) {
+              return maxLen;
+            }
             for (var i = 0, row; row = rows[i]; i++) {
                 var currentMax = 1;
                 for (var j = 0, cj; cj = row.cells[j++];) {
@@ -20249,10 +20252,10 @@ UE.plugins['table'] = function () {
                         // domUtils.removeAttributes(table, ['style', 'border']);
 
                         //2021-09-30修改 如下   参照https://www.cnblogs.com/xiangsj/p/6244794.html
-                
+
                         domUtils.setAttributes(table, {
                             style:'border-left:1px solid #666; border-top:1px solid #666;',
-                        }); 
+                        });
                         removeStyleSize(table, true);
 
                         utils.each(domUtils.getElementsByTagName(table, "td"), function (td) {
@@ -20260,7 +20263,7 @@ UE.plugins['table'] = function () {
                               //粘贴进来的表格td定义属性
                               domUtils.setAttributes(td, {
                                 style:'border-bottom:1px solid #666; border-right:1px solid #666; padding:5px;',
-                            }); 
+                            });
                             if (isEmptyBlock(td)) {
                                 domUtils.fillNode(me.document, td);
                             }
@@ -21132,11 +21135,11 @@ UE.plugins['table'] = function () {
 
         //是否正在等待resize的缓冲中
         isInResizeBuffer = true;
+        tableBorderDrag( evt );
 
-        tableDragTimer = setTimeout(function(){
-            tableBorderDrag( evt );
-        }, dblclickTime);
-
+        // tableDragTimer = setTimeout(function(){
+        //    tableBorderDrag( evt );
+        // }, dblclickTime);
     }
 
     function extractArray( originArr, key ) {
@@ -21195,7 +21198,7 @@ UE.plugins['table'] = function () {
         }
         hideDragLine(me);
         getDragLine(me, me.document);
-        me.fireEvent('saveScene');
+        // me.fireEvent('saveScene');
         showDragLineAt(state, startTd);
         mousedown = true;
         //拖动开始
@@ -22744,7 +22747,7 @@ UE.plugins['formatmatch'] = function(){
      });
 
     function addList(type,evt){
-        
+
         if(browser.webkit){
             var target = evt.target.tagName == 'IMG' ? evt.target : null;
         }
@@ -22810,7 +22813,7 @@ UE.plugins['formatmatch'] = function(){
 
     me.commands['formatmatch'] = {
         execCommand : function( cmdName ) {
-          
+
             if(flag){
                 flag = 0;
                 list = [];
@@ -22819,7 +22822,7 @@ UE.plugins['formatmatch'] = function(){
             }
 
 
-              
+
             var range = me.selection.getRange();
             img = range.getClosedNode();
             if(!img || img.tagName != 'IMG'){
@@ -23996,6 +23999,10 @@ UE.plugin.register('autosave', function (){
 
             'contentchange': function () {
 
+                if (!me.getOpt('enableAutoSave')) {
+                  return;
+                }
+
                 if ( !saveKey ) {
                     return;
                 }
@@ -25294,7 +25301,7 @@ UE.ui = baidu.editor.ui = {};
         domUtils = baidu.editor.dom.domUtils,
         UIBase = baidu.editor.ui.UIBase,
         uiUtils = baidu.editor.ui.uiUtils;
-    
+
     var Mask = baidu.editor.ui.Mask = function (options){
         this.initOptions(options);
         this.initUIBase();
@@ -25590,7 +25597,7 @@ UE.ui = baidu.editor.ui = {};
         }
     };
     utils.inherits(Popup, UIBase);
-    
+
     domUtils.on( document, 'mousedown', function ( evt ) {
         var el = evt.target || evt.srcElement;
         closeAllPopup( evt,el );
@@ -25686,7 +25693,7 @@ UE.ui = baidu.editor.ui = {};
     var utils = baidu.editor.utils,
         uiUtils = baidu.editor.ui.uiUtils,
         UIBase = baidu.editor.ui.UIBase;
-    
+
     var TablePicker = baidu.editor.ui.TablePicker = function (options){
         this.initOptions(options);
         this.initTablePicker();
@@ -25770,7 +25777,7 @@ UE.ui = baidu.editor.ui = {};
     var browser = baidu.editor.browser,
         domUtils = baidu.editor.dom.domUtils,
         uiUtils = baidu.editor.ui.uiUtils;
-    
+
     var TPL_STATEFUL = 'onmousedown="$$.Stateful_onMouseDown(event, this);"' +
         ' onmouseup="$$.Stateful_onMouseUp(event, this);"' +
         ( browser.ie ? (
@@ -25779,7 +25786,7 @@ UE.ui = baidu.editor.ui = {};
         : (
         ' onmouseover="$$.Stateful_onMouseOver(event, this);"' +
         ' onmouseout="$$.Stateful_onMouseOut(event, this);"' ));
-    
+
     baidu.editor.ui.Stateful = {
         alwalysHoverable: false,
         target:null,//目标元素和this指向dom不一样
@@ -27404,7 +27411,7 @@ UE.ui = baidu.editor.ui = {};
         setValue : function(value){
             this._value = value;
         }
-        
+
     };
     utils.inherits(MenuButton, SplitButton);
 })();

src/main/webapp/scripts/lib/ueditor/ueditor.config.js

@@ -101,7 +101,7 @@
         //,autoClearEmptyNode : true //getContent时，是否删除空的inlineElement节点（包括嵌套的情况）
 
         //启用自动保存
-        //,enableAutoSave: true
+        ,enableAutoSave: false
         //自动保存间隔时间， 单位ms
         //,saveInterval: 500
 
@@ -148,31 +148,31 @@
 
         //insertorderedlist
         //有序列表的下拉配置,值留空时支持多语言自动识别，若配置值，则以此值为准
-        //,'insertorderedlist':{
-        //      //自定的样式
-        //        'num':'1,2,3...',
-        //        'num1':'1),2),3)...',
-        //        'num2':'(1),(2),(3)...',
-        //        'cn':'一,二,三....',
-        //        'cn1':'一),二),三)....',
-        //        'cn2':'(一),(二),(三)....',
-        //     //系统自带
-        //     'decimal' : '' ,         //'1,2,3...'
-        //     'lower-alpha' : '' ,    // 'a,b,c...'
-        //     'lower-roman' : '' ,    //'i,ii,iii...'
-        //     'upper-alpha' : '' , lang   //'A,B,C'
-        //     'upper-roman' : ''      //'I,II,III...'
-        //}
+        ,'insertorderedlist':{
+             // //自定的样式
+             //   'num':'1,2,3...',
+             //   'num1':'1),2),3)...',
+             //   'num2':'(1),(2),(3)...',
+             //   'cn':'一,二,三....',
+             //   'cn1':'一),二),三)....',
+             //   'cn2':'(一),(二),(三)....',
+            //系统自带
+            'decimal' : '' ,         //'1,2,3...'
+            'lower-alpha' : '' ,    // 'a,b,c...'
+            'lower-roman' : '' ,    //'i,ii,iii...'
+            'upper-alpha' : '' ,    //'A,B,C'
+            'upper-roman' : ''      //'I,II,III...'
+        }
 
         //insertunorderedlist
         //无序列表的下拉配置，值留空时支持多语言自动识别，若配置值，则以此值为准
-        //,insertunorderedlist : { //自定的样式
-        //    'dash' :'— 破折号', //-破折号
-        //    'dot':' 。 小圆圈', //系统自带
-        //    'circle' : '',  // '○ 小圆圈'
-        //    'disc' : '',    // '● 小圆点'
-        //    'square' : ''   //'■ 小方块'
-        //}
+        ,insertunorderedlist : { //自定的样式
+           // 'dash' :'— 破折号', //-破折号
+           // 'dot':' 。 小圆圈', //系统自带
+           'circle' : '',  // '○ 小圆圈'
+           'disc' : '',    // '● 小圆点'
+           'square' : ''   //'■ 小方块'
+        }
         //,listDefaultPaddingLeft : '30'//默认的左边缩进的基数倍
         //,listiconpath : 'http://bs.baidu.com/listicon/'//自定义标号的路径
         //,maxListLevel : 3 //限制可以tab的级数, 设置-1为不限制

src/main/webapp/styles/notice/noticeAppPublish.css

@@ -5,7 +5,8 @@
 	float:left;
 }
 .main-content-mode-wp .u_editor{
-	width: 470px;
+	width: 80%;
+	min-width: 470px;
 	float:left;
 }
 .notice-form{