1.单点登录到子系统

eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java

@@ -30,9 +30,15 @@ import org.springframework.stereotype.Component;
 public class RsaProperties {
 
     public static String privateKey;
+    public static String publicKey;
 
     @Value("${rsa.private_key}")
     public void setPrivateKey(String privateKey) {
         RsaProperties.privateKey = privateKey;
     }
+
+    @Value("${rsa.public_key}")
+    public void setPublicKey(String publicKey) {
+        RsaProperties.publicKey = publicKey;
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.config.RsaProperties;
 import me.zhengjie.modules.dm.card.domain.DmCard;
 import me.zhengjie.modules.dm.card.service.DmCardService;
 import me.zhengjie.modules.dm.card.service.dto.DmCardDto;
@@ -40,6 +41,7 @@ import me.zhengjie.modules.system.service.DeptService;
 import me.zhengjie.modules.system.service.UserService;
 import me.zhengjie.modules.system.service.dto.DeptDto;
 import me.zhengjie.modules.system.service.dto.UserDto;
+import me.zhengjie.utils.RsaUtils;
 import me.zhengjie.utils.SecurityUtils;
 import me.zhengjie.utils.StringUtils;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -71,7 +73,7 @@ public class ZkDataSyncTask {
     private final DmRoomDeviceRepository dmRoomDeviceRepository;
     private final DmCardService dmCardService;
 
-    public void run() {
+    public void run() throws Exception {
         log.info("deptSync 执行开始");
         deptSync();
         log.info("deptSync 执行结束");
@@ -205,7 +207,6 @@ public class ZkDataSyncTask {
 
                 user.setEmail(item.getString("email"));
                 user.setPhone(item.getString("mobile"));
-                user.setPassword(passwordEncoder.encode("12345678"));
                 user.setEnabled(item.getInteger("userStatus") == 1);
                 user.setIsAdmin(false);
                 user.setOrgPassword("12345678");
@@ -266,6 +267,7 @@ public class ZkDataSyncTask {
                     if (userDto != null) {
                         userService.updateSync(user);
                     } else {
+                        user.setPassword(passwordEncoder.encode("12345678"));
                         userService.createSync(user);
                     }
                 } catch (Exception e) {

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java

@@ -196,4 +196,10 @@ public interface UserRepository extends JpaRepository<User, String>, JpaSpecific
     @Query(value = "update sys_user set avatar_name = ?3 ,avatar_path = ?2 where user_id = ?1",nativeQuery = true)
      int updateUser(String userId, String path, String realName);
 
+    /**
+     * 根据账号查询密码
+     * @param username
+     */
+    @Query(value = "select `password` from sys_user where username = :username",nativeQuery = true)
+    String findPassWord(@Param("username")String username);
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java

@@ -207,4 +207,11 @@ public class UserController {
         userService.unBindDmUser(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @ApiOperation("根据账号查询密码")
+    @GetMapping(value = "/findPassWord")
+    @Log("根据账号查询密码")
+    public ResponseEntity<Object> findPassWord(String username){
+        return new ResponseEntity<>(userService.findPassWord(username),HttpStatus.OK);
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java

@@ -140,4 +140,10 @@ public interface UserService {
      * @param ids
      */
     void unBindDmUser(Set<String> ids) throws Exception;
+
+    /**
+     * 根据账号查询密码
+     * @param username
+     */
+    String findPassWord(String username);
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -401,6 +401,11 @@ public class UserServiceImpl implements UserService {
         return resources;
     }
 
+    @Override
+    public String findPassWord(String username) {
+        return userRepository.findPassWord(username);
+    }
+
     /**
      * 解绑用户
      * @param ids

eladmin-system/src/main/resources/config/application-dev.yml

@@ -124,8 +124,8 @@ file:
     path: ~/file/
     avatar: ~/avatar/
   linux:
-    path: /home/eladmin/file/
-    avatar: /home/eladmin/avatar/
+    path:  /app/static/zkxtres
+    avatar:  /app/static/zkxtres
   windows:
     path: C:\eladmin\file\
     avatar: C:\eladmin\avatar\

eladmin-system/src/main/resources/config/application.yml

@@ -69,3 +69,4 @@ code:
 #密码加密传输，前端公钥加密，后端私钥解密
 rsa:
   private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
+  public_key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ==