数据权限+密码重置

tnc-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -31,6 +31,7 @@ import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
 import org.jeecg.modules.system.util.RandImageUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -47,6 +48,10 @@ import java.util.*;
 @Api(tags="用户登录")
 @Slf4j
 public class LoginController {
+
+	@Value("${password.initial}")
+	private String password;
+
 	@Autowired
 	private ISysUserService sysUserService;
 
@@ -195,7 +200,8 @@ public class LoginController {
 		queryWrapper.eq(SysUser::getUsername,user.getUsername());
 		SysUser sysUser = sysUserService.getOne(queryWrapper);
 		String encryptNew = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
-		String encryptOld = PasswordUtil.encrypt(user.getUsername(), "tncBeiqu.123", sysUser.getSalt());
+		//初始密码
+		String encryptOld = PasswordUtil.encrypt(user.getUsername(), password, sysUser.getSalt());
 		if (encryptNew.equals(encryptOld)|| sysUser.getUpdateTime()==null){
 			return Result.error("首次登录请先修改密码...");
 		}else {
@@ -754,4 +760,14 @@ public class LoginController {
 		return Result.OK(result);
 	}
 
+	@GetMapping("/getPassWord")
+	public Result<JSONObject> getPassWord() {
+		Result<JSONObject> result = new Result<JSONObject>();
+		JSONObject obj=new JSONObject();
+		obj.put("passWord", password);
+		result.setResult(obj);
+		result.success("");
+		return result;
+	}
+
 }

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -159,6 +159,21 @@ public class SysUserController {
 		result.setSuccess(true);
 		result.setResult(pageList);
 		log.info(pageList.toString());
+        //添加角色
+        List<SysRole> list = iSysRoleService.list();
+        Map<String,String>map= new HashMap<>();
+        list.forEach(a->map.put(a.getId(),a.getRoleName()));
+        List<SysUser> records = pageList.getRecords();
+        for (SysUser record : records) {
+            int i =1;
+            List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, record.getId()));
+            String roleName="";
+            for (SysUserRole sysUserRole : userRole) {
+                roleName+=i+"、"+map.get(sysUserRole.getRoleId())+"  ";
+                i++;
+            }
+            record.setRoleName(roleName);
+        }
 		return result;
 	}
 

tnc-system/src/main/resources/application-dev.yml

@@ -316,4 +316,6 @@ third-app:
       client-id: ??
       # appSecret
       client-secret: ??
-      agent-id: ??
+      agent-id: ??
+password:
+  initial: s@Gr4n5h1P

tnc-system/src/main/resources/application-prod.yml

@@ -312,4 +312,6 @@ third-app:
       client-id: ??
       # appSecret
       client-secret: ??
-      agent-id: ??
+      agent-id: ??
+password:
+  initial: s@Gr4n5h1P