修改定时获取人员定时任务

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/domain/DmUser.java

@@ -60,6 +60,10 @@ public class DmUser extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "姓名")
     private String name;
 
+    @Column(name = "username",nullable = false)
+    @ApiModelProperty(value = "账号")
+    private String username;
+
     @Column(name = "sex")
     @ApiModelProperty(value = "性别")
     private String sex;

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/service/dto/DmUserDto.java

@@ -43,6 +43,9 @@ public class DmUserDto extends BaseDTO implements Serializable {
     /** 姓名 */
     private String name;
 
+    /** 账号 */
+    private String username;
+
     /** 性别 */
     private String sex;
 

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

@@ -45,7 +45,7 @@ public class AnnounceTask {
             DmMessageSendLog dmMessageSendLog = new DmMessageSendLog();
             dmMessageSendLog.setSystemName("中控平台");
             dmMessageSendLog.setSendId("dm_announce|id|"+dmAnnounce.getId());
-            dmMessageSendLog.setSendUserId(userService.findByName(dmAnnounce.getCreateBy()).getId());
+            dmMessageSendLog.setSendUserId("System");
             JSONObject sendContentJSON = new JSONObject();
             sendContentJSON.put("text",dmAnnounce.getAnnounceContent());
             dmMessageSendLog.setSendContent(sendContentJSON);

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

@@ -237,6 +237,7 @@ public class ZkDataSyncTask {
                 dmUser.setEmail(user.getEmail());
                 dmUser.setContacts(user.getPhone());
                 dmUser.setName(user.getNickName());
+                dmUser.setUsername(user.getUsername());
                 dmUser.setSex(user.getGender());
                 dmUser.setUserNumber(user.getUserCode());
                 dmUser.setStatus(user.getEnabled());
@@ -266,8 +267,9 @@ public class ZkDataSyncTask {
                     userDto = userService.findById(user.getId());
                     if (userDto != null) {
                         userService.updateSync(user);
+                        user.setPassword(RsaUtils.encryptByPrivateKey(RsaProperties.privateKey, "12345678"));
                     } else {
-                        user.setPassword(passwordEncoder.encode("12345678"));
+                        user.setPassword(RsaUtils.encryptByPrivateKey(RsaProperties.privateKey, "12345678"));
                         userService.createSync(user);
                     }
                 } catch (Exception e) {