cpms优化

bin/clean.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 清理工程target生成路径。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean
+
+pause

bin/package.bat

@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 打包Web工程，生成war/jar包文件。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean package -Dmaven.test.skip=true
+
+pause

bin/run.bat

@@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Web工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-admin/target
+
+set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -jar %JAVA_OPTS% ruoyi-admin.jar
+
+cd bin
+pause

framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java

@@ -1,43 +0,0 @@
-package com.ruoyi.framework.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-import com.ruoyi.common.constant.Constants;
-
-/**
- * 资源文件配置加载
- * 
- * @author ruoyi
- */
-@Configuration
-public class I18nConfig implements WebMvcConfigurer
-{
-    @Bean
-    public LocaleResolver localeResolver()
-    {
-        SessionLocaleResolver slr = new SessionLocaleResolver();
-        // 默认语言
-        slr.setDefaultLocale(Constants.DEFAULT_LOCALE);
-        return slr;
-    }
-
-    @Bean
-    public LocaleChangeInterceptor localeChangeInterceptor()
-    {
-        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
-        // 参数名
-        lci.setParamName("lang");
-        return lci;
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry)
-    {
-        registry.addInterceptor(localeChangeInterceptor());
-    }
-}

pom.xml

@@ -4,12 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
-    <groupId>com.newcpms</groupId>
-    <artifactId>newcpms-sh</artifactId>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
     <version>3.8.7</version>
 
-    <name>newcpms-sh</name>
-    <description>cpms管理系统</description>
+    <name>ruoyi</name>
+    <url>http://www.ruoyi.vip</url>
+    <description>若依管理系统</description>
     
     <properties>
         <ruoyi.version>3.8.7</ruoyi.version>
@@ -23,8 +24,9 @@
         <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
         <fastjson.version>2.0.43</fastjson.version>
-        <oshi.version>6.5.0</oshi.version>
+        <oshi.version>6.4.8</oshi.version>
         <commons.io.version>2.13.0</commons.io.version>
+        <commons.collections.version>3.2.2</commons.collections.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
@@ -105,6 +107,13 @@
                 <version>${velocity.version}</version>
             </dependency>
 
+            <!-- collections工具类 -->
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons.collections.version}</version>
+            </dependency>
+
             <!-- 阿里JSON解析器 -->
             <dependency>
                 <groupId>com.alibaba.fastjson2</groupId>
@@ -128,36 +137,36 @@
 
             <!-- 定时任务-->
             <dependency>
-                <groupId>com.newcpms</groupId>
-                <artifactId>quartz</artifactId>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-quartz</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 代码生成-->
             <dependency>
-                <groupId>com.newcpms</groupId>
-                <artifactId>generator</artifactId>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-generator</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 核心模块-->
             <dependency>
-                <groupId>com.newcpms</groupId>
-                <artifactId>framework</artifactId>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-framework</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 系统模块-->
             <dependency>
-                <groupId>com.newcpms</groupId>
-                <artifactId>system</artifactId>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-system</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 通用工具-->
             <dependency>
-                <groupId>com.newcpms</groupId>
-                <artifactId>common</artifactId>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
@@ -165,12 +174,12 @@
     </dependencyManagement>
 
     <modules>
-        <module>admin</module>
-        <module>framework</module>
-        <module>system</module>
-        <module>quartz</module>
-        <module>generator</module>
-        <module>common</module>
+        <module>ruoyi-admin</module>
+        <module>ruoyi-framework</module>
+        <module>ruoyi-system</module>
+        <module>ruoyi-quartz</module>
+        <module>ruoyi-generator</module>
+        <module>ruoyi-common</module>
     </modules>
     <packaging>pom</packaging>
 

admin/pom.xml → ruoyi-admin/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-    <groupId>com.newcpms</groupId>
-    <artifactId>newcpms-sh</artifactId>
-    <version>3.8.7</version>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>admin</artifactId>
+    <artifactId>ruoyi-admin</artifactId>
 
     <description>
         web服务入口
@@ -45,21 +45,23 @@
 
         <!-- 核心模块-->
         <dependency>
