修改 设备编码

pom.xml

@@ -207,6 +207,7 @@
         <module>ruoyi-common</module>
         <module>ruoyi-manage</module>
         <module>ruoyi-api</module>
+        <module>ruoyi-device</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -16,7 +16,11 @@
     </description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-device</artifactId>
+            <version>4.7.8</version>
+        </dependency>
         <!-- SpringBoot集成thymeleaf模板 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -1,9 +1,12 @@
 package com.ruoyi.web.controller.common;
 
-import java.util.ArrayList;
+import com.ruoyi.common.config.RuoYiConfig;
-import java.util.List;
+import com.ruoyi.common.config.ServerConfig;
-import javax.servlet.http.HttpServletRequest;
+import com.ruoyi.common.constant.Constants;
-import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,13 +17,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.config.RuoYiConfig;
+
-import com.ruoyi.common.config.ServerConfig;
+import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.constant.Constants;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.core.domain.AjaxResult;
+import java.util.ArrayList;
-import com.ruoyi.common.utils.StringUtils;
+import java.util.List;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
 
 /**
  * 通用请求处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java

@@ -1,19 +1,20 @@
 package com.ruoyi.web.controller.demo.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.CxSelect;
 import com.ruoyi.common.json.JSONObject;
 import com.ruoyi.common.json.JSONObject.JSONArray;
 import com.ruoyi.common.utils.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 表单相关

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java

@@ -1,17 +1,5 @@
 package com.ruoyi.web.controller.demo.controller;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.PageDomain;
@@ -23,6 +11,15 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.controller.demo.domain.CustomerModel;
 import com.ruoyi.web.controller.demo.domain.UserOperateModel;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 操作控制

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.demo.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -23,6 +12,14 @@ import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.*;
 
 /**
  * 表格相关

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/CustomerModel.java

@@ -1,9 +1,10 @@
 package com.ruoyi.web.controller.demo.domain;
 
-import java.util.List;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 客户测试信息
  * 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/GoodsModel.java

@@ -1,9 +1,10 @@
 package com.ruoyi.web.controller.demo.domain;
 
-import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  * 商品测试信息
  * 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java

@@ -1,11 +1,12 @@
 package com.ruoyi.web.controller.demo.domain;
 
-import java.util.Date;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.utils.DateUtils;
 
+import java.util.Date;
+
 public class UserOperateModel extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -1,5 +1,8 @@
 package com.ruoyi.web.controller.monitor;
 
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.framework.web.service.CacheService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -8,9 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.framework.web.service.CacheService;
 
 /**
  * 缓存监控

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java

@@ -1,10 +1,10 @@
 package com.ruoyi.web.controller.monitor;
 
+import com.ruoyi.common.core.controller.BaseController;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
 
 /**
  * druid 监控

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java

@@ -1,12 +1,12 @@
 package com.ruoyi.web.controller.monitor;
 
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.framework.web.domain.Server;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.framework.web.domain.Server;
 
 /**
  * 服务器监控

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -1,7 +1,14 @@
 package com.ruoyi.web.controller.monitor;
 
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.shiro.service.SysPasswordService;
+import com.ruoyi.system.domain.SysLogininfor;
+import com.ruoyi.system.service.ISysLogininforService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -9,14 +16,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
+
-import com.ruoyi.common.core.controller.BaseController;
+import java.util.List;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysLogininfor;
-import com.ruoyi.system.service.ISysLogininforService;
 
 /**
  * 系统访问记录

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -1,15 +1,5 @@
 package com.ruoyi.web.controller.monitor;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -18,6 +8,13 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysOperLog;
 import com.ruoyi.system.service.ISysOperLogService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 操作日志记录

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -1,14 +1,5 @@
 package com.ruoyi.web.controller.monitor;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -21,6 +12,16 @@ import com.ruoyi.framework.shiro.session.OnlineSession;
 import com.ruoyi.framework.shiro.session.OnlineSessionDAO;
 import com.ruoyi.system.domain.SysUserOnline;
 import com.ruoyi.system.service.ISysUserOnlineService;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
 
 /**
  * 在线用户监控

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java

@@ -1,20 +1,21 @@
 package com.ruoyi.web.controller.system;
 
-import java.awt.image.BufferedImage;
+import com.google.code.kaptcha.Constants;
-import java.io.IOException;
+import com.google.code.kaptcha.Producer;
+import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import org.springframework.stereotype.Controller;
+import java.awt.image.BufferedImage;
-import org.springframework.web.bind.annotation.GetMapping;
+import java.io.IOException;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-import com.google.code.kaptcha.Constants;
-import com.google.code.kaptcha.Producer;
-import com.ruoyi.common.core.controller.BaseController;
 
 /**
  * 图片验证码（支持算术形式）

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -19,6 +8,14 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 参数配置 信息操作处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -20,6 +9,14 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 部门信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -19,6 +8,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 数据字典信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -20,6 +9,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 数据字典信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.ShiroConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -25,6 +14,18 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.shiro.service.SysPasswordService;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 首页 业务处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,7 +1,11 @@
 package com.ruoyi.web.controller.system;
 
-import javax.servlet.http.HttpServletRequest;
+import com.ruoyi.common.core.controller.BaseController;
-import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.ConfigService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
@@ -13,12 +17,9 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.core.controller.BaseController;
+
-import com.ruoyi.common.core.domain.AjaxResult;
+import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.core.text.Convert;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.ConfigService;
 
 /**
  * 登录验证

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -21,6 +10,14 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.framework.shiro.util.AuthorizationUtils;
 import com.ruoyi.system.service.ISysMenuService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 菜单信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -18,6 +7,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 公告 信息操作处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -19,6 +8,14 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 岗位信息操作处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
@@ -24,6 +13,13 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.framework.shiro.service.SysPasswordService;
 import com.ruoyi.system.service.ISysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 个人信息 业务处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -1,16 +1,16 @@
 package com.ruoyi.web.controller.system;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.shiro.service.SysRegisterService;
 import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 注册验证

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -1,16 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -25,6 +14,14 @@ import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 角色信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,19 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -33,6 +19,17 @@ import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java

@@ -1,10 +1,10 @@
 package com.ruoyi.web.controller.tool;
 
+import com.ruoyi.common.core.controller.BaseController;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
 
 /**
  * build 表单构建

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java

@@ -1,10 +1,10 @@
 package com.ruoyi.web.controller.tool;
 
+import com.ruoyi.common.core.controller.BaseController;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
 
 /**
  * swagger 接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

@@ -1,26 +1,15 @@
 package com.ruoyi.web.controller.tool;
 
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * swagger 用户测试方法

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -1,10 +1,10 @@
 package com.ruoyi.web.core.config;
 
+import com.ruoyi.common.config.RuoYiConfig;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.ruoyi.common.config.RuoYiConfig;
-import io.swagger.annotations.ApiOperation;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/animation/MMDAnimationHelper.js

@@ -1,9 +1,4 @@
-import {
+import {AnimationMixer, Object3D, Quaternion, Vector3} from 'three';
-	AnimationMixer,
-	Object3D,
-	Quaternion,
-	Vector3
-} from 'three';
 import {CCDIKSolver} from '../animation/CCDIKSolver.js';
 import {MMDPhysics} from '../animation/MMDPhysics.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/cameras/CinematicCamera.js

@@ -9,7 +9,7 @@ import {
     WebGLRenderTarget
 } from 'three';
 
-import { BokehShader, BokehDepthShader } from '../shaders/BokehShader2.js';
+import {BokehDepthShader, BokehShader} from '../shaders/BokehShader2.js';
 
 class CinematicCamera extends PerspectiveCamera {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/controls/ArcballControls.js

@@ -1,19 +1,19 @@
 import {
-	GridHelper,
+    Box3,
-	EllipseCurve,
     BufferGeometry,
+    EllipseCurve,
+    EventDispatcher,
+    GridHelper,
+    Group,
     Line,
     LineBasicMaterial,
-	Raycaster,
-	Group,
-	Box3,
-	Sphere,
-	Quaternion,
-	Vector2,
-	Vector3,
-	Matrix4,
     MathUtils,
-	EventDispatcher
+    Matrix4,
+    Quaternion,
+    Raycaster,
+    Sphere,
+    Vector2,
+    Vector3
 } from 'three';
 
 //trackball state

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/controls/DragControls.js

@@ -1,11 +1,4 @@
-import {
+import {EventDispatcher, Matrix4, Plane, Raycaster, Vector2, Vector3} from 'three';
-	EventDispatcher,
-	Matrix4,
-	Plane,
-	Raycaster,
-	Vector2,
-	Vector3
-} from 'three';
 
 const _plane = new Plane();
 const _raycaster = new Raycaster();

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/controls/FirstPersonControls.js

@@ -1,8 +1,4 @@
-import {
+import {MathUtils, Spherical, Vector3} from 'three';
-	MathUtils,
-	Spherical,
-	Vector3
-} from 'three';
 
 const _lookDirection = new Vector3();
 const _spherical = new Spherical();

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/controls/FlyControls.js

@@ -1,8 +1,4 @@
-import {
+import {EventDispatcher, Quaternion, Vector3} from 'three';
-	EventDispatcher,
-	Quaternion,
-	Vector3
-} from 'three';
 
 const _changeEvent = { type: 'change' };
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/controls/OrbitControls.js

@@ -1,14 +1,14 @@
 import {
     EventDispatcher,
+    MathUtils,
     MOUSE,
+    Plane,
     Quaternion,
+    Ray,
     Spherical,
     TOUCH,
     Vector2,
-	Vector3,
+    Vector3
-	Plane,
-	Ray,
-	MathUtils
 } from '/js/three/src/Three.js';
 
 // OrbitControls performs orbiting, dollying (zooming), and panning.

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/controls/PointerLockControls.js

@@ -1,8 +1,4 @@
-import {
+import {Euler, EventDispatcher, Vector3} from 'three';
-	Euler,
-	EventDispatcher,
-	Vector3
-} from 'three';
 
 const _euler = new Euler( 0, 0, 0, 'YXZ' );
 const _vector = new Vector3();

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/controls/TrackballControls.js

@@ -1,11 +1,4 @@
-import {
+import {EventDispatcher, MathUtils, MOUSE, Quaternion, Vector2, Vector3} from 'three';
-	EventDispatcher,
-	MathUtils,
-	MOUSE,
-	Quaternion,
-	Vector2,
-	Vector3
-} from 'three';
 
 const _changeEvent = { type: 'change' };
 const _startEvent = { type: 'start' };

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/csm/CSM.js

@@ -1,12 +1,4 @@
-import {
+import {Box3, DirectionalLight, MathUtils, Matrix4, ShaderChunk, Vector2, Vector3} from 'three';
-	Vector2,
-	Vector3,
-	DirectionalLight,
-	MathUtils,
-	ShaderChunk,
-	Matrix4,
-	Box3
-} from 'three';
 import {CSMFrustum} from './CSMFrustum.js';
 import {CSMShader} from './CSMShader.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/csm/CSMFrustum.js

@@ -1,4 +1,4 @@
-import { Vector3, Matrix4 } from 'three';
+import {Matrix4, Vector3} from 'three';
 
 const inverseProjectionMatrix = new Matrix4();
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/csm/CSMHelper.js

@@ -1,15 +1,15 @@
 import {
-	Group,
-	Mesh,
-	LineSegments,
-	BufferGeometry,
-	LineBasicMaterial,
-	Box3Helper,
     Box3,
-	PlaneGeometry,
+    Box3Helper,
-	MeshBasicMaterial,
     BufferAttribute,
-	DoubleSide
+    BufferGeometry,
+    DoubleSide,
+    Group,
+    LineBasicMaterial,
+    LineSegments,
+    Mesh,
+    MeshBasicMaterial,
+    PlaneGeometry
 } from 'three';
 
 class CSMHelper extends Group {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/curves/CurveExtras.js

@@ -1,7 +1,4 @@
-import {
+import {Curve, Vector3} from 'three';
-	Curve,
-	Vector3
-} from 'three';
 
 /**
  * A bunch of parametric curves

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/curves/NURBSCurve.js

@@ -1,8 +1,4 @@
-import {
+import {Curve, Vector3, Vector4} from 'three';
-	Curve,
-	Vector3,
-	Vector4
-} from 'three';
 import * as NURBSUtils from '../curves/NURBSUtils.js';
 
 /**

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/curves/NURBSSurface.js

@@ -1,6 +1,4 @@
-import {
+import {Vector4} from 'three';
-	Vector4
-} from 'three';
 import * as NURBSUtils from '../curves/NURBSUtils.js';
 
 /**

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/curves/NURBSUtils.js

@@ -1,7 +1,4 @@
-import {
+import {Vector3, Vector4} from 'three';
-	Vector3,
-	Vector4
-} from 'three';
 
 /**
  * NURBS utils

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/curves/NURBSVolume.js

@@ -1,6 +1,4 @@
-import {
+import {Vector4} from 'three';
-	Vector4
-} from 'three';
 import * as NURBSUtils from '../curves/NURBSUtils.js';
 
 /**

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/effects/OutlineEffect.js

@@ -1,10 +1,4 @@
-import {
+import {BackSide, Color, ShaderMaterial, UniformsLib, UniformsUtils} from 'three';
-	BackSide,
-	Color,
-	ShaderMaterial,
-	UniformsLib,
-	UniformsUtils
-} from 'three';
 
 /**
  * Reference: https://en.wikipedia.org/wiki/Cel_shading

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/effects/PeppersGhostEffect.js

@@ -1,8 +1,4 @@
-import {
+import {PerspectiveCamera, Quaternion, Vector3} from 'three';
-	PerspectiveCamera,
-	Quaternion,
-	Vector3
-} from 'three';
 
 /**
  * peppers ghost effect based on http://www.instructables.com/id/Reflective-Prism/?ALLSTEPS

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/effects/StereoEffect.js

@@ -1,7 +1,4 @@
-import {
+import {StereoCamera, Vector2} from 'three';
-	StereoCamera,
-	Vector2
-} from 'three';
 
 class StereoEffect {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/environments/DebugEnvironment.js

@@ -1,12 +1,4 @@
-import {
+import {BackSide, BoxGeometry, Mesh, MeshLambertMaterial, MeshStandardMaterial, PointLight, Scene,} from 'three';
-	BackSide,
-	BoxGeometry,
-	Mesh,
-	MeshLambertMaterial,
-	MeshStandardMaterial,
-	PointLight,
-	Scene,
-} from 'three';
 
 class DebugEnvironment extends Scene {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/environments/RoomEnvironment.js

@@ -2,15 +2,7 @@
  * https://github.com/google/model-viewer/blob/master/packages/model-viewer/src/three-components/EnvironmentScene.ts
  */
 
