c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
那些花儿
2025-09-17 17:52:09 +08:00
parent 9821aebd0a
commit 3f40ee599e
59 changed files with 3697 additions and 4029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/services/impl/SysFileServiceImpl.java
+3 -3
View File
@@ -147,7 +147,7 @@ public class SysFileServiceImpl extends BaseServiceImpl<Sys_file> implements Sys
@Override
public Sys_file detail(String id) {
return null;
return fetch(id);
}
@Override
@@ -181,13 +181,13 @@ public class SysFileServiceImpl extends BaseServiceImpl<Sys_file> implements Sys
String[] parts = srcValue.split(";base64,");
String base64Content = parts[1];
try{
try {
//转为在线地址 base64很喜欢被信息中心拦截
byte[] imageBytes = Base64.getDecoder().decode(base64Content);
String imgUrl = storageFile(SysFileEngineTypeEnum.MINIO.getValue(), genFileKey(R.UU32(), R.UU32() + ".png"), imageBytes, false);
String replacement = "<img src=\"" + imgUrl + "\">";
matcher.appendReplacement(sb, Matcher.quoteReplacement(replacement));
}catch (Exception e){
} catch (Exception e) {
matcher.appendReplacement(sb, Matcher.quoteReplacement("<img src=>"));
}
}
src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java
+22 -21
View File
@@ -13,6 +13,7 @@ import com.budwk.app.base.exception.UnknownAccountException;
import com.budwk.app.base.interceptor.sLog.SLogService;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.base.utils.PwdUtil;
import com.budwk.app.base.utils.SysMenuUtil;
import com.budwk.app.sys.models.*;
import com.budwk.app.sys.services.SysMenuService;
import com.budwk.app.sys.services.SysRoleService;
@@ -126,27 +127,27 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
List<Sys_module> userModules = dao().query(Sys_module.class, Cnd.where("id", "in", allModuleIds.toArray()).asc(Sys_module::getSortNum));
//设置pc菜单到模块
if (Lang.isNotEmpty(pcModuleIds)) {
//用户的pc端模块
List<Sys_module> pcModules = userModules.stream().filter(module -> pcModuleIds.contains(module.getId())).toList();
//pc菜单转为树结构
List<Sys_menu> pcTreeMenus = Sys_menu.createTreeMenus(pcMenus, null);
for (Sys_module pcModule : pcModules) {
pcModule.setMenus(pcTreeMenus.stream().filter(menu -> menu.getModuleId().equals(pcModule.getId())).collect(Collectors.toList()));
}
user.setPcModuleMenus(pcModules);
}
//设置h5菜单到模块
if (Lang.isNotEmpty(h5ModuleIds)) {
//用户的h5端模块
List<Sys_module> h5Modules = userModules.stream().filter(module -> h5ModuleIds.contains(module.getId())).toList();
List<Sys_menu> h5TreeMenus = Sys_menu.createTreeMenus(h5Menus, null);
for (Sys_module h5Module : h5Modules) {
h5Module.setMenus(h5TreeMenus.stream().filter(menu -> menu.getModuleId().equals(h5Module.getId())).collect(Collectors.toList()));
}
user.setH5ModuleMenus(h5Modules);
}
// if (Lang.isNotEmpty(pcModuleIds)) {
// //用户的pc端模块
// List<Sys_module> pcModules = userModules.stream().filter(module -> pcModuleIds.contains(module.getId())).toList();
// //pc菜单转为树结构
// List<Sys_menu> pcTreeMenus = SysMenuUtil.createTreeMenus(pcMenus, null);
// for (Sys_module pcModule : pcModules) {
// pcModule.setMenus(pcTreeMenus.stream().filter(menu -> menu.getModuleId().equals(pcModule.getId())).collect(Collectors.toList()));
// }
// user.setPcModuleMenus(pcModules);
// }
//
// //设置h5菜单到模块
// if (Lang.isNotEmpty(h5ModuleIds)) {
// //用户的h5端模块
// List<Sys_module> h5Modules = userModules.stream().filter(module -> h5ModuleIds.contains(module.getId())).toList();
// List<Sys_menu> h5TreeMenus = SysMenuUtil.createTreeMenus(h5Menus, null);
// for (Sys_module h5Module : h5Modules) {
// h5Module.setMenus(h5TreeMenus.stream().filter(menu -> menu.getModuleId().equals(h5Module.getId())).collect(Collectors.toList()));
// }
// user.setH5ModuleMenus(h5Modules);
// }
return user;
}