templates

src/main/java/com/jh/boot/template/HibernateLoaderTemplateService.java

@@ -33,7 +33,9 @@ public class HibernateLoaderTemplateService implements TemplateService {
 		if (valuesConfig != null) {
 			values.putAll(valuesConfig.getValues());
 		}
-		values.putAll(data);
+		if (data != null) {
+			values.putAll(data);
+		}
 		
 		String content = t.getTemplate();
 		StringWriter sw = new StringWriter();

src/main/java/com/jh/boot/template/HibernateTemplateLoader.java

@@ -4,6 +4,7 @@ import java.util.Locale;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 public class HibernateTemplateLoader implements TemplateLoader {
 
@@ -14,11 +15,14 @@ public class HibernateTemplateLoader implements TemplateLoader {
 	@Override
 	@Transactional
 	public Template loadTemplate(String code, Locale locale) {
-		String l = locale == null ? null : (locale.getLanguage() + "-" + locale.getCountry());
-		Template t = repository.loadTemplate(code, l);
-		//TODO refactor
-		if (t == null) {
-			t = repository.loadTemplate(code, locale.getLanguage());
+		Template t = null;
+		if (locale != null) {
+			if (StringUtils.hasText(locale.getCountry())) {
+				t = repository.loadTemplate(code, locale.getLanguage() + "-" + locale.getCountry());
+			}
+			if (t == null) {
+				t = repository.loadTemplate(code, locale.getLanguage());
+			}
 		}
 		if (t == null) {
 			t = repository.loadTemplate(code, null);