From 5a88fee3918b49aca9f163f4bc79bea99e09a6fc Mon Sep 17 00:00:00 2001
From: zhengjie <zhengjie@tom.com>
Date: Tue, 16 Apr 2019 12:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Demail=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/me/zhengjie/swagger2/SwaggerConfig.java   | 6 +++++-
 .../modules/system/repository/PermissionRepository.java     | 2 --
 .../java/me/zhengjie/service/impl/AlipayServiceImpl.java    | 2 +-
 .../java/me/zhengjie/service/impl/EmailServiceImpl.java     | 3 +--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java b/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
index 64682e3a..405f9609 100644
--- a/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
+++ b/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
@@ -1,6 +1,7 @@
 package me.zhengjie.swagger2;
 
 import com.google.common.base.Predicates;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -25,11 +26,14 @@ import java.util.List;
 @EnableSwagger2
 public class SwaggerConfig {
 
+    @Value("${jwt.header}")
+    private String tokenHeader;
+
     @Bean
     public Docket createRestApi() {
         ParameterBuilder ticketPar = new ParameterBuilder();
         List<Parameter> pars = new ArrayList<Parameter>();
-        ticketPar.name("Authorization").description("token")
+        ticketPar.name(tokenHeader).description("token")
                 .modelRef(new ModelRef("string"))
                 .parameterType("header")
                 .defaultValue("Bearer ")
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java
index 0cad1f4b..5d393431 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java
@@ -29,7 +29,5 @@ public interface PermissionRepository extends JpaRepository<Permission, Long>, J
      */
     List<Permission> findByPid(long pid);
 
-    Set<Permission> findByRoles_Id(Long id);
-
     Set<Permission> findByRoles(Set<Role> roles);
 }
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java
index 67c52677..4257b4bc 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java
@@ -126,6 +126,6 @@ public class AlipayServiceImpl implements AlipayService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AlipayConfig update(AlipayConfig alipayConfig) {
-        return alipayRepository.saveAndFlush(alipayConfig);
+        return alipayRepository.save(alipayConfig);
     }
 }
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java
index a413e250..7d3a79fc 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java
@@ -37,8 +37,7 @@ public class EmailServiceImpl implements EmailService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        emailRepository.saveAndFlush(emailConfig);
-        return emailConfig;
+        return emailRepository.save(emailConfig);
     }
 
     @Override