增加用户头像上传修改。

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -89,7 +89,7 @@ public class DataInitManager {
                 operator = roleManager.save(operator);
                 log.info("创建默认角色：" + operator.toString());
 
-                admin = new User(userName, "admin@neotel.tech", "zh-CN", role.getId(), "$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds, "");
+                admin = new User(userName, "admin@neotel.tech", "zh-CN", role.getId(), "$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds, "","");
                 admin = userManager.save(admin);
                 log.info("创建默认用户：" + admin.toString());
 

src/main/java/com/neotel/smfcore/common/utils/UserCodeUtil.java

@@ -6,21 +6,20 @@ import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.security.service.po.User;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
+
 @Slf4j
 public class UserCodeUtil {
 
-    public static void main(String[] args) {
+    public static void main(String[] args)
+    {
         //   FilePro();
         CreateUserCode( );
     }
     public static void CreateUserCode( ) {
         try {
             String filePath = "F:\\";
-            String fileName="用户.csv";
+            String fileName="2024-11-20 09_24_35-.csv";
             List<User> list = ReadFile(filePath+fileName);
             //创建验证码
             for (int i = 0; i < list.size(); i++
@@ -29,7 +28,7 @@ public class UserCodeUtil {
                 list.get(i).setCheckCode(code);
             }
 
-            String targetFile=filePath+"更新后_"+fileName;
+            String targetFile=filePath+"New_"+fileName;
             if(FileUtil.exist(targetFile)){
                 FileUtil.del(targetFile);
             }
@@ -43,7 +42,9 @@ public class UserCodeUtil {
 //
 //                writer.writeRecord(userStr);
 //            }
-            String[] headers=new String[]{"用户ID","用户名", "状态", "创建日期","启用码"};
+//            String[] headers=new String[]{"用户ID","用户名", "状态", "创建日期","启用码"};
+            //ID	User Name	Satus	Create Time	Enable Code
+            String[] headers=new String[]{"ID","User Name", "Satus", "Create Time","Enable Code"};
             writer.writeRecord(headers);
             for (User user :
                     list) {
@@ -69,6 +70,9 @@ public class UserCodeUtil {
     }
     protected static List<User> ReadFile(String fileURL ) throws Exception
     {
+//        ID	UserName	Enable	CreateDate	CheckCode
+
+        String[] headers=new String[]{"ID","User Name", "Satus", "Create Time","Enable Code"};
         List<User> list=new ArrayList<User>();
 
         CsvReader csvRead =  CsvReader.newReader(fileURL,"用户ID","ID");
@@ -107,7 +111,7 @@ public class UserCodeUtil {
             String langu="";
             String roleId="";
             User user=new User(username,email,langu,roleId,"",true
-            ,false,new Date(),new HashSet<>(),"");
+            ,false,new Date(),new HashSet<>(),"","");
             user.setId(id);
             user.setCreateDate(createData);
             list.add(user);

src/main/java/com/neotel/smfcore/security/rest/AuthorizationController.java

@@ -105,7 +105,7 @@ public class AuthorizationController {
         try {
             long seconds = onlineUserService.properties.getTokenValidityInSeconds() / 1000;
             Date exTime= DateUtil.addSeconds(new Date(), new Long(seconds).intValue());
-            onlineUserDto = new OnlineUserDto(jwtUserDto.getUsername(), browser , ip, address, EncryptUtils.desEncrypt(token), new Date(),exTime);
+            onlineUserDto = new OnlineUserDto(jwtUserDto.getUsername(), browser , ip, address, EncryptUtils.desEncrypt(token), new Date(),exTime,jwtUserDto.getImageStr());
         } catch (Exception e) {
             log.error(e.getMessage(),e);
         }

src/main/java/com/neotel/smfcore/security/rest/bean/dto/JwtUserDto.java

@@ -78,4 +78,10 @@ public class JwtUserDto implements UserDetails {
     public boolean isEnabled() {
         return user.getEnabled();
     }
+
+
+    public String getImageStr(){ return user.getImageStr();}
+
+
+
 }

src/main/java/com/neotel/smfcore/security/rest/bean/dto/OnlineUserDto.java

@@ -64,5 +64,8 @@ public class OnlineUserDto {
      */
     private  Date expiresTime;
 
-
+    /**
+     * 头像
+     */
+    private String imageStr;
 }

src/main/java/com/neotel/smfcore/security/rest/bean/dto/UserDto.java

@@ -52,5 +52,7 @@ public class UserDto implements Serializable {
     @ApiModelProperty("是否已进入调试模式")
     private Boolean debugModel=false;
 
+    @ApiModelProperty("头像")
+    private String imageStr;
 
 }

src/main/java/com/neotel/smfcore/security/service/manager/impl/UserManagerImpl.java

@@ -100,6 +100,7 @@ public class UserManagerImpl implements IUserManager {
             dataUser.setGroups(user.getGroups());
             dataUser.setLanguage(user.getLanguage());
             dataUser.setPwdResetTime(user.getPwdResetTime());
+            dataUser.setImageStr(user.getImageStr());
             userDao.save(dataUser);
         }
     }
@@ -114,6 +115,7 @@ public class UserManagerImpl implements IUserManager {
             //只能修改邮箱和语言
             dataUser.setEmail(resources.getEmail());
             dataUser.setLanguage(resources.getLanguage());
+            dataUser.setImageStr(resources.getImageStr());
 
         }
         userDao.save(dataUser);

src/main/java/com/neotel/smfcore/security/service/po/User.java

@@ -58,6 +58,12 @@ public class User extends BasePo implements Serializable {
 
     private String checkCode;
 
+
+    /**
+     * 头像
+     */
+    private String imageStr;
+
     public boolean hasGroup(String groupId) {
 
         if (groupId == null || groupId.equals("") || groupId.equals("-1")) {