-import {
+import {BackSide, BoxGeometry, Mesh, MeshBasicMaterial, MeshStandardMaterial, PointLight, Scene,} from 'three';
- 	BackSide,
- 	BoxGeometry,
- 	Mesh,
-	MeshBasicMaterial,
- 	MeshStandardMaterial,
- 	PointLight,
- 	Scene,
-} from 'three';
 
 class RoomEnvironment extends Scene {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/exporters/EXRExporter.js

@@ -5,12 +5,7 @@
  * 	https://www.openexr.com/documentation/openexrfilelayout.pdf
  */
 
-import {
+import {DataUtils, FloatType, HalfFloatType, RGBAFormat,} from 'three';
-	FloatType,
-	HalfFloatType,
-	RGBAFormat,
-	DataUtils,
-} from 'three';
 import * as fflate from '../libs/fflate.module.js';
 
 const textEncoder = new TextEncoder();

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/exporters/GLTFExporter.js

@@ -2,10 +2,10 @@ import {
     BufferAttribute,
     ClampToEdgeWrapping,
     Color,
+    CompressedTexture,
     DoubleSide,
     InterpolateDiscrete,
     InterpolateLinear,
-	NoColorSpace,
     LinearFilter,
     LinearMipmapLinearFilter,
     LinearMipmapNearestFilter,
@@ -15,16 +15,16 @@ import {
     NearestFilter,
     NearestMipmapLinearFilter,
     NearestMipmapNearestFilter,
+    NoColorSpace,
     PropertyBinding,
-	RGBAFormat,
+    Quaternion,
     RepeatWrapping,
+    REVISION,
+    RGBAFormat,
     Scene,
     Source,
     SRGBColorSpace,
-	CompressedTexture,
+    Vector3
-	Vector3,
-	Quaternion,
-	REVISION
 } from 'three';
 import {decompress} from './../utils/TextureUtils.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/exporters/KTX2Exporter.js

@@ -1,22 +1,20 @@
 import {
+    DataTexture,
     FloatType,
     HalfFloatType,
-	UnsignedByteType,
+    LinearSRGBColorSpace,
+    NoColorSpace,
+    RedFormat,
+    RedIntegerFormat,
+    REVISION,
     RGBAFormat,
     RGFormat,
     RGIntegerFormat,
-	RedFormat,
-	RedIntegerFormat,
-	NoColorSpace,
-	LinearSRGBColorSpace,
     SRGBColorSpace,
-	DataTexture,
+    UnsignedByteType,
-	REVISION,
 } from 'three';
 
 import {
-	write,
-	KTX2Container,
     KHR_DF_CHANNEL_RGBSDA_ALPHA,
     KHR_DF_CHANNEL_RGBSDA_BLUE,
     KHR_DF_CHANNEL_RGBSDA_GREEN,
@@ -29,6 +27,7 @@ import {
     KHR_DF_SAMPLE_DATATYPE_SIGNED,
     KHR_DF_TRANSFER_LINEAR,
     KHR_DF_TRANSFER_SRGB,
+    KTX2Container,
     VK_FORMAT_R16_SFLOAT,
     VK_FORMAT_R16G16_SFLOAT,
     VK_FORMAT_R16G16B16A16_SFLOAT,
@@ -41,6 +40,7 @@ import {
     VK_FORMAT_R8G8_UNORM,
     VK_FORMAT_R8G8B8A8_SRGB,
     VK_FORMAT_R8G8B8A8_UNORM,
+    write,
 } from '../libs/ktx-parse.module.js';
 
 const VK_FORMAT_MAP = {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/exporters/MMDExporter.js

@@ -1,8 +1,4 @@
-import {
+import {Matrix4, Quaternion, Vector3} from 'three';
-	Matrix4,
-	Quaternion,
-	Vector3
-} from 'three';
 import {MMDParser} from '../libs/mmdparser.module.js';
 
 /**

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/exporters/OBJExporter.js

@@ -1,9 +1,4 @@
-import {
+import {Color, Matrix3, Vector2, Vector3} from 'three';
-	Color,
-	Matrix3,
-	Vector2,
-	Vector3
-} from 'three';
 
 class OBJExporter {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/exporters/PLYExporter.js

@@ -1,8 +1,4 @@
-import {
+import {Color, Matrix3, Vector3} from 'three';
-	Matrix3,
-	Vector3,
-	Color
-} from 'three';
 
 /**
  * https://github.com/gkjohnson/ply-exporter-js

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/exporters/USDZExporter.js

@@ -1,12 +1,6 @@
-import {
+import {DoubleSide, NoColorSpace,} from 'three';
-	NoColorSpace,
-	DoubleSide,
-} from 'three';
 
-import {
+import {strToU8, zipSync,} from '../libs/fflate.module.js';
-	strToU8,
-	zipSync,
-} from '../libs/fflate.module.js';
 
 import {decompress} from './../utils/TextureUtils.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/BoxLineGeometry.js

@@ -1,7 +1,4 @@
-import {
+import {BufferGeometry, Float32BufferAttribute} from 'three';
-	BufferGeometry,
-	Float32BufferAttribute
-} from 'three';
 
 class BoxLineGeometry extends BufferGeometry {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/ConvexGeometry.js

@@ -1,7 +1,4 @@
-import {
+import {BufferGeometry, Float32BufferAttribute} from 'three';
-	BufferGeometry,
-	Float32BufferAttribute
-} from 'three';
 import {ConvexHull} from '../math/ConvexHull.js';
 
 class ConvexGeometry extends BufferGeometry {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/DecalGeometry.js

@@ -1,9 +1,4 @@
-import {
+import {BufferGeometry, Float32BufferAttribute, Matrix4, Vector3} from 'three';
-	BufferGeometry,
-	Float32BufferAttribute,
-	Matrix4,
-	Vector3
-} from 'three';
 
 /**
  * You can use this geometry to create a decal mesh, that serves different kinds of purposes.

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/InstancedPointsGeometry.js

@@ -1,11 +1,4 @@
-import {
+import {Box3, Float32BufferAttribute, InstancedBufferAttribute, InstancedBufferGeometry, Sphere, Vector3} from 'three';
-	Box3,
-	Float32BufferAttribute,
-	InstancedBufferGeometry,
-	InstancedBufferAttribute,
-	Sphere,
-	Vector3
-} from 'three';
 
 const _vector = new Vector3();
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/ParametricGeometries.js

@@ -1,7 +1,4 @@
-import {
+import {Curve, Vector3} from 'three';
-	Curve,
-	Vector3
-} from 'three';
 
 import {ParametricGeometry} from './ParametricGeometry.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/ParametricGeometry.js

@@ -3,11 +3,7 @@
  * based on the brilliant article by @prideout https://prideout.net/blog/old/blog/index.html@p=44.html
  */
 
-import {
+import {BufferGeometry, Float32BufferAttribute, Vector3} from 'three';
-	BufferGeometry,
-	Float32BufferAttribute,
-	Vector3
-} from 'three';
 
 class ParametricGeometry extends BufferGeometry {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/RoundedBoxGeometry.js

@@ -1,7 +1,4 @@
-import {
+import {BoxGeometry, Vector3} from 'three';
-	BoxGeometry,
-	Vector3
-} from 'three';
 
 const _tempNormal = new Vector3();
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/TeapotGeometry.js

@@ -1,10 +1,4 @@
-import {
+import {BufferAttribute, BufferGeometry, Matrix4, Vector3, Vector4} from 'three';
-	BufferAttribute,
-	BufferGeometry,
-	Matrix4,
-	Vector3,
-	Vector4
-} from 'three';
 
 /**
  * Tessellates the famous Utah teapot database by Martin Newell into triangles.

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/geometries/TextGeometry.js

@@ -15,9 +15,7 @@
  * }
  */
 
-import {
+import {ExtrudeGeometry} from 'three';
-	ExtrudeGeometry
-} from 'three';
 
 class TextGeometry extends ExtrudeGeometry {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/helpers/LightProbeHelper.js

@@ -1,8 +1,4 @@
-import {
+import {Mesh, ShaderMaterial, SphereGeometry} from 'three';
-	Mesh,
-	ShaderMaterial,
-	SphereGeometry
-} from 'three';
 
 class LightProbeHelper extends Mesh {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/helpers/OctreeHelper.js

@@ -1,9 +1,4 @@
-import {
+import {BufferGeometry, Float32BufferAttribute, LineBasicMaterial, LineSegments} from 'three';
-	LineSegments,
-	BufferGeometry,
-	Float32BufferAttribute,
-	LineBasicMaterial
-} from 'three';
 
 class OctreeHelper extends LineSegments {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/helpers/PositionalAudioHelper.js

@@ -1,10 +1,4 @@
-import {
+import {BufferAttribute, BufferGeometry, Line, LineBasicMaterial, MathUtils} from 'three';
-	BufferGeometry,
-	BufferAttribute,
-	LineBasicMaterial,
-	Line,
-	MathUtils
-} from 'three';
 
 class PositionalAudioHelper extends Line {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/helpers/TextureHelper.js

@@ -1,12 +1,4 @@
-import {
+import {BoxGeometry, BufferAttribute, DoubleSide, Mesh, PlaneGeometry, ShaderMaterial, Vector3,} from 'three';
-	BoxGeometry,
-	BufferAttribute,
-	DoubleSide,
-	Mesh,
-	PlaneGeometry,
-	ShaderMaterial,
-	Vector3,
-} from 'three';
 import {mergeGeometries} from '../utils/BufferGeometryUtils.js';
 
 class TextureHelper extends Mesh {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/helpers/VertexNormalsHelper.js

@@ -1,11 +1,4 @@
-import {
+import {BufferGeometry, Float32BufferAttribute, LineBasicMaterial, LineSegments, Matrix3, Vector3} from 'three';
-	BufferGeometry,
-	Float32BufferAttribute,
-	LineSegments,
-	LineBasicMaterial,
-	Matrix3,
-	Vector3
-} from 'three';
 
 const _v1 = new Vector3();
 const _v2 = new Vector3();

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/helpers/VertexTangentsHelper.js

@@ -1,10 +1,4 @@
-import {
+import {BufferGeometry, Float32BufferAttribute, LineBasicMaterial, LineSegments, Vector3} from 'three';
-	BufferGeometry,
-	Float32BufferAttribute,
-	LineSegments,
-	LineBasicMaterial,
-	Vector3
-} from 'three';
 
 const _v1 = new Vector3();
 const _v2 = new Vector3();

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/interactive/HTMLMesh.js

@@ -1,12 +1,4 @@
-import {
+import {CanvasTexture, Color, LinearFilter, Mesh, MeshBasicMaterial, PlaneGeometry, SRGBColorSpace} from 'three';
-	CanvasTexture,
-	LinearFilter,
-	Mesh,
-	MeshBasicMaterial,
-	PlaneGeometry,
-	SRGBColorSpace,
-	Color
-} from 'three';
 
 class HTMLMesh extends Mesh {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/interactive/InteractiveGroup.js

@@ -1,8 +1,4 @@
-import {
+import {Group, Raycaster, Vector2} from 'three';
-	Group,
-	Raycaster,
-	Vector2
-} from 'three';
 
 const _pointer = new Vector2();
 const _event = { type: '', data: _pointer };

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/interactive/SelectionBox.js

@@ -1,9 +1,4 @@
-import {
+import {Frustum, Matrix4, Quaternion, Vector3,} from 'three';
-	Frustum,
-	Vector3,
-	Matrix4,
-	Quaternion,
-} from 'three';
 
 /**
  * This is a class to check whether objects are in a selection area in 3D space

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/lights/LightProbeGenerator.js

@@ -1,13 +1,13 @@
 import {
     Color,
+    DataUtils,
+    HalfFloatType,
     LightProbe,
     LinearSRGBColorSpace,
-	SphericalHarmonics3,
-	Vector3,
-	SRGBColorSpace,
     NoColorSpace,
-	HalfFloatType,
+    SphericalHarmonics3,
-	DataUtils
+    SRGBColorSpace,
+    Vector3
 } from 'three';
 
 class LightProbeGenerator {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/lights/RectAreaLightUniformsLib.js

@@ -7,8 +7,8 @@ import {
     LinearFilter,
     NearestFilter,
     RGBAFormat,
-	UVMapping,
+    UniformsLib,
-	UniformsLib
+    UVMapping
 } from 'three';
 
 /**

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/lines/LineMaterial.js

@@ -11,13 +11,7 @@
  * }
  */
 
-import {
+import {ShaderLib, ShaderMaterial, UniformsLib, UniformsUtils, Vector2} from 'three';
-	ShaderLib,
-	ShaderMaterial,
-	UniformsLib,
-	UniformsUtils,
-	Vector2
-} from 'three';
 
 
 UniformsLib.line = {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/lines/Wireframe.js

@@ -1,9 +1,4 @@
-import {
+import {InstancedInterleavedBuffer, InterleavedBufferAttribute, Mesh, Vector3} from 'three';
-	InstancedInterleavedBuffer,
-	InterleavedBufferAttribute,
-	Mesh,
-	Vector3
-} from 'three';
 import {LineSegmentsGeometry} from '../lines/LineSegmentsGeometry.js';
 import {LineMaterial} from '../lines/LineMaterial.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/lines/WireframeGeometry2.js

@@ -1,6 +1,4 @@
-import {
+import {WireframeGeometry} from 'three';
-	WireframeGeometry
-} from 'three';
 import {LineSegmentsGeometry} from '../lines/LineSegmentsGeometry.js';
 
 class WireframeGeometry2 extends LineSegmentsGeometry {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/3DMLoader.js

@@ -6,8 +6,8 @@ import {
     DirectionalLight,
     DoubleSide,
     FileLoader,
-	LinearFilter,
     Line,
+    LinearFilter,
     LineBasicMaterial,
     Loader,
     Matrix4,

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/3MFLoader.js

@@ -16,8 +16,8 @@ import {
     MirroredRepeatWrapping,
     NearestFilter,
     RepeatWrapping,
-	TextureLoader,
+    SRGBColorSpace,
-	SRGBColorSpace
+    TextureLoader
 } from 'three';
 import * as fflate from '../libs/fflate.module.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/AMFLoader.js

@@ -1,13 +1,4 @@
-import {
+import {BufferGeometry, Color, FileLoader, Float32BufferAttribute, Group, Loader, Mesh, MeshPhongMaterial} from 'three';
-	BufferGeometry,
-	Color,
-	FileLoader,
-	Float32BufferAttribute,
-	Group,
-	Loader,
-	Mesh,
-	MeshPhongMaterial
-} from 'three';
 import * as fflate from '../libs/fflate.module.js';
 
 /**

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/ColladaLoader.js

@@ -32,11 +32,11 @@ import {
     Skeleton,
     SkinnedMesh,
     SpotLight,
+    SRGBColorSpace,
     TextureLoader,
     Vector2,
     Vector3,
-	VectorKeyframeTrack,
+    VectorKeyframeTrack
-	SRGBColorSpace
 } from 'three';
 import {TGALoader} from '../loaders/TGALoader.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/DDSLoader.js

@@ -1,12 +1,12 @@
 import {
     CompressedTextureLoader,
-	RGBAFormat,
+    RGB_BPTC_SIGNED_Format,
-	RGBA_S3TC_DXT3_Format,
+    RGB_BPTC_UNSIGNED_Format,
-	RGBA_S3TC_DXT5_Format,
     RGB_ETC1_Format,
     RGB_S3TC_DXT1_Format,
-	RGB_BPTC_SIGNED_Format,
+    RGBA_S3TC_DXT3_Format,
-	RGB_BPTC_UNSIGNED_Format
+    RGBA_S3TC_DXT5_Format,
+    RGBAFormat
 } from 'three';
 
 class DDSLoader extends CompressedTextureLoader {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/DRACOLoader.js

@@ -1,12 +1,4 @@
-import {
+import {BufferAttribute, BufferGeometry, Color, FileLoader, LinearSRGBColorSpace, Loader, SRGBColorSpace} from 'three';
-	BufferAttribute,
-	BufferGeometry,
-	Color,
-	FileLoader,
-	Loader,
-	LinearSRGBColorSpace,
-	SRGBColorSpace
-} from 'three';
 
 const _taskCache = new WeakMap();
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/EXRLoader.js

@@ -3,9 +3,9 @@ import {
     DataUtils,
     FloatType,
     HalfFloatType,
-	NoColorSpace,
     LinearFilter,
     LinearSRGBColorSpace,
+    NoColorSpace,
     RedFormat,
     RGBAFormat
 } from 'three';

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/FBXLoader.js

@@ -30,18 +30,18 @@ import {
     Quaternion,
     QuaternionKeyframeTrack,
     RepeatWrapping,
+    ShapeUtils,
     Skeleton,
     SkinnedMesh,
     SpotLight,
+    SRGBColorSpace,
     Texture,
     TextureLoader,
     Uint16BufferAttribute,
     Vector2,
     Vector3,
     Vector4,
-	VectorKeyframeTrack,
+    VectorKeyframeTrack
-	SRGBColorSpace,
-	ShapeUtils
 } from 'three';
 import * as fflate from '../libs/fflate.module.js';
 import {NURBSCurve} from '../curves/NURBSCurve.js';

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/FontLoader.js

@@ -1,8 +1,4 @@
-import {
+import {FileLoader, Loader, ShapePath} from 'three';
-	FileLoader,
-	Loader,
-	ShapePath
-} from 'three';
 
 class FontLoader extends Loader {
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/GLTFLoader.js

@@ -13,6 +13,7 @@ import {
     FrontSide,
     Group,
     ImageBitmapLoader,
+    InstancedBufferAttribute,
     InstancedMesh,
     InterleavedBuffer,
     InterleavedBufferAttribute,
@@ -20,13 +21,13 @@ import {
     InterpolateDiscrete,
     InterpolateLinear,
     Line,
-	LineBasicMaterial,
-	LineLoop,
-	LineSegments,
     LinearFilter,
     LinearMipmapLinearFilter,
     LinearMipmapNearestFilter,
     LinearSRGBColorSpace,
+    LineBasicMaterial,
+    LineLoop,
+    LineSegments,
     Loader,
     LoaderUtils,
     Material,
@@ -55,15 +56,14 @@ import {
     SkinnedMesh,
     Sphere,
     SpotLight,
+    SRGBColorSpace,
     Texture,
     TextureLoader,
     TriangleFanDrawMode,
     TriangleStripDrawMode,
     Vector2,
     Vector3,
-	VectorKeyframeTrack,
+    VectorKeyframeTrack
-	SRGBColorSpace,
-	InstancedBufferAttribute
 } from 'three';
 import {toTrianglesDrawMode} from '../utils/BufferGeometryUtils.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/IESLoader.js

@@ -1,14 +1,14 @@
 import {
     DataTexture,
+    DataUtils,
     FileLoader,
     FloatType,
-	RedFormat,
-	MathUtils,
-	Loader,
-	UnsignedByteType,
-	LinearFilter,
     HalfFloatType,
-	DataUtils
+    LinearFilter,
+    Loader,
+    MathUtils,
+    RedFormat,
+    UnsignedByteType
 } from 'three';
 
 class IESLoader extends Loader {

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/KMZLoader.js

@@ -1,9 +1,4 @@
-import {
+import {FileLoader, Group, Loader, LoadingManager} from 'three';
-	FileLoader,
-	Group,
-	Loader,
-	LoadingManager
-} from 'three';
 import {ColladaLoader} from '../loaders/ColladaLoader.js';
 import * as fflate from '../libs/fflate.module.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/KTX2Loader.js

@@ -12,21 +12,21 @@
  */
 
 import {
-	CompressedTexture,
     CompressedArrayTexture,
     CompressedCubeTexture,
+    CompressedTexture,
     Data3DTexture,
     DataTexture,
     DisplayP3ColorSpace,
     FileLoader,
     FloatType,
     HalfFloatType,
-	NoColorSpace,
+    LinearDisplayP3ColorSpace,
     LinearFilter,
     LinearMipmapLinearFilter,
-	LinearDisplayP3ColorSpace,
     LinearSRGBColorSpace,
     Loader,
+    NoColorSpace,
     RedFormat,
     RGB_ETC1_Format,
     RGB_ETC2_Format,
@@ -36,8 +36,8 @@ import {
     RGBA_BPTC_Format,
     RGBA_ETC2_EAC_Format,
     RGBA_PVRTC_4BPPV1_Format,
-	RGBA_S3TC_DXT5_Format,
     RGBA_S3TC_DXT1_Format,
+    RGBA_S3TC_DXT5_Format,
     RGBAFormat,
     RGFormat,
     SRGBColorSpace,
@@ -45,12 +45,16 @@ import {
 } from 'three';
 import {WorkerPool} from '../utils/WorkerPool.js';
 import {
-	read,
     KHR_DF_FLAG_ALPHA_PREMULTIPLIED,
+    KHR_DF_PRIMARIES_BT709,
+    KHR_DF_PRIMARIES_DISPLAYP3,
+    KHR_DF_PRIMARIES_UNSPECIFIED,
     KHR_DF_TRANSFER_SRGB,
     KHR_SUPERCOMPRESSION_NONE,
     KHR_SUPERCOMPRESSION_ZSTD,
-	VK_FORMAT_UNDEFINED,
+    read,
+    VK_FORMAT_ASTC_6x6_SRGB_BLOCK,
+    VK_FORMAT_ASTC_6x6_UNORM_BLOCK,
     VK_FORMAT_R16_SFLOAT,
     VK_FORMAT_R16G16_SFLOAT,
     VK_FORMAT_R16G16B16A16_SFLOAT,
@@ -63,11 +67,7 @@ import {
     VK_FORMAT_R8G8_UNORM,
     VK_FORMAT_R8G8B8A8_SRGB,
     VK_FORMAT_R8G8B8A8_UNORM,
-	VK_FORMAT_ASTC_6x6_SRGB_BLOCK,
+    VK_FORMAT_UNDEFINED
-	VK_FORMAT_ASTC_6x6_UNORM_BLOCK,
-	KHR_DF_PRIMARIES_UNSPECIFIED,
-	KHR_DF_PRIMARIES_BT709,
-	KHR_DF_PRIMARIES_DISPLAYP3
 } from '../libs/ktx-parse.module.js';
 import {ZSTDDecoder} from '../libs/zstddec.module.js';
 

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/KTXLoader.js

@@ -1,6 +1,4 @@
-import {
+import {CompressedTextureLoader} from 'three';
-	CompressedTextureLoader
-} from 'three';
 
 /**
  * for description see https://www.khronos.org/opengles/sdk/tools/KTX/

ruoyi-admin/src/main/resources/static/js/three/examples/jsm/loaders/LDrawLoader.js

@@ -10,12 +10,12 @@ import {
     Matrix4,
     Mesh,
     MeshStandardMaterial,
+    Ray,
     ShaderMaterial,
     SRGBColorSpace,
     UniformsLib,
     UniformsUtils,
-	Vector3,
+    Vector3
-	Ray
 } from 'three';
 
 // Special surface finish tag types.