-            <groupId>com.newcpms</groupId>
-            <artifactId>framework</artifactId>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
         </dependency>
 
         <!-- 定时任务-->
         <dependency>
-            <groupId>com.newcpms</groupId>
-            <artifactId>quartz</artifactId>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-quartz</artifactId>
         </dependency>
 
         <!-- 代码生成-->
         <dependency>
-            <groupId>com.newcpms</groupId>
-            <artifactId>generator</artifactId>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-generator</artifactId>
         </dependency>
+
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

admin/src/main/java/com/ruoyi/RuoYiApplication.java → ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -16,6 +16,6 @@ public class RuoYiApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  cpms启动成功   ლ(´ڡ`ლ)ﾞ");
+        System.out.println("(♥◠‿◠)ﾉﾞ  cpms启动成功   ლ(´ڡ`ლ)ﾞ  ");
     }
 }

admin/src/main/java/com/ruoyi/project/approval/controller/TApprovalController.java → ruoyi-admin/src/main/java/com/ruoyi/project/approval/controller/TApprovalController.java

@@ -1,8 +1,6 @@
 package com.ruoyi.project.approval.controller;
 
 import com.alibaba.fastjson2.JSON;
-import com.ruoyi.project.approval.domain.TApproval;
-import com.ruoyi.project.approval.service.ITApprovalService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -11,6 +9,8 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.approval.domain.TApproval;
+import com.ruoyi.project.approval.service.ITApprovalService;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;

admin/src/main/java/com/ruoyi/project/approval/domain/TApproval.java → ruoyi-admin/src/main/java/com/ruoyi/project/approval/domain/TApproval.java

@@ -1,11 +1,12 @@
 package com.ruoyi.project.approval.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 批文清单对象 t_approval

admin/src/main/java/com/ruoyi/project/approval/mapper/TApprovalMapper.java → ruoyi-admin/src/main/java/com/ruoyi/project/approval/mapper/TApprovalMapper.java

@@ -1,8 +1,9 @@
 package com.ruoyi.project.approval.mapper;
 
-import java.util.List;
 import com.ruoyi.project.approval.domain.TApproval;
 
+import java.util.List;
+
 /**
  * 批文清单Mapper接口
  * 

admin/src/main/java/com/ruoyi/project/approval/service/ITApprovalService.java → ruoyi-admin/src/main/java/com/ruoyi/project/approval/service/ITApprovalService.java

@@ -1,8 +1,9 @@
 package com.ruoyi.project.approval.service;
 
-import java.util.List;
 import com.ruoyi.project.approval.domain.TApproval;
 
+import java.util.List;
+
 /**
  * 批文清单Service接口
  * 

admin/src/main/java/com/ruoyi/project/approval/service/impl/TApprovalServiceImpl.java → ruoyi-admin/src/main/java/com/ruoyi/project/approval/service/impl/TApprovalServiceImpl.java

@@ -1,11 +1,12 @@
 package com.ruoyi.project.approval.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.approval.mapper.TApprovalMapper;
 import com.ruoyi.project.approval.domain.TApproval;
+import com.ruoyi.project.approval.mapper.TApprovalMapper;
 import com.ruoyi.project.approval.service.ITApprovalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 批文清单Service业务层处理

admin/src/main/java/com/ruoyi/project/office/OnlyofficeController.java → ruoyi-admin/src/main/java/com/ruoyi/project/office/OnlyofficeController.java

@@ -1,27 +1,10 @@
 package com.ruoyi.project.office;
 
-import com.alibaba.fastjson2.JSONObject;
 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.project.office.documentserver.models.enums.Action;
-import com.ruoyi.project.office.documentserver.models.enums.Type;
-import com.ruoyi.project.office.documentserver.models.filemodel.FileModel;
-import com.ruoyi.project.office.dto.PreviewOfficeFileDTO;
-import com.ruoyi.project.office.entities.User;
-import com.ruoyi.project.office.entities.UserFile;
-import com.ruoyi.project.office.services.configurers.FileConfigurer;
-import com.ruoyi.project.office.services.configurers.wrappers.DefaultFileWrapper;
-import com.ruoyi.system.service.ISysUserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Locale;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @Component