feature (作价和环境部署)：完成住宅租赁迁移

1. 挂牌案例下载
2. 挂牌案例清洗
3. 成交案例下载
4. 成交案例清洗
5. 住宅租赁基价计算
6. repakcage name
7. 配置环境部署

ruoyi-ui/Dockerfile

@@ -0,0 +1,5 @@
+FROM 172.16.30.243:5000/nginx:1.19.0
+
+COPY dist/ /home/ruoyi/projects/ruoyi-ui
+COPY nginx/default.conf /etc/nginx/conf.d/default.conf
+

ruoyi-ui/makefile.ps1

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

ruoyi-ui/nginx/default.conf

@@ -1,22 +1,23 @@
 server {
-  listen       80;
+    listen       80;
-  server_name  localhost;
+    server_name  localhost;
 
-  #charset koi8-r;
+    location / {
-  access_log  /var/log/nginx/host.access.log  main;
+        root   /home/ruoyi/projects/ruoyi-ui;
-  error_log  /var/log/nginx/error.log  error;
+        try_files $uri $uri/ /index.html;
+        index  index.html index.htm;
+    }
 
-  location / {
+    location /prod-api/ {
-      root   /usr/share/nginx/html;
+        # proxy_set_header Host $http_host;
-      index  index.html index.htm;
+        # proxy_set_header X-Real-IP $remote_addr;
-  }
+        # proxy_set_header REMOTE-HOST $remote_addr;
+        # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://172.16.30.243:9700/;
+    }
 
-  #error_page  404              /404.html;
+    error_page   500 502 503 504  /50x.html;
-
+    location = /50x.html {
-  # redirect server error pages to the static page /50x.html
+        root   /usr/share/nginx/html;
-  #
+    }
-  error_page   500 502 503 504  /50x.html;
-  location = /50x.html {
-      root   /usr/share/nginx/html;
-  }
 }

ruoyi-ui/src/views/data/price/ArtificialResidenceRentPrice.vue

@@ -27,7 +27,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-bell"
@@ -35,7 +35,7 @@
           @click="handleSync"
           v-hasPermi="['system:user:import']"
         >从作价导入</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -45,7 +45,7 @@
           v-hasPermi="['system:user:import']"
         >文件导入</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -53,19 +53,19 @@
           @click="handleExport"
           v-hasPermi="['system:user:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column label="年月" align="center" prop="yearMonth" fixed />
       <el-table-column label="小区ID" align="center" prop="communityId" fixed />
-      <el-table-column label="租金主力面积系数" align="center" prop="mainRentCoefficient" />
+      <el-table-column label="租金主力面积系数" align="center" prop="mainCoefficientRent" />
       <el-table-column label="平均租金" align="center" prop="rentPrice" />
       <el-table-column label="主力面积租金" align="center" prop="mainRentPrice" />
       <el-table-column label="平均租金（上周期）" align="center" prop="rentPrice_1" />
       <el-table-column label="价格涨跌幅类型-调整后" align="center" prop="voppat" />
       <el-table-column label="价格涨跌幅-调整后" align="center" prop="voppa" />
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -80,7 +80,7 @@
             v-hasPermi="['system:user:edit']"
           >修改</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -131,7 +131,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="租金主力面积系数">
-              <el-input v-model="form.mainRentCoefficient" disabled readonly />
+              <el-input v-model="form.mainCoefficientRent" disabled readonly />
             </el-form-item>
           </el-col>
         </el-row>
