Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/RabbitConfig.java

@@ -2,6 +2,13 @@ package com.usoftchina.smartschool.wechat.config;
 
 
 import org.springframework.amqp.core.*;
+import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.support.converter.ContentTypeDelegatingMessageConverter;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -70,4 +77,30 @@ public class RabbitConfig {
     Binding delayBind(Queue createDelayQueue, TopicExchange createExchange) {
         return BindingBuilder.bind(createDelayQueue).to(createExchange).with(delayKey);
     }
+
+    @Bean
+    public RabbitAdmin rabbitTemplate(ConnectionFactory connectionFactory) {
+        return new RabbitAdmin(connectionFactory);
+    }
+
+    @Bean
+    public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, MessageConverter messageConverter) {
+        RabbitTemplate template = new RabbitTemplate(connectionFactory);
+        template.setMessageConverter(messageConverter);
+        return template;
+    }
+
+    @Bean
+    public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(ConnectionFactory connectionFactory, MessageConverter messageConverter) {
+        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+        factory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
+        factory.setConnectionFactory(connectionFactory);
+        factory.setMessageConverter(messageConverter);
+        return factory;
+    }
+
+    @Bean
+    public MessageConverter messageConverter() {
+        return new ContentTypeDelegatingMessageConverter(new Jackson2JsonMessageConverter());
+    }
 }

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/service/impl/WxPushServiceImpl.java

@@ -2,12 +2,14 @@ package com.usoftchina.smartschool.wechat.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.github.kevinsawicki.http.HttpRequest;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import com.usoftchina.smartschool.base.Result;
 import com.usoftchina.smartschool.wechat.po.MessageInfo;
 import com.usoftchina.smartschool.wechat.service.WxPushService;
 import com.usoftchina.smartschool.wechat.wxUtils.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -102,6 +104,13 @@ public class WxPushServiceImpl implements WxPushService{
                     .send(json.getBytes());
             String result= hRequest.body();
             logger.info("result={}", result);
+            /**
+              result={"errcode":0,"errmsg":"ok","msgid":716510485381890048}
+             */
+           /* if ("ok".equals(JSON.parseObject(result).getString("errmsg"))) {
+                return Result.success();
+            }
+            return Result.error(JSON.parseObject(result).getString("errmsg"));*/
             if (result.equals("error")) {
                 Result.error(result);
             }

frontend/pc-web/app/view/Interaction/timetable/List.js

@@ -156,7 +156,8 @@ Ext.define('school.view.interaction.timetable.List', {
 
                         grid.setLoading(true);
                         school.util.BaseUtil.request({
-                            url: '/api/school/curriculum/deleteDetail',
+                            // url: 'http://10.1.80.36:9520/api/school/curriculum/batchDelete',
+                            url: '/api/school/curriculum/batchDelete',
                             method: 'POST',
                             params: JSON.stringify({
                                 baseDTOs: data