加入SSO配置

donate-service/src/main/java/com/uas/service/donate/Application.java

@@ -1,8 +1,11 @@
 package com.uas.service.donate;
 
+import com.uas.service.donate.util.ContextUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -14,6 +17,12 @@ public class Application {
 
     public static void main(String[] args){
         SpringApplication application=new SpringApplication(Application.class);
+        application.addListeners(new ApplicationListener<ApplicationPreparedEvent>() {
+            @Override
+            public void onApplicationEvent(ApplicationPreparedEvent event) {
+                ContextUtils.setApplicationContext(event.getApplicationContext());
+            }
+        });
         application.run(args);
     }
 }

donate-service/src/main/java/com/uas/service/donate/SSOConfiguration.java

@@ -0,0 +1,73 @@
+package com.uas.service.donate;
+
+import com.uas.account.web.AccountConfigurer;
+import com.uas.service.donate.profile.Dev;
+import com.uas.service.donate.profile.Prod;
+import com.uas.service.donate.profile.Test;
+import com.uas.service.donate.util.ContextUtils;
+import com.uas.service.donate.web.filter.SSOInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import java.util.Properties;
+
+
+/**
+ * SSOconfig 配置
+ *
+ * @author hejq
+ */
+@Configuration
+public class SSOConfiguration extends WebMvcConfigurerAdapter {
+
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        /**
+         * 拦截器配置
+         */
+//        registry.addInterceptor(new SSOInterceptor()).addPathPatterns("/**").
+//                excludePathPatterns("/WEB-INF/**","/**/static/**", "/login/**", "/logout/**");
+    }
+
+    @Bean
+    @Dev
+    public AccountConfigurer devAccountConfigurer() {
+        return accountConfigurer("dev");
+    }
+
+    @Bean
+    @Test
+    public AccountConfigurer testAccountConfigurer() {
+        return accountConfigurer("test");
+    }
+
+    @Bean
+    @Prod
+    public AccountConfigurer prodAccountConfigurer() {
+        return accountConfigurer("prod");
+    }
+
+    /**
+     * 获取当前环境下的配置
+     *
+     * @param profile
+     * @return
+     */
+    private AccountConfigurer accountConfigurer(String profile) {
+        AccountConfigurer accountConfigurer = new AccountConfigurer();
+        accountConfigurer.setApplicationContext(ContextUtils.getApplicationContext());
+        Properties properties = new Properties();
+        String configPath = profile + "/account.properties";
+        try {
+            properties.load(this.getClass().getClassLoader().getResourceAsStream(configPath));
+        } catch (Throwable e) {
+            throw new IllegalStateException("配置加载失败" + configPath);
+        }
+        accountConfigurer.initProperties(properties);
+        return accountConfigurer;
+    }
+
+}

donate-service/src/main/java/com/uas/service/donate/util/FastjsonUtils.java

@@ -0,0 +1,94 @@
+package com.uas.service.donate.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import java.util.List;
+
+/**
+ * alibaba fastjson工具类封装
+ * @author yingp
+ * @see JSON
+ *
+ */
+public class FastjsonUtils {
+
+	public static Feature DEFAULT_PARSER_FEATURE = Feature.DisableCircularReferenceDetect;
+	public static SerializerFeature DEFAULT_SERIAL_FEATURE = SerializerFeature.DisableCircularReferenceDetect;
+
+	/**
+	 * 把JSON文本parse为JSONObject或者JSONArray
+	 * 
+	 * @param text
+	 * @return
+	 */
+	public static Object parse(String text) {
+		return JSON.parse(text, DEFAULT_PARSER_FEATURE);
+	}
+
+	/**
+	 * 把JSON文本parse成JSONObject
+	 * 
+	 * @param text
+	 * @return
+	 */
+	public static final JSONObject parseObject(String text) {
+		return JSON.parseObject(text, DEFAULT_PARSER_FEATURE);
+	}
+
+	/**
+	 * 把JSON文本parse为JavaBean
+	 * 
+	 * @param text
+	 * @param clazz
+	 * @return
+	 */
+	public static final <T> T fromJson(String text, Class<T> clazz) {
+		return JSON.parseObject(text, clazz, DEFAULT_PARSER_FEATURE);
+	}
+
+	/**
+	 * 把JSON文本parse成JSONArray
+	 * 
+	 * @param text
+	 * @return
+	 */
+	public static final JSONArray fromJsonArray(String text) {
+		return JSON.parseArray(text);
+	}
+
+	/**
+	 * 把JSON文本parse成JavaBean集合
+	 * 
+	 * @param text
+	 * @param clazz
+	 * @return
+	 */
+	public static final <T> List<T> fromJsonArray(String text, Class<T> clazz) {
+		return JSON.parseArray(text, clazz);
+	}
+
+	/**
+	 * 将JavaBean序列化为JSON文本
+	 * 
+	 * @param object
+	 * @return
+	 */
+	public static final String toJson(Object object) {
+		return JSON.toJSONString(object, DEFAULT_SERIAL_FEATURE);
+	}
+
+	/**
+	 * 将JavaBean转换为JSONObject或者JSONArray。
+	 * 
+	 * @param javaObject
+	 * @return
+	 */
+	public static final Object toJSON(Object javaObject) {
+		return JSON.toJSON(javaObject);
+	}
+
+}

