feature (办公基价迁移)： 完成办公计价迁移

1. 办公案例下载
2. 办公案例清洗
3. 办公基价计算
4. 办公基价导入
5. 物业基价菜单调整
6. 住宅租赁挂牌案例下载
7. 住宅租赁案例清洗

ruoyi/Dockerfile

@@ -0,0 +1,15 @@
+FROM 172.16.30.92:5000/uv:jdk-1.8.0
+
+VOLUME /tmp
+# 将jar包添加到容器中并更名为app.jar
+
+ADD ./target/uv-data-backend.jar app.jar
+# 创建日志目录
+#RUN mkdir -p /var/log/uv-data/ /opt/sites/collateral/ /opt/sites/calc/ /opt/sites/hanlp-data/
+
+#RUN mkdir -p /opt/sites/collateral/
+
+# 运行jar包
+#RUN bash -c 'touch /app.jar'
+# -Djava.security.egd为了缩短tomcat启动时间
+CMD java -Xms2048m -Xmx2048m -jar /app.jar --spring.profiles.active=prod

ruoyi/makefile.ps1

@@ -0,0 +1,6 @@
+param([string]$v=$(throw "Parameter missing: -v Version"))
+
+
+docker build  -t 172.16.30.243:5000/uv-data-backend:v$v  .
+
+docker push 172.16.30.243:5000/uv-data-backend:v$v

ruoyi/pom.xml

@@ -3,15 +3,11 @@
 		 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.ruoyi</groupId>
-	<artifactId>ruoyi</artifactId>
+	<groupId>com.uvaluation</groupId>
+	<artifactId>uv-data-backend</artifactId>
 	<version>2.2.0</version>
 	<packaging>jar</packaging>
 
-	<name>ruoyi</name>
-	<url>http://www.ruoyi.vip</url>
-	<description>若依管理系统</description>
-
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>

ruoyi/sql/office_price.sql

