ws 3 gadi atpakaļ
vecāks
revīzija
411c7b9b2e

+ 1 - 0
nngkxxdp/src/main/java/com/example/nngkxxdp/elk/ElkController.java

@@ -144,6 +144,7 @@ public class ElkController {
             for (int i = 0; i < query.length; i++) {
                 hb.field(query[i]);
             }
+            hb.numOfFragments(0);
             searchSourceBuilder.highlighter(hb);
         }
         // 排序

+ 1 - 1
nngkxxdp/src/main/java/com/example/nngkxxdp/util/WebsiteSmsUtil.java

@@ -45,7 +45,7 @@ public class WebsiteSmsUtil {
 	* @return void   
 	* @throws
 	 */
-	@Scheduled(cron = "0 0 08 10 * ?")
+//	@Scheduled(cron = "0 0 08 10 * ?")
 	public void task() {
 		StaticLog.info("==============================================================");
 		StaticLog.info("开始执行每月网站考评短信发送任务");

+ 1 - 0
nngkxxdp/src/main/resources/application-prod.yml

@@ -24,5 +24,6 @@ elasticsearch:
   ip: localhost:9200
   # 索引名
   index: elk_article
+  index2: article_library
 
 

+ 1 - 0
nngkxxdp/src/main/resources/mapper/SmsMessageDao.xml

@@ -68,6 +68,7 @@
 		LIMIT 999999999
 		) b
 		GROUP BY b.id
+		ORDER BY b.send_time DESC
     </select>
     
     <select id="getCountWechatSmsDetail" resultType="java.lang.Integer">

+ 1 - 1
nngkxxdp/src/main/resources/static/page/js/base/fbtx.item.js

@@ -630,7 +630,7 @@ function initSmsTableDetail(staffName, leadName, wechat, id) {
 			return (d.type == 1 ? leadName : staffName) + smsContent.replace('{wechat}', wechat).replace('{day}', d.type == 1 ? '12' : '10');
 		}},
 		{title: '发送状态', width: '12%', templet: function(d) {
-			return d.is_success == 1 ? '发送成功' : '未发送成功';
+			return d.isSuccess == 1 ? '发送成功' : '未发送成功';
 		}}
     ]]
 	});