hangb 8 лет назад
Родитель
Сommit
f3c19c8976

+ 2 - 3
donate-console/src/main/java/com/uas/console/donate/SSOConfiguration.java

@@ -5,7 +5,6 @@ import com.uas.console.donate.profile.Dev;
 import com.uas.console.donate.profile.Prod;
 import com.uas.console.donate.profile.Test;
 import com.uas.console.donate.util.ContextUtils;
-import com.uas.console.donate.web.filter.SSOInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -28,8 +27,8 @@ public class SSOConfiguration extends WebMvcConfigurerAdapter {
         /**
          * 拦截器配置
          */
-        registry.addInterceptor(new SSOInterceptor()).addPathPatterns("/**").
-                excludePathPatterns("/WEB-INF/**","/**/static/**", "/login/**", "/logout/**");
+//        registry.addInterceptor(new SSOInterceptor()).addPathPatterns("/**").
+//                excludePathPatterns("/WEB-INF/**","/**/static/**", "/login/**", "/logout/**");
     }
 
     @Bean

+ 38 - 0
donate-service/src/main/java/com/uas/service/donate/controller/MessageSendController.java

@@ -0,0 +1,38 @@
+package com.uas.service.donate.controller;
+
+
+import com.uas.service.donate.service.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 发送消息提醒
+ * Created by dongbw
+ * 17/09/28 17:23.
+ */
+@Controller
+@RequestMapping("/message")
+public class MessageSendController {
+
+    @Autowired
+    private MessageService messageService;
+
+    /**
+     * 发送邮件接口
+     */
+    public ResponseEntity<String> sendMail (String receivedMail, Map<String, Object> model) {
+        return messageService.sendMail(receivedMail, model);
+    }
+
+    /**
+     * 发送短信接口
+     */
+    public ResponseEntity<String> sendMessage(String receiverTel, List<Object> obj) {
+        return messageService.sendMessage(receiverTel, obj);
+    }
+}

+ 3 - 2
donate-service/src/main/java/com/uas/service/donate/service/MessageService.java

@@ -5,10 +5,11 @@ import org.springframework.http.ResponseEntity;
 import java.util.List;
 import java.util.Map;
 
-/**
+/*
  * Created by dongbw
  * 17/09/27 16:25.
- */
+ **/
+
 public interface MessageService {
 
     ResponseEntity<String> sendMail(String receivedEmail, Map<String, Object> model);

+ 1 - 1
donate-service/src/main/webapp/WEB-INF/views/personalCenter.html

@@ -97,7 +97,7 @@
             padding-bottom: 15px;
             width: 100%;
             text-align: left;
-            border-bottom: 2px solid #efb13b;
+            border-bottom: 2px solid #ef613b;
         }
         .section .nav span:first-child a{
             font-size: 14px;

+ 1 - 1
donate-service/src/main/webapp/WEB-INF/views/projectDetailsAndProgress.html

@@ -106,7 +106,7 @@
             color: #303030;
         }
         .section1 .evolve{
-            border-top: 2px solid #efb13b;
+            border-top: 2px solid #ef613b;
         }
         .section1 .evolve .img{
             width: 560px;

+ 1 - 1
donate-service/src/main/webapp/WEB-INF/views/projectProcessInstruction.html

@@ -95,7 +95,7 @@
             padding-bottom: 10px;
             width: 100%;
             text-align: left;
-            border-bottom: 2px solid #efb13b;
+            border-bottom: 2px solid #ef613b;
         }
         .section1 .nav span:first-child a{
             font-size: 14px;

+ 1 - 1
donate-service/src/main/webapp/resources/view/project/project_detail.html

@@ -93,7 +93,7 @@
         color: #303030;
     }
     .section1 .evolve{
-        border-top: 2px solid #efb13b;
+        border-top: 2px solid #ef613b;
     }
     .section1 .evolve .img{
         width: 560px;

+ 1 - 1
donate-service/src/main/webapp/resources/view/user/user_center.html

@@ -81,7 +81,7 @@
         padding-bottom: 15px;
         width: 100%;
         text-align: left;
-        border-bottom: 2px solid #efb13b;
+        border-bottom: 2px solid #ef613b;
     }
     .section .nav span:first-child a{
         font-size: 14px;