@@ -1,24 +1,3 @@
--- create type dbo.DWA_PROJECTBASEPRICE_OFFICE_MANU_Table as table(
--- 	BuildingID bigint NOT NULL,
--- 	ProjectID bigint NULL,
--- 	County nvarchar (512) NULL,
--- 	Loop nvarchar (512) NULL,
--- 	Block nvarchar (512) NULL,
--- 	ProjectAddr nvarchar (1024) NULL,
--- 	ProjectName nvarchar (1024) NULL,
--- 	Year int NULL,
--- 	AvgArea decimal (18, 2) NULL,
--- 	TotalFloorSum nvarchar (32) NULL,
--- 	UpperFloorSum nvarchar (32) NULL,
--- 	OfficeClass nvarchar (256) NULL,
--- 	Grade nvarchar (64) NULL,
--- 	MainPrice_1 decimal (18, 2) NULL,
--- 	MainPriceRent_1 decimal (18, 2) NULL,
--- 	MainPrice decimal (18, 2) NULL,
--- 	MainPriceRent decimal (18, 2) NULL,
--- 	ModifyDate date NULL
--- )
--- go
 create type dbo.DWA_PROJECTBASEPRICE_OFFICE_MANU_Table as table
 (
     BuildingID nvarchar(20) null

ruoyi/sql/rent_price.sql

@@ -0,0 +1,12 @@
+create type [dbo].[DWA_PROJECTBASEPRICE_RENT_MANU_Table] as table(
+	 ID int not null
+    , ProjectID nvarchar(32) primary key
+    , MainCoff_Rent decimal(7, 4)
+    , RentPrice decimal(18, 2)
+    , MainRentPrice decimal(18, 2)
+    , RentPrice_1 decimal(18, 2)
+    , VOPPAT varchar(64)
+    , VOPPA decimal(18, 6)
+    , ModifyDate date
+)
+go

ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java

@@ -1,111 +0,0 @@
-package com.ruoyi.project.data.cases.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.ruoyi.common.utils.LoadUtil;
-import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleClosingCase;
-import com.ruoyi.project.data.cases.mapper.OriginalResidenceSaleClosingCaseMapper;
-import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceSaleClosingCaseMapper;
-import com.ruoyi.project.data.cases.service.IOriginalResidenceRentClosingCaseService;
-import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleClosingCaseService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.core.namedparam.SqlParameterSource;
-import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-@Service
-@DS("compute")
-public class OriginalResidenceRentClosingCaseServiceImpl implements IOriginalResidenceRentClosingCaseService  {
-
-    private static Logger logger = LoggerFactory.getLogger(OriginalResidenceRentClosingCaseServiceImpl.class);
-
-    @Autowired
-    private OriginalResidenceSaleClosingCaseMapper originalResidenceSaleClosingCaseMapper;
-    @Autowired
-    private DownloadOriginalResidenceSaleClosingCaseMapper downloadOriginalResidenceSaleClosingCaseMapper;
-    @Autowired
-    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    /**
-     *
-     */
-    @Scheduled(cron = "0 0 5 9 * ?")
-    @Override
-    public void pullData() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        Integer targetTableRoute = new Integer(String.format("%d%02d", calendar.get(Calendar.YEAR),
-                calendar.get(Calendar.MONTH)));
-        calendar.add(Calendar.MONTH, 1);
-        Integer computeTableRoute = new Integer(String.format("%d%02d", calendar.get(Calendar.YEAR),
-                calendar.get(Calendar.MONTH) + 1));
-
-        prepare(computeTableRoute);
-        List<OriginalResidenceSaleClosingCase> list =
-                downloadOriginalResidenceSaleClosingCaseMapper.download(targetTableRoute);
-        list.parallelStream().forEach(originalResidenceSaleClosingCase -> {
-            originalResidenceSaleClosingCase.setCaseId(originalResidenceSaleClosingCase.generateCaseId());
-//            originalResidenceSaleClosingCase.setCleanPropertyType(originalResidenceSaleClosingCase.refinePropertyType());
-//            originalResidenceSaleClosingCase.setCleanCurrentFloor(originalResidenceSaleClosingCase
-//            .refineCurrentFloor());
-//            originalResidenceSaleClosingCase.setCleanBuildingAddress(originalResidenceSaleClosingCase
-//            .refineBuildingAddress());
-        });
-        running(computeTableRoute, list);
-//        after(computeTableRoute);
-    }
-
-    /**
-     * 准备工作 创建表
-     *
-     * @param computeTableRoute
-     */
-    public void prepare(Integer computeTableRoute) {
-        originalResidenceSaleClosingCaseMapper.createTable(computeTableRoute);
-//        originalResidenceSaleClosingCaseMapper.createClosingCaseRawTable(computeTableRoute);
-        originalResidenceSaleClosingCaseMapper.createCleanTable(computeTableRoute);
-    }
-
-    /**
-     * 批量入库
-     *
-     * @param computeTableRoute
-     * @param list
-     */
-    public void running(Integer computeTableRoute, List<OriginalResidenceSaleClosingCase> list) {
-        SqlParameterSource[] batchParams = SqlParameterSourceUtils.createBatch(list.toArray());
-        int[] updateCounts = namedParameterJdbcTemplate.batchUpdate("insert into dbo" +
-                        ".original_residence_sale_closing_case_" + computeTableRoute + "(case_id,case_county_name," +
-                        "case_block_name,case_loopline_name,case_community_name,case_address,case_area," +
-                        "case_unit_price,case_total_price,case_house_type,case_signing_date,case_register_date," +
-                        "case_agency_name,case_agency_type,case_seller_type,case_buyer_type,case_birthday," +
-                        "case_deal_type,clean_property_type,create_time) " +
-                        "values (:caseId,:caseCountyName,:caseBlockName,:caseLoopName,:caseCommunityName," +
-                        ":caseAddress,:caseArea,:caseUnitPrice,:caseTotalPrice,:caseHouseType,:caseSigningDate," +
-                        ":caseRegisterDate,:agencyName,:agencyType,:sellerType,:buyerType,:birthday," +
-                        ":cleanCaseType,:cleanPropertyType,GETDATE());",
-                batchParams);
-    }
-
-    /**
-     * 匹配数据
-     *
-     * @param yearMonth
-     */
-    public void after(Integer yearMonth) {
-        // 清洗挂牌案例
-        String rawSql = LoadUtil.loadContent("sql-template/clear_residence_sale_closing_case.sql");
-        String sql = rawSql.replace("#yearMonth#", yearMonth.toString());
-        jdbcTemplate.update(sql);
-    }
-}

