[代码完善](v2.5): v2.5 beta 更新 fastjson 版本，代码优化

elunez · elunez · commit 3d53a3a0ec6d · 2020-06-04T10:28:14.000+08:00
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java
@@ -19,7 +19,7 @@ public class RsaUtils {
 
     public static void main(String[] args) throws Exception {
         System.out.println("\n");
-        RSAKeyPair keyPair = generateKeyPair();
+        RsaKeyPair keyPair = generateKeyPair();
         System.out.println("公钥：" + keyPair.getPublicKey());
         System.out.println("私钥：" + keyPair.getPrivateKey());
         System.out.println("\n");
@@ -32,7 +32,7 @@ public static void main(String[] args) throws Exception {
     /**
      * 公钥加密私钥解密
      */
-    private static void test1(RSAKeyPair keyPair) throws Exception {
+    private static void test1(RsaKeyPair keyPair) throws Exception {
         System.out.println("***************** 公钥加密私钥解密开始 *****************");
         String text1 = encryptByPublicKey(keyPair.getPublicKey(), RsaUtils.SRC);
         String text2 = decryptByPrivateKey(keyPair.getPrivateKey(), text1);
@@ -51,7 +51,7 @@ private static void test1(RSAKeyPair keyPair) throws Exception {
      * 私钥加密公钥解密
      * @throws Exception /
      */
-    private static void test2(RSAKeyPair keyPair) throws Exception {
+    private static void test2(RsaKeyPair keyPair) throws Exception {
         System.out.println("***************** 私钥加密公钥解密开始 *****************");
         String text1 = encryptByPrivateKey(keyPair.getPrivateKey(), RsaUtils.SRC);
         String text2 = decryptByPublicKey(keyPair.getPublicKey(), text1);
@@ -143,27 +143,27 @@ public static String encryptByPublicKey(String publicKeyText, String text) throw
      * @return /
      * @throws NoSuchAlgorithmException /
      */
-    public static RSAKeyPair generateKeyPair() throws NoSuchAlgorithmException {
+    public static RsaKeyPair generateKeyPair() throws NoSuchAlgorithmException {
         KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
         keyPairGenerator.initialize(1024);
         KeyPair keyPair = keyPairGenerator.generateKeyPair();
         RSAPublicKey rsaPublicKey = (RSAPublicKey) keyPair.getPublic();
         RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) keyPair.getPrivate();
         String publicKeyString = Base64.encodeBase64String(rsaPublicKey.getEncoded());
         String privateKeyString = Base64.encodeBase64String(rsaPrivateKey.getEncoded());
-        return new RSAKeyPair(publicKeyString, privateKeyString);
+        return new RsaKeyPair(publicKeyString, privateKeyString);
     }
 
 
     /**
      * RSA密钥对对象
      */
-    public static class RSAKeyPair {
+    public static class RsaKeyPair {
 
         private final String publicKey;
         private final String privateKey;
 
-        public RSAKeyPair(String publicKey, String privateKey) {
+        public RsaKeyPair(String publicKey, String privateKey) {
             this.publicKey = publicKey;
             this.privateKey = privateKey;
         }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java
@@ -62,7 +62,7 @@ public class AuthorizationController {
 
     @Value("${loginCode.expiration}")
     private Long expiration;
-    @Value("${single.login:false}")
+    @Value("${single.login}")
     private Boolean singleLogin;
     private final SecurityProperties properties;
     private final RedisUtils redisUtils;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java
@@ -26,7 +26,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Set;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java
@@ -114,6 +114,7 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
 
     /**
      * 根据角色查询
+     * @param ids /
      * @return /
      */
     @Query(value = "SELECT count(1) FROM sys_user u, sys_users_roles r WHERE " +
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
@@ -78,8 +78,8 @@ public Object queryAll(RoleQueryCriteria criteria, Pageable pageable) {
     }
 
     @Override
-    @Transactional
     @Cacheable(key = "'id:' + #p0")
+    @Transactional(rollbackFor = Exception.class)
     public RoleDto findById(long id) {
         Role role = roleRepository.findById(id).orElseGet(Role::new);
         ValidationUtil.isNull(role.getId(),"Role","id",id);
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
@@ -68,8 +68,8 @@ public List<UserDto> queryAll(UserQueryCriteria criteria) {
     }
 
     @Override
-    @Transactional
     @Cacheable(key = "'id:' + #p0")
+    @Transactional(rollbackFor = Exception.class)
     public UserDto findById(long id) {
         User user = userRepository.findById(id).orElseGet(User::new);
         ValidationUtil.isNull(user.getId(),"User","id",id);
@@ -177,7 +177,7 @@ public Map<String, String> updateAvatar(MultipartFile multipartFile) {
             FileUtil.del(oldPath);
         }
         redisUtils.del("user::username:" + user.getUsername());
-        return new HashMap<String,String>(){{put("avatar",file.getName());}};
+        return new HashMap<String,String>(1){{put("avatar",file.getName());}};
     }
 
     @Override
diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml
@@ -43,6 +43,11 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+
+# 是否限制单用户登录
+single:
+  login: false
+
 #jwt
 jwt:
   header: Authorization
diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml
@@ -45,6 +45,11 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+
+# 是否限制单用户登录
+single:
+  login: false
+
 #jwt
 jwt:
   header: Authorization
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java
@@ -27,9 +27,10 @@ public interface EmailService {
 
     /**
      * 更新邮件配置
-     * @param emailConfig 邮件配置
-     * @param old 旧的配置
-     * @return EmailConfig
+     * @param emailConfig 邮箱配置
+     * @param old /
+     * @return /
+     * @throws Exception /
      */
     EmailConfig config(EmailConfig emailConfig, EmailConfig old) throws Exception;
 
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
         <java.version>1.8</java.version>
         <log4jdbc.version>1.16</log4jdbc.version>
         <swagger.version>2.9.2</swagger.version>
-        <fastjson.version>1.2.68</fastjson.version>
+        <fastjson.version>1.2.70</fastjson.version>
         <druid.version>1.1.22</druid.version>
         <commons-pool2.version>2.5.0</commons-pool2.version>
         <mapstruct.version>1.3.1.Final</mapstruct.version>

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ public Object queryAll(RoleQueryCriteria criteria, Pageable pageable) {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`@Override`
`81`		`- @Transactional`
`82`	`81`	`@Cacheable(key = "'id:' + #p0")`
	`82`	`+ @Transactional(rollbackFor = Exception.class)`
`83`	`83`	`public RoleDto findById(long id) {`
`84`	`84`	`Role role = roleRepository.findById(id).orElseGet(Role::new);`
`85`	`85`	`ValidationUtil.isNull(role.getId(),"Role","id",id);`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ public List<UserDto> queryAll(UserQueryCriteria criteria) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Override`
`71`		`- @Transactional`
`72`	`71`	`@Cacheable(key = "'id:' + #p0")`
	`72`	`+ @Transactional(rollbackFor = Exception.class)`
`73`	`73`	`public UserDto findById(long id) {`
`74`	`74`	`User user = userRepository.findById(id).orElseGet(User::new);`
`75`	`75`	`ValidationUtil.isNull(user.getId(),"User","id",id);`
`@@ -177,7 +177,7 @@ public Map<String, String> updateAvatar(MultipartFile multipartFile) {`
`177`	`177`	`FileUtil.del(oldPath);`
`178`	`178`	`}`
`179`	`179`	`redisUtils.del("user::username:" + user.getUsername());`
`180`		`- return new HashMap<String,String>(){{put("avatar",file.getName());}};`
	`180`	`+ return new HashMap<String,String>(1){{put("avatar",file.getName());}};`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`@Override`