donate-service/src/main/java/com/uas/service/donate/web/filter/SSOInterceptor.java

@@ -1,8 +1,8 @@
 package com.uas.service.donate.web.filter;
 
 import com.uas.account.entity.UserView;
-import com.uas.console.donate.core.support.SystemSession;
-import com.uas.console.donate.util.FastjsonUtils;
+import com.uas.service.donate.core.support.SystemSession;
+import com.uas.service.donate.util.FastjsonUtils;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
 import com.uas.sso.web.spring.AbstractSSOInterceptor;

donate-service/src/main/resources/templates/activeCenter.ftl

@@ -105,6 +105,10 @@
         .banner img{
             width: 100%;
         }
+        .banner .carousel-inner img{
+            max-width: 820px;
+            max-height: 340px;
+        }
         .banner .carousel-indicators{
             bottom: 0;
             text-align: center;
@@ -500,8 +504,8 @@
                         <div class="fl">
                             <span class="award">
                                 <#list activity.awards as award>
-                                    <span>${award.awardLevel!''}:</span>
-                                    <span>${award.awardName!''}</span>
+                                    <span>${award.awardLevel!''} :</span>
+                                    <span>&nbsp;${award.awardName!''}</span>
                                     <span><#if award.amount?exists>&nbsp;(${award.amount}份)</#if></span>
                                 </#list>
                             </span>
@@ -510,7 +514,7 @@
                     <div><span>参与时间：</span><span class="partTime">${activity.startTime}至${activity.endTime}</span></div>
                 </div>
                 <div class="project-progress fr">
-                    <span><#if activity.stage=='兑奖中'><span>兑奖截止日期</span><p>${activity.receiveEndTime}</p><#elseif activity.stage=='待开奖'><span class=".await">${activity.stage}</span><#else>${activity.stage}</#if></span>
+                    <span><#if activity.stage=='兑奖中'><span>兑奖截止日期</span><p>${activity.receiveEndTime}</p><#elseif activity.stage=='待开奖'><span class="await">${activity.stage}</span><#else>${activity.stage}</#if></span>
                 </div>
             </div>
             </#list>

donate-service/src/main/resources/templates/index.ftl

@@ -811,8 +811,8 @@
                 <div class="project-progress fr">
                     <div><span>状态：<em>${project.overdue!''}</em></span></div>
                     <div><span>参与：<em>${project.joinAmount!'0'}</em>人</span></div>
-                    <div><span>筹款：<em class="red">${project.totalAmount!'0'}</em>元</span></div>
-                    <div><span>进度：<#if project.target?exists><#if project.totalAmount?exists>(${(project.totalAmount/project.target*100)?string(',###.00')!''}%)</#if></#if></span></div>
+                    <div><span>筹款：<em class="red">${project.totalAmount?string(',##0.00')!'0'}</em>元</span></div>
+                    <div><span>进度：<#if project.target?exists><#if project.totalAmount?exists>(${(project.totalAmount/project.target*100)?string('0.00')!''}%)</#if></#if></span></div>
                 </div>
                     <#if project.overdue=="已结束">
                         <a class="fr donationOver">我要捐款</a>

donate-service/src/main/webapp/resources/css/kkpager_orange.css

@@ -103,7 +103,7 @@
 #kkpager .infoTextAndGoPageBtnWrap{
 	margin-left: 15px;
 	padding-top: 0;
-	float: left;
+	float: right;
 }
 #kkpager .spanDot{
 	float:left;