ruoyi/src/main/java/com/uvaluation/RuoYiApplication.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package com.uvaluation;
 
 //import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
@@ -18,15 +18,5 @@ public class RuoYiApplication {
     public static void main(String[] args) {
         System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
     }
 }

ruoyi/src/main/java/com/uvaluation/RuoYiServletInitializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package com.uvaluation;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

ruoyi/src/main/java/com/uvaluation/common/constant/Constants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.constant;
+package com.uvaluation.common.constant;
 
 import io.jsonwebtoken.Claims;
 

ruoyi/src/main/java/com/uvaluation/common/constant/GenConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.constant;
+package com.uvaluation.common.constant;
 
 /**
  * 代码生成通用常量

ruoyi/src/main/java/com/uvaluation/common/constant/HttpStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.constant;
+package com.uvaluation.common.constant;
 
 /**
  * 返回状态码

ruoyi/src/main/java/com/uvaluation/common/constant/ScheduleConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.constant;
+package com.uvaluation.common.constant;
 
 /**
  * 任务调度通用常量

ruoyi/src/main/java/com/uvaluation/common/constant/UserConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.constant;
+package com.uvaluation.common.constant;
 
 /**
  * 用户常量信息

ruoyi/src/main/java/com/uvaluation/common/core/lang/UUID.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.lang;
+package com.uvaluation.common.core.lang;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
-import com.ruoyi.common.exception.UtilException;
+import com.uvaluation.common.exception.UtilException;
 
 /**
  * 提供通用唯一识别码（universally unique identifier）（UUID）实现

ruoyi/src/main/java/com/uvaluation/common/core/text/CharsetKit.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.core.text;
+package com.uvaluation.common.core.text;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * 字符集工具类

ruoyi/src/main/java/com/uvaluation/common/core/text/Convert.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.text;
+package com.uvaluation.common.core.text;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -6,7 +6,7 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * 类型转换器

ruoyi/src/main/java/com/uvaluation/common/core/text/StrFormatter.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.text;
+package com.uvaluation.common.core.text;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * 字符串格式化

ruoyi/src/main/java/com/uvaluation/common/enums/HttpMethod.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.enums;
+package com.uvaluation.common.enums;
 
 import java.util.HashMap;
 import java.util.Map;

ruoyi/src/main/java/com/uvaluation/common/enums/UserStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.enums;
+package com.uvaluation.common.enums;
 
 /**
  * 用户状态

ruoyi/src/main/java/com/uvaluation/common/exception/BaseException.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.exception;
+package com.uvaluation.common.exception;
 
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.MessageUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * 基础异常

ruoyi/src/main/java/com/uvaluation/common/exception/CustomException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception;
+package com.uvaluation.common.exception;
 
 /**
  * 自定义异常

ruoyi/src/main/java/com/uvaluation/common/exception/DemoModeException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception;
+package com.uvaluation.common.exception;
 
 /**
  * 演示模式异常

ruoyi/src/main/java/com/uvaluation/common/exception/UtilException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception;
+package com.uvaluation.common.exception;
 
 /**
  * 工具类异常

ruoyi/src/main/java/com/uvaluation/common/exception/file/FileException.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.exception.file;
+package com.uvaluation.common.exception.file;
 
-import com.ruoyi.common.exception.BaseException;
+import com.uvaluation.common.exception.BaseException;
 
 /**
  * 文件信息异常类

ruoyi/src/main/java/com/uvaluation/common/exception/file/FileNameLengthLimitExceededException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.file;
+package com.uvaluation.common.exception.file;
 
 /**
  * 文件名称超长限制异常类

ruoyi/src/main/java/com/uvaluation/common/exception/file/FileSizeLimitExceededException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.file;
+package com.uvaluation.common.exception.file;
 
 /**
  * 文件名大小限制异常类

ruoyi/src/main/java/com/uvaluation/common/exception/file/InvalidExtensionException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.file;
+package com.uvaluation.common.exception.file;
 
 import java.util.Arrays;
 import org.apache.commons.fileupload.FileUploadException;

ruoyi/src/main/java/com/uvaluation/common/exception/job/TaskException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.job;
+package com.uvaluation.common.exception.job;
 
 /**
  * 计划策略异常

ruoyi/src/main/java/com/uvaluation/common/exception/user/CaptchaException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.user;
+package com.uvaluation.common.exception.user;
 
 /**
  * 验证码错误异常类

ruoyi/src/main/java/com/uvaluation/common/exception/user/CaptchaExpireException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.user;
+package com.uvaluation.common.exception.user;
 
 /**
  * 验证码失效异常类

ruoyi/src/main/java/com/uvaluation/common/exception/user/UserException.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.exception.user;
+package com.uvaluation.common.exception.user;
 
-import com.ruoyi.common.exception.BaseException;
+import com.uvaluation.common.exception.BaseException;
 
 /**
  * 用户信息异常类

ruoyi/src/main/java/com/uvaluation/common/exception/user/UserPasswordNotMatchException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.user;
+package com.uvaluation.common.exception.user;
 
 /**
  * 用户密码不正确或不符合规范异常类

ruoyi/src/main/java/com/uvaluation/common/filter/RepeatableFilter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.filter;
+package com.uvaluation.common.filter;
 
 import java.io.IOException;
 import javax.servlet.Filter;
@@ -9,7 +9,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.http.MediaType;
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * Repeatable 过滤器

ruoyi/src/main/java/com/uvaluation/common/filter/RepeatedlyRequestWrapper.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.filter;
+package com.uvaluation.common.filter;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -9,7 +9,7 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import com.ruoyi.common.utils.http.HttpHelper;
+import com.uvaluation.common.utils.http.HttpHelper;
 
 /**
  * 构建可重复读取inputStream的request

ruoyi/src/main/java/com/uvaluation/common/filter/XssFilter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.filter;
+package com.uvaluation.common.filter;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,7 +13,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * 防止XSS攻击的过滤器

ruoyi/src/main/java/com/uvaluation/common/filter/XssHttpServletRequestWrapper.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.filter;
+package com.uvaluation.common.filter;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletRequestWrapper;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.html.EscapeUtil;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.common.utils.html.EscapeUtil;
 
 /**
  * XSS过滤处理

ruoyi/src/main/java/com/uvaluation/common/utils/Arith.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

ruoyi/src/main/java/com/uvaluation/common/utils/DateUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;

ruoyi/src/main/java/com/uvaluation/common/utils/ExceptionUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

ruoyi/src/main/java/com/uvaluation/common/utils/IdUtils.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
-import com.ruoyi.common.core.lang.UUID;
+import com.uvaluation.common.core.lang.UUID;
 
 /**
  * ID生成器工具类

ruoyi/src/main/java/com/uvaluation/common/utils/LoadUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import java.io.BufferedReader;
 import java.io.IOException;

ruoyi/src/main/java/com/uvaluation/common/utils/LogUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 /**
  * 处理并记录日志文件

ruoyi/src/main/java/com/uvaluation/common/utils/MessageUtils.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.uvaluation.common.utils.spring.SpringUtils;
 
 /**
  * 获取i18n资源文件

ruoyi/src/main/java/com/uvaluation/common/utils/SecurityUtils.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.exception.CustomException;
-import com.ruoyi.framework.security.LoginUser;
+import com.uvaluation.common.constant.HttpStatus;
+import com.uvaluation.common.exception.CustomException;
+import com.uvaluation.framework.security.LoginUser;
 
 /**
  * 安全服务工具类

ruoyi/src/main/java/com/uvaluation/common/utils/ServletUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpSession;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import com.ruoyi.common.core.text.Convert;
+import com.uvaluation.common.core.text.Convert;
 
 /**
  * 客户端工具类

ruoyi/src/main/java/com/uvaluation/common/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -6,7 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import com.ruoyi.common.core.text.StrFormatter;
+import com.uvaluation.common.core.text.StrFormatter;
 
 /**
  * 字符串工具类

ruoyi/src/main/java/com/uvaluation/common/utils/Threads.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;

ruoyi/src/main/java/com/uvaluation/common/utils/VerifyCodeUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils;
+package com.uvaluation.common.utils;
 
 import java.awt.Color;
 import java.awt.Font;

ruoyi/src/main/java/com/uvaluation/common/utils/bean/BeanUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.bean;
+package com.uvaluation.common.utils.bean;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

ruoyi/src/main/java/com/uvaluation/common/utils/file/FileUploadUtils.java

@@ -1,17 +1,17 @@
-package com.ruoyi.common.utils.file;
+package com.uvaluation.common.utils.file;
 
 import java.io.File;
 import java.io.IOException;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
-import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
-import com.ruoyi.common.exception.file.InvalidExtensionException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.security.Md5Utils;
-import com.ruoyi.framework.config.RuoYiConfig;
+import com.uvaluation.common.constant.Constants;
+import com.uvaluation.common.exception.file.FileNameLengthLimitExceededException;
+import com.uvaluation.common.exception.file.FileSizeLimitExceededException;
+import com.uvaluation.common.exception.file.InvalidExtensionException;
+import com.uvaluation.common.utils.DateUtils;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.common.utils.security.Md5Utils;
+import com.uvaluation.framework.config.RuoYiConfig;
 
 /**
  * 文件上传工具类

ruoyi/src/main/java/com/uvaluation/common/utils/file/FileUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.file;
+package com.uvaluation.common.utils.file;
 
 import java.io.*;
 import java.net.URLEncoder;

ruoyi/src/main/java/com/uvaluation/common/utils/file/MimeTypeUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.file;
+package com.uvaluation.common.utils.file;
 
 /**
  * 媒体类型工具类

ruoyi/src/main/java/com/uvaluation/common/utils/html/EscapeUtil.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.utils.html;
+package com.uvaluation.common.utils.html;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * 转义和反转义工具类

ruoyi/src/main/java/com/uvaluation/common/utils/html/HTMLFilter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.html;
+package com.uvaluation.common.utils.html;
 
 import java.util.ArrayList;
 import java.util.Collections;

ruoyi/src/main/java/com/uvaluation/common/utils/http/HttpHelper.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.http;
+package com.uvaluation.common.utils.http;
 
 import java.io.BufferedReader;
 import java.io.IOException;

ruoyi/src/main/java/com/uvaluation/common/utils/http/HttpUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.http;
+package com.uvaluation.common.utils.http;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -18,7 +18,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.common.constant.Constants;
+import com.uvaluation.common.constant.Constants;
 
 /**
  * 通用http发送方法

ruoyi/src/main/java/com/uvaluation/common/utils/ip/AddressUtils.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.utils.ip;
+package com.uvaluation.common.utils.ip;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
+import com.uvaluation.common.constant.Constants;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.common.utils.http.HttpUtils;
+import com.uvaluation.framework.config.RuoYiConfig;
 
 /**
  * 获取地址类

ruoyi/src/main/java/com/uvaluation/common/utils/ip/IpUtils.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.utils.ip;
+package com.uvaluation.common.utils.ip;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * 获取IP方法

ruoyi/src/main/java/com/uvaluation/common/utils/job/AbstractQuartzJob.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.job;
+package com.uvaluation.common.utils.job;
 
 import java.util.Date;
 import org.quartz.Job;
@@ -6,15 +6,15 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.utils.ExceptionUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.project.monitor.domain.SysJob;
-import com.ruoyi.project.monitor.domain.SysJobLog;
-import com.ruoyi.project.monitor.service.ISysJobLogService;
+import com.uvaluation.common.constant.Constants;
+import com.uvaluation.common.constant.ScheduleConstants;
+import com.uvaluation.common.utils.ExceptionUtil;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.common.utils.bean.BeanUtils;
+import com.uvaluation.common.utils.spring.SpringUtils;
+import com.uvaluation.project.monitor.domain.SysJob;
+import com.uvaluation.project.monitor.domain.SysJobLog;
+import com.uvaluation.project.monitor.service.ISysJobLogService;
 
 /**
  * 抽象quartz调用

ruoyi/src/main/java/com/uvaluation/common/utils/job/CronUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.job;
+package com.uvaluation.common.utils.job;
 
 import java.text.ParseException;
 import java.util.Date;

ruoyi/src/main/java/com/uvaluation/common/utils/job/JobInvokeUtil.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.utils.job;
+package com.uvaluation.common.utils.job;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.project.monitor.domain.SysJob;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.common.utils.spring.SpringUtils;
+import com.uvaluation.project.monitor.domain.SysJob;
 
 /**
  * 任务执行工具

ruoyi/src/main/java/com/uvaluation/common/utils/job/QuartzDisallowConcurrentExecution.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.utils.job;
+package com.uvaluation.common.utils.job;
 
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
-import com.ruoyi.project.monitor.domain.SysJob;
+import com.uvaluation.project.monitor.domain.SysJob;
 
 /**
  * 定时任务处理（禁止并发执行）

ruoyi/src/main/java/com/uvaluation/common/utils/job/QuartzJobExecution.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.utils.job;
+package com.uvaluation.common.utils.job;
 
 import org.quartz.JobExecutionContext;
-import com.ruoyi.project.monitor.domain.SysJob;
+import com.uvaluation.project.monitor.domain.SysJob;
 
 /**
  * 定时任务处理（允许并发执行）

ruoyi/src/main/java/com/uvaluation/common/utils/job/ScheduleUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.job;
+package com.uvaluation.common.utils.job;
 
 import org.quartz.CronScheduleBuilder;
 import org.quartz.CronTrigger;
@@ -10,10 +10,10 @@ import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.quartz.TriggerBuilder;
 import org.quartz.TriggerKey;
-import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.common.exception.job.TaskException.Code;
-import com.ruoyi.project.monitor.domain.SysJob;
+import com.uvaluation.common.constant.ScheduleConstants;
+import com.uvaluation.common.exception.job.TaskException;
+import com.uvaluation.common.exception.job.TaskException.Code;
+import com.uvaluation.project.monitor.domain.SysJob;
 
 /**
  * 定时任务工具类

ruoyi/src/main/java/com/uvaluation/common/utils/poi/ExcelUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.poi;
+package com.uvaluation.common.utils.poi;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -40,17 +40,17 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFDataValidation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
-import com.ruoyi.framework.aspectj.lang.annotation.Excels;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.exception.CustomException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.uvaluation.framework.aspectj.lang.annotation.Excel;
+import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.uvaluation.framework.aspectj.lang.annotation.Excel.Type;
+import com.uvaluation.framework.aspectj.lang.annotation.Excels;
+import com.uvaluation.framework.config.RuoYiConfig;
+import com.uvaluation.framework.web.domain.AjaxResult;
+import com.uvaluation.common.core.text.Convert;
+import com.uvaluation.common.exception.CustomException;
+import com.uvaluation.common.utils.DateUtils;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.common.utils.reflect.ReflectUtils;
 
 /**
  * Excel相关处理

ruoyi/src/main/java/com/uvaluation/common/utils/reflect/ReflectUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.reflect;
+package com.uvaluation.common.utils.reflect;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -8,14 +8,13 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Date;
 
-import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.DateUtils;
+import com.uvaluation.common.core.text.Convert;
+import com.uvaluation.common.utils.DateUtils;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.

ruoyi/src/main/java/com/uvaluation/common/utils/security/Md5Utils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.security;
+package com.uvaluation.common.utils.security;
 
 import java.security.MessageDigest;
 import org.slf4j.Logger;

ruoyi/src/main/java/com/uvaluation/common/utils/sign/Base64.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.sign;
+package com.uvaluation.common.utils.sign;
 
 /**
  * Base64工具类

ruoyi/src/main/java/com/uvaluation/common/utils/spring/SpringUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.spring;
+package com.uvaluation.common.utils.spring;
 
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;

ruoyi/src/main/java/com/uvaluation/common/utils/sql/SqlUtil.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.utils.sql;
+package com.uvaluation.common.utils.sql;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * sql操作工具类

ruoyi/src/main/java/com/uvaluation/framework/aspectj/DataScopeAspect.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj;
+package com.uvaluation.framework.aspectj;
 
 import java.lang.reflect.Method;
 import org.aspectj.lang.JoinPoint;
@@ -8,15 +8,15 @@ import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.domain.BaseEntity;
-import com.ruoyi.project.system.domain.SysRole;
-import com.ruoyi.project.system.domain.SysUser;
+import com.uvaluation.common.utils.ServletUtils;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.common.utils.spring.SpringUtils;
+import com.uvaluation.framework.aspectj.lang.annotation.DataScope;
+import com.uvaluation.framework.security.LoginUser;
+import com.uvaluation.framework.security.service.TokenService;
+import com.uvaluation.framework.web.domain.BaseEntity;
+import com.uvaluation.project.system.domain.SysRole;
+import com.uvaluation.project.system.domain.SysUser;
 
 /**
  * 数据过滤处理
@@ -53,7 +53,7 @@ public class DataScopeAspect
     public static final String DATA_SCOPE_SELF = "5";
 
     // 配置织入点
-    @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataScope)")
+    @Pointcut("@annotation(com.uvaluation.framework.aspectj.lang.annotation.DataScope)")
     public void dataScopePointCut()
     {
     }

ruoyi/src/main/java/com/uvaluation/framework/aspectj/DataSourceAspect.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj;
+package com.uvaluation.framework.aspectj;
 
 import java.util.Objects;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -11,9 +11,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
-import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.framework.aspectj.lang.annotation.DataSource;
+import com.uvaluation.framework.datasource.DynamicDataSourceContextHolder;
 
 /**
  * 多数据源处理
@@ -27,8 +27,8 @@ public class DataSourceAspect
 {
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"
-            + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")
+    @Pointcut("@annotation(com.uvaluation.framework.aspectj.lang.annotation.DataSource)"
+            + "|| @within(com.uvaluation.framework.aspectj.lang.annotation.DataSource)")
     public void dsPointCut()
     {
 

ruoyi/src/main/java/com/uvaluation/framework/aspectj/LogAspect.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj;
+package com.uvaluation.framework.aspectj;
 
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -17,18 +17,18 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.HandlerMapping;
 import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.enums.HttpMethod;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessStatus;
-import com.ruoyi.framework.manager.AsyncManager;
-import com.ruoyi.framework.manager.factory.AsyncFactory;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.project.monitor.domain.SysOperLog;
+import com.uvaluation.common.enums.HttpMethod;
+import com.uvaluation.common.utils.ServletUtils;
+import com.uvaluation.common.utils.StringUtils;
+import com.uvaluation.common.utils.ip.IpUtils;
+import com.uvaluation.common.utils.spring.SpringUtils;
+import com.uvaluation.framework.aspectj.lang.annotation.Log;
+import com.uvaluation.framework.aspectj.lang.enums.BusinessStatus;
+import com.uvaluation.framework.manager.AsyncManager;
+import com.uvaluation.framework.manager.factory.AsyncFactory;
+import com.uvaluation.framework.security.LoginUser;
+import com.uvaluation.framework.security.service.TokenService;
+import com.uvaluation.project.monitor.domain.SysOperLog;
 
 /**
  * 操作日志记录处理
@@ -42,7 +42,7 @@ public class LogAspect
     private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
 
     // 配置织入点
-    @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Log)")
+    @Pointcut("@annotation(com.uvaluation.framework.aspectj.lang.annotation.Log)")
     public void logPointCut()
     {
     }

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/DataScope.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
+package com.uvaluation.framework.aspectj.lang.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/DataSource.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
+package com.uvaluation.framework.aspectj.lang.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -6,7 +6,7 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
+import com.uvaluation.framework.aspectj.lang.enums.DataSourceType;
 
 /**
  * 自定义多数据源切换注解

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Excel.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
+package com.uvaluation.framework.aspectj.lang.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Excels.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
+package com.uvaluation.framework.aspectj.lang.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Log.java

@@ -1,12 +1,12 @@
-package com.ruoyi.framework.aspectj.lang.annotation;
+package com.uvaluation.framework.aspectj.lang.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.aspectj.lang.enums.OperatorType;
+import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
+import com.uvaluation.framework.aspectj.lang.enums.OperatorType;
 
 /**
  * 自定义操作日志记录注解

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/BusinessStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj.lang.enums;
+package com.uvaluation.framework.aspectj.lang.enums;
 
 /**
  * 操作状态

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/BusinessType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj.lang.enums;
+package com.uvaluation.framework.aspectj.lang.enums;
 
 /**
  * 业务操作类型

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/DataSourceType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj.lang.enums;
+package com.uvaluation.framework.aspectj.lang.enums;
 
 /**
  * 数据源

ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/OperatorType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.aspectj.lang.enums;
+package com.uvaluation.framework.aspectj.lang.enums;
 
 /**
  * 操作人类别

ruoyi/src/main/java/com/uvaluation/framework/config/ApplicationConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import java.util.TimeZone;
 import org.mybatis.spring.annotation.MapperScan;

ruoyi/src/main/java/com/uvaluation/framework/config/FastJson2JsonRedisSerializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;

ruoyi/src/main/java/com/uvaluation/framework/config/FilterConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.ruoyi.common.filter.RepeatableFilter;
-import com.ruoyi.common.filter.XssFilter;
-import com.ruoyi.common.utils.StringUtils;
+import com.uvaluation.common.filter.RepeatableFilter;
+import com.uvaluation.common.filter.XssFilter;
+import com.uvaluation.common.utils.StringUtils;
 
 /**
  * Filter配置

ruoyi/src/main/java/com/uvaluation/framework/config/GenConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

ruoyi/src/main/java/com/uvaluation/framework/config/HikariCPConfig.java

@@ -1,31 +1,12 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.sql.DataSource;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 //import com.alibaba.druid.pool.DruidDataSource;
 //import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 //import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 //import com.alibaba.druid.util.Utils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
-import com.ruoyi.framework.datasource.DynamicDataSource;
+
 
 /**
  * druid 配置多数据源

ruoyi/src/main/java/com/uvaluation/framework/config/MyBatisConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import java.io.IOException;
 import java.util.ArrayList;

ruoyi/src/main/java/com/uvaluation/framework/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;

ruoyi/src/main/java/com/uvaluation/framework/config/ResourcesConfig.java

@@ -1,12 +1,12 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+import com.uvaluation.common.constant.Constants;
+import com.uvaluation.framework.interceptor.RepeatSubmitInterceptor;
 
 /**
  * 通用配置

ruoyi/src/main/java/com/uvaluation/framework/config/RuoYiConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

ruoyi/src/main/java/com/uvaluation/framework/config/ScheduleConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

ruoyi/src/main/java/com/uvaluation/framework/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -12,9 +12,9 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
-import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
+import com.uvaluation.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.uvaluation.framework.security.handle.AuthenticationEntryPointImpl;
+import com.uvaluation.framework.security.handle.LogoutSuccessHandlerImpl;
 
 /**
  * spring security配置

ruoyi/src/main/java/com/uvaluation/framework/config/ServerConfig.java

@@ -1,8 +1,8 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.ServletUtils;
+import com.uvaluation.common.utils.ServletUtils;
 
 /**
  * 服务相关配置

ruoyi/src/main/java/com/uvaluation/framework/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import java.util.ArrayList;
 import java.util.List;

ruoyi/src/main/java/com/uvaluation/framework/config/ThreadPoolConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import com.ruoyi.common.utils.Threads;
+import com.uvaluation.common.utils.Threads;
 
 /**
  * 线程池配置

ruoyi/src/main/java/com/uvaluation/framework/config/UVConfig.java

@@ -1,6 +1,5 @@
-package com.ruoyi.framework.config;
+package com.uvaluation.framework.config;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 

ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSource.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.datasource;
+package com.uvaluation.framework.datasource;
 
 import java.util.Map;
 import javax.sql.DataSource;