@@ -267,7 +267,7 @@ export default {
         // 上传的地址
         url:
           process.env.VUE_APP_BASE_API +
-          "/data/rentprice/residence/artificial/importData"
+          "/data/rent-price/residence/artificial/importData"
       },
       // 表单参数
       form: {

ruoyi-ui/src/views/data/price/UltimateResidenceRentPrice.vue

@@ -62,13 +62,13 @@
       <el-table-column label="区域" align="center" prop="county" />
       <el-table-column label="板块" align="center" prop="block" />
       <el-table-column label="环线" align="center" prop="loop" />
-      <el-table-column label="国际社区分" align="center" prop="loop" />
+      <el-table-column label="国际社区分" align="center" prop="interCommunity" />
-      <el-table-column label="重点小学名称" align="center" prop="loop" />
+      <el-table-column label="重点小学名称" align="center" prop="magnetSchool" />
-      <el-table-column label="物业档次" align="center" prop="loop" />
+      <el-table-column label="物业档次" align="center" prop="projectLevel" />
-      <el-table-column label="室数量-AI" align="center" prop="loop" />
+      <el-table-column label="室数量-AI" align="center" prop="roomNum" />
 
       <el-table-column label="标准基价（元/㎡·月）" align="center" prop="rentPrice" />
-      <el-table-column label="平均租金（元/㎡·月）" align="center" prop="rentPrice" />
+      <el-table-column label="平均租金（元/㎡·月）" align="center" prop="mainRentPrice" />
       <el-table-column label="散租挂牌案例" align="center" prop="散租挂牌案例" />
       <el-table-column label="租金涨跌幅" align="center" prop="voppa" />
       <el-table-column label="租金-工房1室" align="center" prop="gf_1Room" />

ruoyi-ui/vue.config.js

@@ -95,7 +95,7 @@ module.exports = {
             .plugin('ScriptExtHtmlWebpackPlugin')
             .after('html')
             .use('script-ext-html-webpack-plugin', [{
-            // `runtime` must same as runtimeChunk name. default is `runtime`
+              // `runtime` must same as runtimeChunk name. default is `runtime`
               inline: /runtime\..*\.js$/
             }])
             .end()

ruoyi/makefile.ps1

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

ruoyi/pom.xml

@@ -89,7 +89,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
+<!--			<scope>runtime</scope>-->
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.sqlserver</groupId>
@@ -261,9 +261,25 @@
 	<build>
 		<finalName>${project.artifactId}</finalName>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+<!--				<executions>-->
+<!--					<execution>-->
+<!--						<goals>-->
+<!--							<goal>repackage</goal>-->
+<!--						</goals>-->
+<!--					</execution>-->
+<!--				</executions>-->
 				<configuration>
 					<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
 				</configuration>

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

@@ -1,4 +1,4 @@
-package com.uvaluation;
+package com.ruoyi;
 
 //import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,11 @@
-package com.uvaluation.common.core.lang;
+package com.ruoyi.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.uvaluation.common.exception.UtilException;
+import com.ruoyi.common.exception.UtilException;
 
 /**
  * 提供通用唯一识别码（universally unique identifier）（UUID）实现

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.core.text;
+package com.ruoyi.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.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 类型转换器

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.filter;
+package com.ruoyi.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.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * Repeatable 过滤器

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.filter;
+package com.ruoyi.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.uvaluation.common.utils.http.HttpHelper;
+import com.ruoyi.common.utils.http.HttpHelper;
 
 /**
  * 构建可重复读取inputStream的request

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.filter;
+package com.ruoyi.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.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 防止XSS攻击的过滤器

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.filter;
+package com.ruoyi.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.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
-import com.uvaluation.common.utils.html.EscapeUtil;
+import com.ruoyi.common.utils.html.EscapeUtil;
 
 /**
  * XSS过滤处理

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.utils;
+package com.ruoyi.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.uvaluation.common.core.text.Convert;
+import com.ruoyi.common.core.text.Convert;
 
 /**
  * 客户端工具类

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.utils;
+package com.ruoyi.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.uvaluation.common.core.text.StrFormatter;
+import com.ruoyi.common.core.text.StrFormatter;
 
 /**
  * 字符串工具类

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

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

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

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

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

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

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

@@ -1,17 +1,17 @@
-package com.uvaluation.common.utils.file;
+package com.ruoyi.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.uvaluation.common.constant.Constants;
+import com.ruoyi.common.constant.Constants;
-import com.uvaluation.common.exception.file.FileNameLengthLimitExceededException;
+import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
-import com.uvaluation.common.exception.file.FileSizeLimitExceededException;
+import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
-import com.uvaluation.common.exception.file.InvalidExtensionException;
+import com.ruoyi.common.exception.file.InvalidExtensionException;
-import com.uvaluation.common.utils.DateUtils;
+import com.ruoyi.common.utils.DateUtils;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
-import com.uvaluation.common.utils.security.Md5Utils;
+import com.ruoyi.common.utils.security.Md5Utils;
-import com.uvaluation.framework.config.RuoYiConfig;
+import com.ruoyi.framework.config.RuoYiConfig;
 
 /**
  * 文件上传工具类

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.utils.http;
+package com.ruoyi.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.uvaluation.common.constant.Constants;
+import com.ruoyi.common.constant.Constants;
 
 /**
  * 通用http发送方法

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.utils.job;
+package com.ruoyi.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.uvaluation.common.constant.Constants;
+import com.ruoyi.common.constant.Constants;
-import com.uvaluation.common.constant.ScheduleConstants;
+import com.ruoyi.common.constant.ScheduleConstants;
-import com.uvaluation.common.utils.ExceptionUtil;
+import com.ruoyi.common.utils.ExceptionUtil;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
-import com.uvaluation.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
-import com.uvaluation.common.utils.spring.SpringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
-import com.uvaluation.project.monitor.domain.SysJob;
+import com.ruoyi.project.monitor.domain.SysJob;
-import com.uvaluation.project.monitor.domain.SysJobLog;
+import com.ruoyi.project.monitor.domain.SysJobLog;
-import com.uvaluation.project.monitor.service.ISysJobLogService;
+import com.ruoyi.project.monitor.service.ISysJobLogService;
 
 /**
  * 抽象quartz调用

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.utils.job;
+package com.ruoyi.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.uvaluation.common.constant.ScheduleConstants;
+import com.ruoyi.common.constant.ScheduleConstants;
-import com.uvaluation.common.exception.job.TaskException;
+import com.ruoyi.common.exception.job.TaskException;
-import com.uvaluation.common.exception.job.TaskException.Code;
+import com.ruoyi.common.exception.job.TaskException.Code;
-import com.uvaluation.project.monitor.domain.SysJob;
+import com.ruoyi.project.monitor.domain.SysJob;
 
 /**
  * 定时任务工具类

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

@@ -1,4 +1,4 @@
-package com.uvaluation.common.utils.poi;
+package com.ruoyi.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.uvaluation.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.Type;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
-import com.uvaluation.framework.aspectj.lang.annotation.Excels;
+import com.ruoyi.framework.aspectj.lang.annotation.Excels;
-import com.uvaluation.framework.config.RuoYiConfig;
+import com.ruoyi.framework.config.RuoYiConfig;
-import com.uvaluation.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.AjaxResult;
-import com.uvaluation.common.core.text.Convert;
+import com.ruoyi.common.core.text.Convert;
-import com.uvaluation.common.exception.CustomException;
+import com.ruoyi.common.exception.CustomException;
-import com.uvaluation.common.utils.DateUtils;
+import com.ruoyi.common.utils.DateUtils;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
-import com.uvaluation.common.utils.reflect.ReflectUtils;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
 
 /**
  * Excel相关处理

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.framework.aspectj;
+package com.ruoyi.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.uvaluation.common.utils.ServletUtils;
+import com.ruoyi.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
-import com.uvaluation.common.utils.spring.SpringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.uvaluation.framework.security.LoginUser;
+import com.ruoyi.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
+import com.ruoyi.framework.security.service.TokenService;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.web.domain.BaseEntity;
-import com.uvaluation.project.system.domain.SysRole;
+import com.ruoyi.project.system.domain.SysRole;
-import com.uvaluation.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUser;
 
 /**
  * 数据过滤处理
@@ -53,7 +53,7 @@ public class DataScopeAspect
     public static final String DATA_SCOPE_SELF = "5";
 
     // 配置织入点
-    @Pointcut("@annotation(com.uvaluation.framework.aspectj.lang.annotation.DataScope)")
+    @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataScope)")
     public void dataScopePointCut()
     {
     }

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

@@ -1,4 +1,4 @@
-package com.uvaluation.framework.aspectj;
+package com.ruoyi.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.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.DataSource;
+import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
-import com.uvaluation.framework.datasource.DynamicDataSourceContextHolder;
+import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
 
 /**
  * 多数据源处理
@@ -27,8 +27,8 @@ public class DataSourceAspect
 {
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Pointcut("@annotation(com.uvaluation.framework.aspectj.lang.annotation.DataSource)"
+    @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"
-            + "|| @within(com.uvaluation.framework.aspectj.lang.annotation.DataSource)")
+            + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")
     public void dsPointCut()
     {
 

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

@@ -1,4 +1,4 @@
-package com.uvaluation.framework.aspectj;
+package com.ruoyi.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.uvaluation.common.enums.HttpMethod;
+import com.ruoyi.common.enums.HttpMethod;
-import com.uvaluation.common.utils.ServletUtils;
+import com.ruoyi.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
-import com.uvaluation.common.utils.ip.IpUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
-import com.uvaluation.common.utils.spring.SpringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessStatus;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessStatus;
-import com.uvaluation.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.AsyncManager;
-import com.uvaluation.framework.manager.factory.AsyncFactory;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
-import com.uvaluation.framework.security.LoginUser;
+import com.ruoyi.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
+import com.ruoyi.framework.security.service.TokenService;
-import com.uvaluation.project.monitor.domain.SysOperLog;
+import com.ruoyi.project.monitor.domain.SysOperLog;
 
 /**
  * 操作日志记录处理
@@ -42,7 +42,7 @@ public class LogAspect
     private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
 
     // 配置织入点
-    @Pointcut("@annotation(com.uvaluation.framework.aspectj.lang.annotation.Log)")
+    @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Log)")
     public void logPointCut()
     {
     }

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.framework.aspectj.lang.annotation;
+package com.ruoyi.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.uvaluation.framework.aspectj.lang.enums.DataSourceType;
+import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
 
 /**
  * 自定义多数据源切换注解

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

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

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

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

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

@@ -1,12 +1,12 @@
-package com.uvaluation.framework.aspectj.lang.annotation;
+package com.ruoyi.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.uvaluation.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.aspectj.lang.enums.OperatorType;
+import com.ruoyi.framework.aspectj.lang.enums.OperatorType;
 
 /**
  * 自定义操作日志记录注解

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.framework.config;
+package com.ruoyi.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.uvaluation.common.filter.RepeatableFilter;
+import com.ruoyi.common.filter.RepeatableFilter;
-import com.uvaluation.common.filter.XssFilter;
+import com.ruoyi.common.filter.XssFilter;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * Filter配置

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

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

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

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

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

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

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

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

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

@@ -1,12 +1,12 @@
-package com.uvaluation.framework.config;
+package com.ruoyi.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.uvaluation.common.constant.Constants;
+import com.ruoyi.common.constant.Constants;
-import com.uvaluation.framework.interceptor.RepeatSubmitInterceptor;
+import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
 
 /**
  * 通用配置

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.framework.config;
+package com.ruoyi.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.uvaluation.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.uvaluation.framework.security.handle.AuthenticationEntryPointImpl;
+import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
-import com.uvaluation.framework.security.handle.LogoutSuccessHandlerImpl;
+import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 
 /**
  * spring security配置

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.uvaluation.framework.config;
+package com.ruoyi.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.uvaluation.common.utils.Threads;
+import com.ruoyi.common.utils.Threads;
 
 /**
  * 线程池配置

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

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