diff --git a/ruoyi-ui/Dockerfile b/ruoyi-ui/Dockerfile
new file mode 100644
index 000000000..8522fa81b
--- /dev/null
+++ b/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
+
diff --git a/ruoyi-ui/makefile.ps1 b/ruoyi-ui/makefile.ps1
index e69de29bb..0450031ae 100644
--- a/ruoyi-ui/makefile.ps1
+++ b/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
diff --git a/ruoyi-ui/nginx/default.conf b/ruoyi-ui/nginx/default.conf
index d7176219f..388294135 100644
--- a/ruoyi-ui/nginx/default.conf
+++ b/ruoyi-ui/nginx/default.conf
@@ -1,22 +1,23 @@
server {
- listen 80;
- server_name localhost;
+ listen 80;
+ server_name localhost;
- #charset koi8-r;
- access_log /var/log/nginx/host.access.log main;
- error_log /var/log/nginx/error.log error;
+ location / {
+ root /home/ruoyi/projects/ruoyi-ui;
+ try_files $uri $uri/ /index.html;
+ index index.html index.htm;
+ }
- location / {
- root /usr/share/nginx/html;
- index index.html index.htm;
- }
+ location /prod-api/ {
+ # proxy_set_header Host $http_host;
+ # 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;
-
- # redirect server error pages to the static page /50x.html
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /usr/share/nginx/html;
- }
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root /usr/share/nginx/html;
+ }
}
diff --git a/ruoyi-ui/src/views/data/price/ArtificialResidenceRentPrice.vue b/ruoyi-ui/src/views/data/price/ArtificialResidenceRentPrice.vue
index c61aacf05..31a253a31 100644
--- a/ruoyi-ui/src/views/data/price/ArtificialResidenceRentPrice.vue
+++ b/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: {
diff --git a/ruoyi-ui/src/views/data/price/UltimateResidenceRentPrice.vue b/ruoyi-ui/src/views/data/price/UltimateResidenceRentPrice.vue
index b6e125a08..26f5d9ab4 100644
--- a/ruoyi-ui/src/views/data/price/UltimateResidenceRentPrice.vue
+++ b/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="loop" />
- <el-table-column label="物业档次" align="center" prop="loop" />
- <el-table-column label="室数量-AI" align="center" prop="loop" />
+ <el-table-column label="国际社区分" align="center" prop="interCommunity" />
+ <el-table-column label="重点小学名称" align="center" prop="magnetSchool" />
+ <el-table-column label="物业档次" align="center" prop="projectLevel" />
+ <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" />
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index fe464f338..61cddb789 100644
--- a/ruoyi-ui/vue.config.js
+++ b/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()
diff --git a/ruoyi/makefile.ps1 b/ruoyi/makefile.ps1
index 6832a6342..368796ad6 100644
--- a/ruoyi/makefile.ps1
+++ b/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
diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml
index cd0df0a04..87dc5b2e3 100644
--- a/ruoyi/pom.xml
+++ b/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>
diff --git a/ruoyi/src/main/java/com/uvaluation/RuoYiApplication.java b/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/RuoYiApplication.java
rename to ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
index ed9dacf50..353799c4d 100644
--- a/ruoyi/src/main/java/com/uvaluation/RuoYiApplication.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/RuoYiServletInitializer.java b/ruoyi/src/main/java/com/ruoyi/RuoYiServletInitializer.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/RuoYiServletInitializer.java
rename to ruoyi/src/main/java/com/ruoyi/RuoYiServletInitializer.java
index ffc825321..6de67dc76 100644
--- a/ruoyi/src/main/java/com/uvaluation/RuoYiServletInitializer.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/constant/Constants.java b/ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/constant/Constants.java
rename to ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
index 4a6ef575b..de1c16e91 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/constant/Constants.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/constant/GenConstants.java b/ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/common/constant/GenConstants.java
rename to ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java
index b8d0c7bfb..0e460c57d 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/constant/GenConstants.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.constant;
+package com.ruoyi.common.constant;
/**
* 代码生成通用常量
diff --git a/ruoyi/src/main/java/com/uvaluation/common/constant/HttpStatus.java b/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/constant/HttpStatus.java
rename to ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
index 84e790638..e029d170d 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/constant/HttpStatus.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.constant;
+package com.ruoyi.common.constant;
/**
* 返回状态码
diff --git a/ruoyi/src/main/java/com/uvaluation/common/constant/ScheduleConstants.java b/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/common/constant/ScheduleConstants.java
rename to ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
index f6bafd19e..005e17623 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/constant/ScheduleConstants.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.constant;
+package com.ruoyi.common.constant;
/**
* 任务调度通用常量
diff --git a/ruoyi/src/main/java/com/uvaluation/common/constant/UserConstants.java b/ruoyi/src/main/java/com/ruoyi/common/constant/UserConstants.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/common/constant/UserConstants.java
rename to ruoyi/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 061e65532..b1f25ec31 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/constant/UserConstants.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.constant;
+package com.ruoyi.common.constant;
/**
* 用户常量信息
diff --git a/ruoyi/src/main/java/com/uvaluation/common/core/lang/UUID.java b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/core/lang/UUID.java
rename to ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java
index a5da41407..3adf3df8c 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/core/lang/UUID.java
+++ b/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）实现
diff --git a/ruoyi/src/main/java/com/uvaluation/common/core/text/CharsetKit.java b/ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/common/core/text/CharsetKit.java
rename to ruoyi/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 0e16caf06..77b1a79dd 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/core/text/CharsetKit.java
+++ b/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;
/**
* 字符集工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/core/text/Convert.java b/ruoyi/src/main/java/com/ruoyi/common/core/text/Convert.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/core/text/Convert.java
rename to ruoyi/src/main/java/com/ruoyi/common/core/text/Convert.java
index e2dcec437..b17dfdda6 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/core/text/Convert.java
+++ b/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;
/**
* 类型转换器
diff --git a/ruoyi/src/main/java/com/uvaluation/common/core/text/StrFormatter.java b/ruoyi/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/core/text/StrFormatter.java
rename to ruoyi/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
index e01081aaf..c78ac776d 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/core/text/StrFormatter.java
+++ b/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;
/**
* 字符串格式化
diff --git a/ruoyi/src/main/java/com/uvaluation/common/enums/HttpMethod.java b/ruoyi/src/main/java/com/ruoyi/common/enums/HttpMethod.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/common/enums/HttpMethod.java
rename to ruoyi/src/main/java/com/ruoyi/common/enums/HttpMethod.java
index 5419db108..be6f73929 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/enums/HttpMethod.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/enums/UserStatus.java b/ruoyi/src/main/java/com/ruoyi/common/enums/UserStatus.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/common/enums/UserStatus.java
rename to ruoyi/src/main/java/com/ruoyi/common/enums/UserStatus.java
index 38a56f316..d7ff44a98 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/enums/UserStatus.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/enums/UserStatus.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.enums;
+package com.ruoyi.common.enums;
/**
* 用户状态
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/BaseException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/BaseException.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/BaseException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/BaseException.java
index 5117b4123..92d6ae2dc 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/BaseException.java
+++ b/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.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.StringUtils;
/**
* 基础异常
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/CustomException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/CustomException.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/CustomException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/CustomException.java
index ad8b09d3b..d96c7ba7b 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/CustomException.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/exception/CustomException.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.exception;
+package com.ruoyi.common.exception;
/**
* 自定义异常
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/DemoModeException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/DemoModeException.java
similarity index 83%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/DemoModeException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/DemoModeException.java
index 6408f1e94..f6ad2ab49 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/DemoModeException.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/exception/DemoModeException.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.exception;
+package com.ruoyi.common.exception;
/**
* 演示模式异常
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/UtilException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/UtilException.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/UtilException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/UtilException.java
index d0cb72117..980fa465e 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/UtilException.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/exception/UtilException.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.exception;
+package com.ruoyi.common.exception;
/**
* 工具类异常
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/file/FileException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileException.java
similarity index 72%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/file/FileException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/file/FileException.java
index baab9a968..75d6dbf1a 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/file/FileException.java
+++ b/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;
/**
* 文件信息异常类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/file/FileNameLengthLimitExceededException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/file/FileNameLengthLimitExceededException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
index e91202b1e..70e0ec9b1 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/file/FileNameLengthLimitExceededException.java
+++ b/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;
/**
* 文件名称超长限制异常类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/file/FileSizeLimitExceededException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/file/FileSizeLimitExceededException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
index 88663bb2b..ec6ab054d 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/file/FileSizeLimitExceededException.java
+++ b/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;
/**
* 文件名大小限制异常类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/file/InvalidExtensionException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/file/InvalidExtensionException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
index 1bd661a19..8f63a799c 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/file/InvalidExtensionException.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/job/TaskException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/job/TaskException.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/job/TaskException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/job/TaskException.java
index 8677d52e3..a567b408b 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/job/TaskException.java
+++ b/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;
/**
* 计划策略异常
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/user/CaptchaException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
similarity index 84%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/user/CaptchaException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
index 9908fdf24..389dbc753 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/user/CaptchaException.java
+++ b/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;
/**
* 验证码错误异常类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/user/CaptchaExpireException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
similarity index 85%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/user/CaptchaExpireException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
index 5d775160c..85f94861b 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/user/CaptchaExpireException.java
+++ b/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;
/**
* 验证码失效异常类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/user/UserException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/user/UserException.java
similarity index 72%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/user/UserException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/user/UserException.java
index 6d696f2e0..aa015f88a 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/user/UserException.java
+++ b/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;
/**
* 用户信息异常类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/exception/user/UserPasswordNotMatchException.java b/ruoyi/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/common/exception/user/UserPasswordNotMatchException.java
rename to ruoyi/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
index 51dd7e423..a7f3e5ffe 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/exception/user/UserPasswordNotMatchException.java
+++ b/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;
/**
* 用户密码不正确或不符合规范异常类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/filter/RepeatableFilter.java b/ruoyi/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/common/filter/RepeatableFilter.java
rename to ruoyi/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
index 65950c8a1..6e3edfcee 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/filter/RepeatableFilter.java
+++ b/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 过滤器
diff --git a/ruoyi/src/main/java/com/uvaluation/common/filter/RepeatedlyRequestWrapper.java b/ruoyi/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/common/filter/RepeatedlyRequestWrapper.java
rename to ruoyi/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
index 07625ec6b..bd7097f53 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/filter/RepeatedlyRequestWrapper.java
+++ b/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
diff --git a/ruoyi/src/main/java/com/uvaluation/common/filter/XssFilter.java b/ruoyi/src/main/java/com/ruoyi/common/filter/XssFilter.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/common/filter/XssFilter.java
rename to ruoyi/src/main/java/com/ruoyi/common/filter/XssFilter.java
index c1533f6f6..b3df122ec 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/filter/XssFilter.java
+++ b/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攻击的过滤器
diff --git a/ruoyi/src/main/java/com/uvaluation/common/filter/XssHttpServletRequestWrapper.java b/ruoyi/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/common/filter/XssHttpServletRequestWrapper.java
rename to ruoyi/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
index 0aeae8259..17bfec1d2 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/filter/XssHttpServletRequestWrapper.java
+++ b/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.uvaluation.common.utils.html.EscapeUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.html.EscapeUtil;
/**
* XSS过滤处理
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/Arith.java b/ruoyi/src/main/java/com/ruoyi/common/utils/Arith.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/Arith.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/Arith.java
index d776dbdec..48a650e89 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/Arith.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/DateUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/DateUtils.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/DateUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 3cb592fd6..536cb3cf0 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/DateUtils.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/ExceptionUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/ExceptionUtil.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
index 7ae6de6e3..ad57439b7 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/ExceptionUtil.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/IdUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/IdUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java
index eb349bda4..a21313f92 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/IdUtils.java
+++ b/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生成器工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/LoadUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/LoadUtil.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/LoadUtil.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/LoadUtil.java
index 29090be01..fbf1a8336 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/LoadUtil.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/LogUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/LogUtils.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/LogUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/LogUtils.java
index 602605cac..0de30c6b6 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/LogUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/LogUtils.java
@@ -1,4 +1,4 @@
-package com.uvaluation.common.utils;
+package com.ruoyi.common.utils;
/**
* 处理并记录日志文件
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/MessageUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/MessageUtils.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/MessageUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/MessageUtils.java
index d9a1fb747..7dac75a3b 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/MessageUtils.java
+++ b/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资源文件
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/SecurityUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/SecurityUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index 970b2cd20..1c868372b 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/SecurityUtils.java
+++ b/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.uvaluation.common.exception.CustomException;
-import com.uvaluation.framework.security.LoginUser;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.framework.security.LoginUser;
/**
* 安全服务工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/ServletUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ServletUtils.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/ServletUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index f0dc539f5..ab9ebcfcd 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/ServletUtils.java
+++ b/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;
/**
* 客户端工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/StringUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/StringUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
index 288c1f10f..e32daa51b 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/StringUtils.java
+++ b/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;
/**
* 字符串工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/Threads.java b/ruoyi/src/main/java/com/ruoyi/common/utils/Threads.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/Threads.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/Threads.java
index 472c13f7f..193419506 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/Threads.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/VerifyCodeUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/VerifyCodeUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
index cf5a468f8..912bc044f 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/VerifyCodeUtils.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/bean/BeanUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/bean/BeanUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java
index 0607a518f..4463662d4 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/bean/BeanUtils.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/file/FileUploadUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/file/FileUploadUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 096dc145b..821ddfe76 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/file/FileUploadUtils.java
+++ b/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.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;
+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;
/**
* 文件上传工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/file/FileUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/file/FileUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
index 8d5c4ac17..d9bac41bd 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/file/FileUtils.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/file/MimeTypeUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/file/MimeTypeUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
index 73cc11254..698464128 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/file/MimeTypeUtils.java
+++ b/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;
/**
* 媒体类型工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/html/EscapeUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/html/EscapeUtil.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
index 72a0bbbc4..970d66484 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/html/EscapeUtil.java
+++ b/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;
/**
* 转义和反转义工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/html/HTMLFilter.java b/ruoyi/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/html/HTMLFilter.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
index 6a558fe85..6244cd57b 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/html/HTMLFilter.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/http/HttpHelper.java b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/http/HttpHelper.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
index ff2e94954..dcf1b8f53 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/http/HttpHelper.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/http/HttpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/http/HttpUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 318524352..736d9d894 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/http/HttpUtils.java
+++ b/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发送方法
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/ip/AddressUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
similarity index 85%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/ip/AddressUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
index 2889f7b8c..4d2041e08 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/ip/AddressUtils.java
+++ b/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.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.http.HttpUtils;
-import com.uvaluation.framework.config.RuoYiConfig;
+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;
/**
* 获取地址类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/ip/IpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/ip/IpUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
index bd7f3b7c8..2b9a2673a 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/ip/IpUtils.java
+++ b/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方法
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/job/AbstractQuartzJob.java b/ruoyi/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java
similarity index 84%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/job/AbstractQuartzJob.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java
index 9f27b9959..ec7e62216 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/job/AbstractQuartzJob.java
+++ b/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.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;
+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;
/**
* 抽象quartz调用
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/job/CronUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/job/CronUtils.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/job/CronUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/job/CronUtils.java
index a9dc67607..0763a8d0f 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/job/CronUtils.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/job/JobInvokeUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/job/JobInvokeUtil.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java
index d4ecab1f1..1670ee536 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/job/JobInvokeUtil.java
+++ b/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.uvaluation.common.utils.spring.SpringUtils;
-import com.uvaluation.project.monitor.domain.SysJob;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.project.monitor.domain.SysJob;
/**
* 任务执行工具
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/job/QuartzDisallowConcurrentExecution.java b/ruoyi/src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java
similarity index 82%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/job/QuartzDisallowConcurrentExecution.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java
index 41d933b84..709708839 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/job/QuartzDisallowConcurrentExecution.java
+++ b/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;
/**
* 定时任务处理（禁止并发执行）
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/job/QuartzJobExecution.java b/ruoyi/src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java
similarity index 78%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/job/QuartzJobExecution.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java
index 9dbd4a742..55aa7e040 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/job/QuartzJobExecution.java
+++ b/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;
/**
* 定时任务处理（允许并发执行）
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/job/ScheduleUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/job/ScheduleUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java
index a48aca856..3e107c695 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/job/ScheduleUtils.java
+++ b/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.uvaluation.common.exception.job.TaskException;
-import com.uvaluation.common.exception.job.TaskException.Code;
-import com.uvaluation.project.monitor.domain.SysJob;
+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;
/**
* 定时任务工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/poi/ExcelUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/poi/ExcelUtil.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 31f00454d..14987f8b5 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/poi/ExcelUtil.java
+++ b/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.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;
+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;
/**
* Excel相关处理
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/reflect/ReflectUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/reflect/ReflectUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
index f92b0d4a5..eda4bbe5e 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/reflect/ReflectUtils.java
+++ b/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.uvaluation.common.utils.DateUtils;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
/**
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/security/Md5Utils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/security/Md5Utils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java
index 306e13154..2bb1a8b20 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/security/Md5Utils.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/sign/Base64.java b/ruoyi/src/main/java/com/ruoyi/common/utils/sign/Base64.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/sign/Base64.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/sign/Base64.java
index c2204a2f4..ca1cd9248 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/sign/Base64.java
+++ b/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工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/spring/SpringUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/spring/SpringUtils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
index 296043cf7..19bd77ef3 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/spring/SpringUtils.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/common/utils/sql/SqlUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/common/utils/sql/SqlUtil.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
index 508916887..b31804b67 100644
--- a/ruoyi/src/main/java/com/uvaluation/common/utils/sql/SqlUtil.java
+++ b/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操作工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/DataScopeAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/DataScopeAspect.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index ef36d1ebc..c976d959e 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/DataScopeAspect.java
+++ b/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.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;
+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;
/**
* 数据过滤处理
@@ -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()
{
}
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/DataSourceAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
similarity index 80%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/DataSourceAspect.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
index 090aea927..c2bb89225 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/DataSourceAspect.java
+++ b/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.uvaluation.framework.aspectj.lang.annotation.DataSource;
-import com.uvaluation.framework.datasource.DynamicDataSourceContextHolder;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
+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)"
- + "|| @within(com.uvaluation.framework.aspectj.lang.annotation.DataSource)")
+ @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"
+ + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")
public void dsPointCut()
{
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/LogAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/LogAspect.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 99f067f9f..4ccf8ec93 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/LogAspect.java
+++ b/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.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;
+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;
/**
* 操作日志记录处理
@@ -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()
{
}
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/DataScope.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/DataScope.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
index c91757e46..abb59782f 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/DataScope.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/DataSource.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
similarity index 84%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/DataSource.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
index 9446caa01..e5a780eb4 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/DataSource.java
+++ b/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;
/**
* 自定义多数据源切换注解
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Excel.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Excel.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
index 39d0090d3..8037cb8ba 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Excel.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Excels.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java
similarity index 84%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Excels.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java
index 6f99ff2fc..ff2280201 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Excels.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Log.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java
similarity index 80%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Log.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java
index b883a0752..8388f701c 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/annotation/Log.java
+++ b/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.uvaluation.framework.aspectj.lang.enums.OperatorType;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.aspectj.lang.enums.OperatorType;
/**
* 自定义操作日志记录注解
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/BusinessStatus.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java
similarity index 75%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/BusinessStatus.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java
index 3582d3906..2e1c7af99 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/BusinessStatus.java
+++ b/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;
/**
* 操作状态
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/BusinessType.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/BusinessType.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java
index fde385ae8..2810215eb 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/BusinessType.java
+++ b/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;
/**
* 业务操作类型
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/DataSourceType.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java
similarity index 74%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/DataSourceType.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java
index 44a2028b6..103cd8068 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/DataSourceType.java
+++ b/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;
/**
* 数据源
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/OperatorType.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java
similarity index 80%
rename from ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/OperatorType.java
rename to ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java
index 1e1226c64..e3d87db34 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/aspectj/lang/enums/OperatorType.java
+++ b/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;
/**
* 操作人类别
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/ApplicationConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/ApplicationConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
index dd47d65a5..55de6f7f7 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/ApplicationConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/DruidConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java
similarity index 100%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/DruidConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/FastJson2JsonRedisSerializer.java b/ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/FastJson2JsonRedisSerializer.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
index 41179afae..2f27ed11c 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/FastJson2JsonRedisSerializer.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/FilterConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/FilterConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java
index cca829840..b5f03ec88 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/FilterConfig.java
+++ b/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.uvaluation.common.filter.XssFilter;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.filter.RepeatableFilter;
+import com.ruoyi.common.filter.XssFilter;
+import com.ruoyi.common.utils.StringUtils;
/**
* Filter配置
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/GenConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/GenConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java
index 198f3c693..ef4456bb5 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/GenConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/HikariCPConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/HikariCPConfig.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/HikariCPConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/HikariCPConfig.java
index 836d343bc..a53cbe381 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/HikariCPConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/MyBatisConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/MyBatisConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
index bc82dc05e..0bc8a2bec 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/MyBatisConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/RedisConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/RedisConfig.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/RedisConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/RedisConfig.java
index de591026f..8eb4fb20d 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/RedisConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/ResourcesConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/ResourcesConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index 412f018ea..f1a51688d 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/ResourcesConfig.java
+++ b/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.uvaluation.framework.interceptor.RepeatSubmitInterceptor;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
/**
* 通用配置
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/RuoYiConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/RuoYiConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
index 977ed3a2f..ed524cd72 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/RuoYiConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/ScheduleConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/ScheduleConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
index d269a269f..a607e85f7 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/ScheduleConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/SecurityConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/SecurityConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index a85520ef7..32854a4a2 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/SecurityConfig.java
+++ b/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.uvaluation.framework.security.handle.AuthenticationEntryPointImpl;
-import com.uvaluation.framework.security.handle.LogoutSuccessHandlerImpl;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
+import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
/**
* spring security配置
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/ServerConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ServerConfig.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/ServerConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/ServerConfig.java
index ec72c8ae0..b5b7de316 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/ServerConfig.java
+++ b/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;
/**
* 服务相关配置
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/SwaggerConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/SwaggerConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
index 8a73925d9..692bb308d 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/SwaggerConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/ThreadPoolConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/ThreadPoolConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
index b8c78d4ab..0d67c2241 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/ThreadPoolConfig.java
+++ b/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;
/**
* 线程池配置
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/UVConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/UVConfig.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/UVConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/UVConfig.java
index f69c72294..69fd024ac 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/config/UVConfig.java
+++ b/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;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/config/properties/DruidProperties.java b/ruoyi/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
similarity index 100%
rename from ruoyi/src/main/java/com/uvaluation/framework/config/properties/DruidProperties.java
rename to ruoyi/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSource.java b/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSource.java
rename to ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
index 375d3c574..e70b8cfa7 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSource.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.datasource;
+package com.ruoyi.framework.datasource;
import java.util.Map;
import javax.sql.DataSource;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSourceContextHolder.java b/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSourceContextHolder.java
rename to ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
index c8b9fd0e6..3572db917 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSourceContextHolder.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.datasource;
+package com.ruoyi.framework.datasource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSourcePagerDialectConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourcePagerDialectConfig.java
similarity index 100%
rename from ruoyi/src/main/java/com/uvaluation/framework/datasource/DynamicDataSourcePagerDialectConfig.java
rename to ruoyi/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourcePagerDialectConfig.java
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/framework/interceptor/RepeatSubmitInterceptor.java
rename to ruoyi/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
index 85a88aa75..088798d55 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.interceptor;
+package com.ruoyi.framework.interceptor;
import java.lang.reflect.Method;
import javax.servlet.http.HttpServletRequest;
@@ -7,9 +7,9 @@ import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import com.alibaba.fastjson.JSONObject;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.framework.interceptor.annotation.RepeatSubmit;
-import com.uvaluation.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
+import com.ruoyi.framework.web.domain.AjaxResult;
/**
* 防止重复提交拦截器
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/interceptor/annotation/RepeatSubmit.java b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/framework/interceptor/annotation/RepeatSubmit.java
rename to ruoyi/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java
index 22c436692..0fbd73b68 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/interceptor/annotation/RepeatSubmit.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.interceptor.annotation;
+package com.ruoyi.framework.interceptor.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/interceptor/impl/SameUrlDataInterceptor.java b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/framework/interceptor/impl/SameUrlDataInterceptor.java
rename to ruoyi/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
index e77ecdd36..05f59ee00 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/interceptor/impl/SameUrlDataInterceptor.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.interceptor.impl;
+package com.ruoyi.framework.interceptor.impl;
import java.util.HashMap;
import java.util.Map;
@@ -7,11 +7,11 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject;
-import com.uvaluation.common.filter.RepeatedlyRequestWrapper;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.http.HttpHelper;
-import com.uvaluation.framework.interceptor.RepeatSubmitInterceptor;
-import com.uvaluation.framework.redis.RedisCache;
+import com.ruoyi.common.filter.RepeatedlyRequestWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpHelper;
+import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+import com.ruoyi.framework.redis.RedisCache;
/**
* 判断请求url和数据是否和上一次相同，
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/manager/AsyncManager.java b/ruoyi/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/framework/manager/AsyncManager.java
rename to ruoyi/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
index 6fee8afe8..7387a02cb 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/manager/AsyncManager.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
@@ -1,10 +1,10 @@
-package com.uvaluation.framework.manager;
+package com.ruoyi.framework.manager;
import java.util.TimerTask;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import com.uvaluation.common.utils.Threads;
-import com.uvaluation.common.utils.spring.SpringUtils;
+import com.ruoyi.common.utils.Threads;
+import com.ruoyi.common.utils.spring.SpringUtils;
/**
* 异步任务管理器
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/manager/ShutdownManager.java b/ruoyi/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/framework/manager/ShutdownManager.java
rename to ruoyi/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
index a37a3488f..e36ca3c58 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/manager/ShutdownManager.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.manager;
+package com.ruoyi.framework.manager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/manager/factory/AsyncFactory.java b/ruoyi/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
similarity index 83%
rename from ruoyi/src/main/java/com/uvaluation/framework/manager/factory/AsyncFactory.java
rename to ruoyi/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
index 772d7c396..88633ad48 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/manager/factory/AsyncFactory.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
@@ -1,18 +1,18 @@
-package com.uvaluation.framework.manager.factory;
+package com.ruoyi.framework.manager.factory;
import java.util.TimerTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.utils.LogUtils;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.ip.AddressUtils;
-import com.uvaluation.common.utils.ip.IpUtils;
-import com.uvaluation.common.utils.spring.SpringUtils;
-import com.uvaluation.project.monitor.domain.SysLogininfor;
-import com.uvaluation.project.monitor.domain.SysOperLog;
-import com.uvaluation.project.monitor.service.ISysLogininforService;
-import com.uvaluation.project.monitor.service.ISysOperLogService;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.LogUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.ip.AddressUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.project.monitor.domain.SysLogininfor;
+import com.ruoyi.project.monitor.domain.SysOperLog;
+import com.ruoyi.project.monitor.service.ISysLogininforService;
+import com.ruoyi.project.monitor.service.ISysOperLogService;
import eu.bitwalker.useragentutils.UserAgent;
/**
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/redis/RedisCache.java b/ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/framework/redis/RedisCache.java
rename to ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java
index 4d098e1e2..1bc605061 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/redis/RedisCache.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.redis;
+package com.ruoyi.framework.redis;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/LoginBody.java b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/LoginBody.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java
index 77043b9b2..ebe4f9e2f 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/LoginBody.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.security;
+package com.ruoyi.framework.security;
/**
* 用户登录对象
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/LoginUser.java b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/LoginUser.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java
index 17df8860c..e6b997e97 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/LoginUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -1,11 +1,11 @@
-package com.uvaluation.framework.security;
+package com.ruoyi.framework.security;
import java.util.Collection;
import java.util.Set;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.uvaluation.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUser;
/**
* 登录用户身份权限
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/filter/JwtAuthenticationTokenFilter.java b/ruoyi/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
similarity index 86%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/filter/JwtAuthenticationTokenFilter.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
index de7aec907..fa8a6547b 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/filter/JwtAuthenticationTokenFilter.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.security.filter;
+package com.ruoyi.framework.security.filter;
import java.io.IOException;
import javax.servlet.FilterChain;
@@ -11,10 +11,10 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
/**
* token过滤器 验证token有效性
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/handle/AuthenticationEntryPointImpl.java b/ruoyi/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
similarity index 80%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/handle/AuthenticationEntryPointImpl.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
index 625f86d57..f20bf2e0c 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/handle/AuthenticationEntryPointImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.security.handle;
+package com.ruoyi.framework.security.handle;
import java.io.IOException;
import java.io.Serializable;
@@ -8,10 +8,10 @@ import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSON;
-import com.uvaluation.common.constant.HttpStatus;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.domain.AjaxResult;
/**
* 认证失败处理类 返回未授权
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
similarity index 73%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/handle/LogoutSuccessHandlerImpl.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
index 2147e580c..a41cd0a45 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.security.handle;
+package com.ruoyi.framework.security.handle;
import java.io.IOException;
import javax.servlet.ServletException;
@@ -9,15 +9,15 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import com.alibaba.fastjson.JSON;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.constant.HttpStatus;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
-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.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+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.framework.web.domain.AjaxResult;
/**
* 自定义退出处理类 返回成功
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/service/PermissionService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/PermissionService.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/service/PermissionService.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/service/PermissionService.java
index f3879a3bc..be68cc298 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/service/PermissionService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/PermissionService.java
@@ -1,13 +1,13 @@
-package com.uvaluation.framework.security.service;
+package com.ruoyi.framework.security.service;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.project.system.domain.SysRole;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.system.domain.SysRole;
/**
* RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/service/SysLoginService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
similarity index 82%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/service/SysLoginService.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
index 7a8f873e3..3bb1155a9 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/service/SysLoginService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.security.service;
+package com.ruoyi.framework.security.service;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
@@ -7,16 +7,16 @@ import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.exception.user.CaptchaException;
-import com.uvaluation.common.exception.user.CaptchaExpireException;
-import com.uvaluation.common.exception.user.UserPasswordNotMatchException;
-import com.uvaluation.common.utils.MessageUtils;
-import com.uvaluation.framework.manager.AsyncManager;
-import com.uvaluation.framework.manager.factory.AsyncFactory;
-import com.uvaluation.framework.redis.RedisCache;
-import com.uvaluation.framework.security.LoginUser;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.user.CaptchaException;
+import com.ruoyi.common.exception.user.CaptchaExpireException;
+import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
+import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
+import com.ruoyi.framework.redis.RedisCache;
+import com.ruoyi.framework.security.LoginUser;
/**
* 登录校验方法
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/service/SysPermissionService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
similarity index 85%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/service/SysPermissionService.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
index dbd3595f3..20a2a0b78 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/service/SysPermissionService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
@@ -1,12 +1,12 @@
-package com.uvaluation.framework.security.service;
+package com.ruoyi.framework.security.service;
import java.util.HashSet;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.uvaluation.project.system.domain.SysUser;
-import com.uvaluation.project.system.service.ISysMenuService;
-import com.uvaluation.project.system.service.ISysRoleService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysMenuService;
+import com.ruoyi.project.system.service.ISysRoleService;
/**
* 用户权限处理
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/service/TokenService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/service/TokenService.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index 7359d4cc2..82015c95e 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/service/TokenService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.security.service;
+package com.ruoyi.framework.security.service;
import java.util.HashMap;
import java.util.Map;
@@ -7,14 +7,14 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.utils.IdUtils;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.ip.AddressUtils;
-import com.uvaluation.common.utils.ip.IpUtils;
-import com.uvaluation.framework.redis.RedisCache;
-import com.uvaluation.framework.security.LoginUser;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.IdUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.AddressUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.framework.redis.RedisCache;
+import com.ruoyi.framework.security.LoginUser;
import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/security/service/UserDetailsServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
similarity index 83%
rename from ruoyi/src/main/java/com/uvaluation/framework/security/service/UserDetailsServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
index cc043e4d6..940191fdf 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/security/service/UserDetailsServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.security.service;
+package com.ruoyi.framework.security.service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -7,12 +7,12 @@ import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
-import com.uvaluation.common.enums.UserStatus;
-import com.uvaluation.common.exception.BaseException;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.project.system.domain.SysUser;
-import com.uvaluation.project.system.service.ISysUserService;
+import com.ruoyi.common.enums.UserStatus;
+import com.ruoyi.common.exception.BaseException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
/**
* 用户验证处理
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/task/RyTask.java b/ruoyi/src/main/java/com/ruoyi/framework/task/RyTask.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/framework/task/RyTask.java
rename to ruoyi/src/main/java/com/ruoyi/framework/task/RyTask.java
index 279fe3d37..eb7f5b9a4 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/task/RyTask.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/task/RyTask.java
@@ -1,7 +1,7 @@
-package com.uvaluation.framework.task;
+package com.ruoyi.framework.task;
import org.springframework.stereotype.Component;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
/**
* 定时任务调度测试
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/controller/BaseController.java b/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
similarity index 83%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/controller/BaseController.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
index ebcd0a578..f46935b3b 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/controller/BaseController.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.web.controller;
+package com.ruoyi.framework.web.controller;
import java.beans.PropertyEditorSupport;
import java.util.Date;
@@ -10,14 +10,14 @@ import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.uvaluation.common.constant.HttpStatus;
-import com.uvaluation.common.utils.DateUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.sql.SqlUtil;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.PageDomain;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.framework.web.page.TableSupport;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sql.SqlUtil;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.PageDomain;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.web.page.TableSupport;
/**
* web层通用数据处理
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/AjaxResult.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/AjaxResult.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
index 17dce43fe..84c0dbf8f 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/AjaxResult.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
@@ -1,8 +1,8 @@
-package com.uvaluation.framework.web.domain;
+package com.ruoyi.framework.web.domain;
import java.util.HashMap;
-import com.uvaluation.common.constant.HttpStatus;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.StringUtils;
/**
* 操作消息提醒
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/BaseEntity.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/BaseEntity.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
index 6c3adff60..24beda057 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/BaseEntity.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.web.domain;
+package com.ruoyi.framework.web.domain;
import java.io.Serializable;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/Server.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/Server.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
index c4a010a14..7ffa538e4 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/Server.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
@@ -1,16 +1,16 @@
-package com.uvaluation.framework.web.domain;
+package com.ruoyi.framework.web.domain;
import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
-import com.uvaluation.common.utils.Arith;
-import com.uvaluation.common.utils.ip.IpUtils;
-import com.uvaluation.framework.web.domain.server.Cpu;
-import com.uvaluation.framework.web.domain.server.Jvm;
-import com.uvaluation.framework.web.domain.server.Mem;
-import com.uvaluation.framework.web.domain.server.Sys;
-import com.uvaluation.framework.web.domain.server.SysFile;
+import com.ruoyi.common.utils.Arith;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.framework.web.domain.server.Cpu;
+import com.ruoyi.framework.web.domain.server.Jvm;
+import com.ruoyi.framework.web.domain.server.Mem;
+import com.ruoyi.framework.web.domain.server.Sys;
+import com.ruoyi.framework.web.domain.server.SysFile;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
import oshi.hardware.CentralProcessor.TickType;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/TreeEntity.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/TreeEntity.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java
index 3b551e99f..b07142542 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/TreeEntity.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.web.domain;
+package com.ruoyi.framework.web.domain;
import java.util.ArrayList;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/TreeSelect.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/TreeSelect.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java
index eac19a4a1..680d65b47 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/TreeSelect.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java
@@ -1,11 +1,11 @@
-package com.uvaluation.framework.web.domain;
+package com.ruoyi.framework.web.domain;
import java.io.Serializable;
import java.util.List;
import java.util.stream.Collectors;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.uvaluation.project.system.domain.SysDept;
-import com.uvaluation.project.system.domain.SysMenu;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysMenu;
/**
* Treeselect树结构实体类
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Cpu.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Cpu.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java
index 6ba952934..a13a66cf2 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Cpu.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java
@@ -1,6 +1,6 @@
-package com.uvaluation.framework.web.domain.server;
+package com.ruoyi.framework.web.domain.server;
-import com.uvaluation.common.utils.Arith;
+import com.ruoyi.common.utils.Arith;
/**
* CPU相关信息
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Jvm.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Jvm.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
index 5e7e3b2f3..485d201dd 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Jvm.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
@@ -1,8 +1,8 @@
-package com.uvaluation.framework.web.domain.server;
+package com.ruoyi.framework.web.domain.server;
import java.lang.management.ManagementFactory;
-import com.uvaluation.common.utils.Arith;
-import com.uvaluation.common.utils.DateUtils;
+import com.ruoyi.common.utils.Arith;
+import com.ruoyi.common.utils.DateUtils;
/**
* JVM相关信息
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Mem.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Mem.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java
index b7624b6b3..13eec521a 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Mem.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java
@@ -1,6 +1,6 @@
-package com.uvaluation.framework.web.domain.server;
+package com.ruoyi.framework.web.domain.server;
-import com.uvaluation.common.utils.Arith;
+import com.ruoyi.common.utils.Arith;
/**
* 內存相关信息
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Sys.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Sys.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java
index 53631cf74..45d64d9cd 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/Sys.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.web.domain.server;
+package com.ruoyi.framework.web.domain.server;
/**
* 系统相关信息
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/SysFile.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/SysFile.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java
index 4619e2577..1320cde6e 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/domain/server/SysFile.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.web.domain.server;
+package com.ruoyi.framework.web.domain.server;
/**
* 系统文件相关信息
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/exception/GlobalExceptionHandler.java b/ruoyi/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/exception/GlobalExceptionHandler.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
index 413223abd..9450a5525 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/exception/GlobalExceptionHandler.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.web.exception;
+package com.ruoyi.framework.web.exception;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -10,12 +10,12 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.NoHandlerFoundException;
-import com.uvaluation.common.constant.HttpStatus;
-import com.uvaluation.common.exception.BaseException;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.exception.DemoModeException;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.exception.BaseException;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.DemoModeException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.domain.AjaxResult;
/**
* 全局异常处理器
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/page/PageDomain.java b/ruoyi/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/page/PageDomain.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
index a293015f8..84f700480 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/page/PageDomain.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
@@ -1,6 +1,6 @@
-package com.uvaluation.framework.web.page;
+package com.ruoyi.framework.web.page;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
/**
* 分页数据
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/page/TableDataInfo.java b/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/page/TableDataInfo.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
index ca825b252..c44e52732 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/page/TableDataInfo.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
@@ -1,4 +1,4 @@
-package com.uvaluation.framework.web.page;
+package com.ruoyi.framework.web.page;
import java.io.Serializable;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/framework/web/page/TableSupport.java b/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableSupport.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/framework/web/page/TableSupport.java
rename to ruoyi/src/main/java/com/ruoyi/framework/web/page/TableSupport.java
index e2b1abaea..156417aca 100644
--- a/ruoyi/src/main/java/com/uvaluation/framework/web/page/TableSupport.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/page/TableSupport.java
@@ -1,6 +1,6 @@
-package com.uvaluation.framework.web.page;
+package com.ruoyi.framework.web.page;
-import com.uvaluation.common.utils.ServletUtils;
+import com.ruoyi.common.utils.ServletUtils;
/**
* 表格数据处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/common/CaptchaController.java b/ruoyi/src/main/java/com/ruoyi/project/common/CaptchaController.java
similarity index 82%
rename from ruoyi/src/main/java/com/uvaluation/project/common/CaptchaController.java
rename to ruoyi/src/main/java/com/ruoyi/project/common/CaptchaController.java
index 665a547d4..c5ea83077 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/common/CaptchaController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/common/CaptchaController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.common;
+package com.ruoyi.project.common;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -7,12 +7,12 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.utils.IdUtils;
-import com.uvaluation.common.utils.VerifyCodeUtils;
-import com.uvaluation.common.utils.sign.Base64;
-import com.uvaluation.framework.redis.RedisCache;
-import com.uvaluation.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.IdUtils;
+import com.ruoyi.common.utils.VerifyCodeUtils;
+import com.ruoyi.common.utils.sign.Base64;
+import com.ruoyi.framework.redis.RedisCache;
+import com.ruoyi.framework.web.domain.AjaxResult;
/**
* 验证码操作处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/common/CommonController.java b/ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/common/CommonController.java
rename to ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
index 2ee5c3d6a..4b66a26bf 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/common/CommonController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.common;
+package com.ruoyi.project.common;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -9,13 +9,13 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.file.FileUploadUtils;
-import com.uvaluation.common.utils.file.FileUtils;
-import com.uvaluation.framework.config.RuoYiConfig;
-import com.uvaluation.framework.config.ServerConfig;
-import com.uvaluation.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.framework.web.domain.AjaxResult;
/**
* 通用请求处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/common/UVResponse.java b/ruoyi/src/main/java/com/ruoyi/project/common/UVResponse.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/project/common/UVResponse.java
rename to ruoyi/src/main/java/com/ruoyi/project/common/UVResponse.java
index bfb34008b..3fea8cd3e 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/common/UVResponse.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/common/UVResponse.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.common;
+package com.ruoyi.project.common;
public class UVResponse<T> {
diff --git a/ruoyi/src/main/java/com/uvaluation/project/common/VueSelectModel.java b/ruoyi/src/main/java/com/ruoyi/project/common/VueSelectModel.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/project/common/VueSelectModel.java
rename to ruoyi/src/main/java/com/ruoyi/project/common/VueSelectModel.java
index 267fc10f8..c3268f796 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/common/VueSelectModel.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/common/VueSelectModel.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.common;
+package com.ruoyi.project.common;
public class VueSelectModel<T> {
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/controller/AdrDictController.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/controller/AdrDictController.java
similarity index 82%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/controller/AdrDictController.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/controller/AdrDictController.java
index 98538d9c7..dbfed7875 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/controller/AdrDictController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/controller/AdrDictController.java
@@ -1,14 +1,14 @@
-package com.uvaluation.project.data.basis.controller;
+package com.ruoyi.project.data.basis.controller;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.framework.web.page.TableSupport;
-import com.uvaluation.project.data.basis.domain.LianJiaCommunityDict;
-import com.uvaluation.project.data.basis.service.ILianJiaCommunityDictService;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.web.page.TableSupport;
+import com.ruoyi.project.data.basis.domain.LianJiaCommunityDict;
+import com.ruoyi.project.data.basis.service.ILianJiaCommunityDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/LianJiaCommunityDict.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/LianJiaCommunityDict.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/LianJiaCommunityDict.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/LianJiaCommunityDict.java
index 2ccc2edb3..37185574b 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/LianJiaCommunityDict.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/LianJiaCommunityDict.java
@@ -1,6 +1,6 @@
-package com.uvaluation.project.data.basis.domain;
+package com.ruoyi.project.data.basis.domain;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/UVBasePrice.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/UVBasePrice.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/UVBasePrice.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/UVBasePrice.java
index 2a4dc64bb..97727fd28 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/UVBasePrice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/UVBasePrice.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.basis.domain;
+package com.ruoyi.project.data.basis.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/UVBasePriceQueryModel.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/UVBasePriceQueryModel.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/UVBasePriceQueryModel.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/UVBasePriceQueryModel.java
index 93c985905..86ccc18f5 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/domain/UVBasePriceQueryModel.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/domain/UVBasePriceQueryModel.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.basis.domain;
+package com.ruoyi.project.data.basis.domain;
public class UVBasePriceQueryModel extends UVBasePrice {
private Integer pageIndex;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/mapper/LianJiaCommunityDictMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/mapper/LianJiaCommunityDictMapper.java
similarity index 86%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/mapper/LianJiaCommunityDictMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/mapper/LianJiaCommunityDictMapper.java
index cbd5c5cc9..aeb8b03c1 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/mapper/LianJiaCommunityDictMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/mapper/LianJiaCommunityDictMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.basis.mapper;
+package com.ruoyi.project.data.basis.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.basis.domain.LianJiaCommunityDict;
+import com.ruoyi.project.data.basis.domain.LianJiaCommunityDict;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/mapper/UVBasePriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/mapper/UVBasePriceMapper.java
similarity index 68%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/mapper/UVBasePriceMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/mapper/UVBasePriceMapper.java
index e41cf3760..2a789b3bc 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/mapper/UVBasePriceMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/mapper/UVBasePriceMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.basis.mapper;
+package com.ruoyi.project.data.basis.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.basis.domain.UVBasePrice;
-import com.uvaluation.project.data.basis.domain.UVBasePriceQueryModel;
+import com.ruoyi.project.data.basis.domain.UVBasePrice;
+import com.ruoyi.project.data.basis.domain.UVBasePriceQueryModel;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/service/ILianJiaCommunityDictService.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/service/ILianJiaCommunityDictService.java
similarity index 81%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/service/ILianJiaCommunityDictService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/service/ILianJiaCommunityDictService.java
index 7f343df11..3d3099157 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/service/ILianJiaCommunityDictService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/service/ILianJiaCommunityDictService.java
@@ -1,6 +1,6 @@
-package com.uvaluation.project.data.basis.service;
+package com.ruoyi.project.data.basis.service;
-import com.uvaluation.project.data.basis.domain.LianJiaCommunityDict;
+import com.ruoyi.project.data.basis.domain.LianJiaCommunityDict;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/service/IUVBasePriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/service/IUVBasePriceService.java
similarity index 64%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/service/IUVBasePriceService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/service/IUVBasePriceService.java
index 70e00739e..a69f6fe04 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/service/IUVBasePriceService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/service/IUVBasePriceService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.basis.service;
+package com.ruoyi.project.data.basis.service;
-import com.uvaluation.project.data.basis.domain.UVBasePrice;
-import com.uvaluation.project.data.basis.domain.UVBasePriceQueryModel;
+import com.ruoyi.project.data.basis.domain.UVBasePrice;
+import com.ruoyi.project.data.basis.domain.UVBasePriceQueryModel;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/service/impl/LianJiaCommunityDictServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/service/impl/LianJiaCommunityDictServiceImpl.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/service/impl/LianJiaCommunityDictServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/service/impl/LianJiaCommunityDictServiceImpl.java
index a33ff78f0..cf470608d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/service/impl/LianJiaCommunityDictServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/service/impl/LianJiaCommunityDictServiceImpl.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.basis.service.impl;
+package com.ruoyi.project.data.basis.service.impl;
-import com.uvaluation.project.data.basis.domain.LianJiaCommunityDict;
-import com.uvaluation.project.data.basis.mapper.LianJiaCommunityDictMapper;
-import com.uvaluation.project.data.basis.service.ILianJiaCommunityDictService;
+import com.ruoyi.project.data.basis.domain.LianJiaCommunityDict;
+import com.ruoyi.project.data.basis.mapper.LianJiaCommunityDictMapper;
+import com.ruoyi.project.data.basis.service.ILianJiaCommunityDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/basis/service/impl/UVBasePriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/basis/service/impl/UVBasePriceServiceImpl.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/data/basis/service/impl/UVBasePriceServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/basis/service/impl/UVBasePriceServiceImpl.java
index 140250e38..469e9d2db 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/basis/service/impl/UVBasePriceServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/basis/service/impl/UVBasePriceServiceImpl.java
@@ -1,9 +1,9 @@
-package com.uvaluation.project.data.basis.service.impl;
+package com.ruoyi.project.data.basis.service.impl;
-import com.uvaluation.project.data.basis.domain.UVBasePrice;
-import com.uvaluation.project.data.basis.domain.UVBasePriceQueryModel;
-import com.uvaluation.project.data.basis.mapper.UVBasePriceMapper;
-import com.uvaluation.project.data.basis.service.IUVBasePriceService;
+import com.ruoyi.project.data.basis.domain.UVBasePrice;
+import com.ruoyi.project.data.basis.domain.UVBasePriceQueryModel;
+import com.ruoyi.project.data.basis.mapper.UVBasePriceMapper;
+import com.ruoyi.project.data.basis.service.IUVBasePriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/controller/CasesController.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/controller/CasesController.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java
index 3e44a9741..ee03b6b09 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/controller/CasesController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/controller/CasesController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.controller;
+package com.ruoyi.project.data.cases.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalOfficeCase.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalOfficeCase.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalOfficeCase.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalOfficeCase.java
index e51ae5e88..289848fda 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalOfficeCase.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalOfficeCase.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.domain;
+package com.ruoyi.project.data.cases.domain;
import java.math.BigDecimal;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidencePlatformRentOpeningCase.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidencePlatformRentOpeningCase.java
similarity index 85%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidencePlatformRentOpeningCase.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidencePlatformRentOpeningCase.java
index 5d0f93906..9a1138b80 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidencePlatformRentOpeningCase.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidencePlatformRentOpeningCase.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.domain;
+package com.ruoyi.project.data.cases.domain;
import org.springframework.util.DigestUtils;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceRentClosingCase.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceRentClosingCase.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceRentClosingCase.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceRentClosingCase.java
index 9ca9b4238..4f1ba2228 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceRentClosingCase.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceRentClosingCase.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.domain;
+package com.ruoyi.project.data.cases.domain;
import org.springframework.util.DigestUtils;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceRentOpeningCase.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceRentOpeningCase.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceRentOpeningCase.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceRentOpeningCase.java
index 7e6efe54a..efedb025d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceRentOpeningCase.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceRentOpeningCase.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.domain;
+package com.ruoyi.project.data.cases.domain;
import java.math.BigDecimal;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleClosingCase.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleClosingCase.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleClosingCase.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleClosingCase.java
index 3075cab32..cd434b388 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleClosingCase.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleClosingCase.java
@@ -1,6 +1,6 @@
-package com.uvaluation.project.data.cases.domain;
+package com.ruoyi.project.data.cases.domain;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.util.DigestUtils;
import java.math.BigDecimal;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleOpeningCase.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleOpeningCase.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleOpeningCase.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleOpeningCase.java
index 1c33f0e3a..a1306867f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleOpeningCase.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleOpeningCase.java
@@ -1,6 +1,6 @@
-package com.uvaluation.project.data.cases.domain;
+package com.ruoyi.project.data.cases.domain;
-import com.uvaluation.common.utils.StringUtils;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.util.DigestUtils;
import java.math.BigDecimal;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleOpeningCaseQueryModel.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleOpeningCaseQueryModel.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleOpeningCaseQueryModel.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleOpeningCaseQueryModel.java
index b722ffbb3..7f76107d1 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/domain/OriginalResidenceSaleOpeningCaseQueryModel.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/domain/OriginalResidenceSaleOpeningCaseQueryModel.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.domain;
+package com.ruoyi.project.data.cases.domain;
public class OriginalResidenceSaleOpeningCaseQueryModel extends OriginalResidenceSaleOpeningCase {
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalOfficeCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalOfficeCaseMapper.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalOfficeCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalOfficeCaseMapper.java
index 52fe0e72f..20b1c4d29 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalOfficeCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalOfficeCaseMapper.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.mapper;
+package com.ruoyi.project.data.cases.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.apache.ibatis.annotations.Param;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceRentClosingCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceRentClosingCaseMapper.java
similarity index 86%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceRentClosingCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceRentClosingCaseMapper.java
index df5539212..c89eaaa37 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceRentClosingCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceRentClosingCaseMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.cases.mapper;
+package com.ruoyi.project.data.cases.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceRentOpeningCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceRentOpeningCaseMapper.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceRentOpeningCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceRentOpeningCaseMapper.java
index 166315604..671b0378d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceRentOpeningCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceRentOpeningCaseMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.cases.mapper;
+package com.ruoyi.project.data.cases.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceSaleClosingCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceSaleClosingCaseMapper.java
similarity index 82%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceSaleClosingCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceSaleClosingCaseMapper.java
index 454367bf7..d452c78d7 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceSaleClosingCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceSaleClosingCaseMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.cases.mapper;
+package com.ruoyi.project.data.cases.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceSaleOpeningCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceSaleOpeningCaseMapper.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceSaleOpeningCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceSaleOpeningCaseMapper.java
index 08c1b33d8..5cde3eec1 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/OriginalResidenceSaleOpeningCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/OriginalResidenceSaleOpeningCaseMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.cases.mapper;
+package com.ruoyi.project.data.cases.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCaseQueryModel;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java
similarity index 73%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java
index a4cb130a7..9a0a408b1 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalOfficeCaseMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.cases.mapper.sync;
+package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalOfficeCase;
+import com.ruoyi.project.data.cases.domain.OriginalOfficeCase;
import java.util.Date;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentClosingCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentClosingCaseMapper.java
similarity index 73%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentClosingCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentClosingCaseMapper.java
index 8f357fb68..f8be48e5a 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentClosingCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentClosingCaseMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.cases.mapper.sync;
+package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceRentClosingCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceRentClosingCase;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentOpeningCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentOpeningCaseMapper.java
similarity index 64%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentOpeningCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentOpeningCaseMapper.java
index 9c631143f..87b249c94 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentOpeningCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentOpeningCaseMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.cases.mapper.sync;
+package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceRentOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceRentOpeningCase;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentPlatformCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentPlatformCaseMapper.java
similarity index 72%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentPlatformCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentPlatformCaseMapper.java
index 88ba7c6a7..e8424541d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceRentPlatformCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceRentPlatformCaseMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.cases.mapper.sync;
+package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidencePlatformRentOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidencePlatformRentOpeningCase;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleClosingCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleClosingCaseMapper.java
similarity index 70%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleClosingCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleClosingCaseMapper.java
index 692f1c342..07cd35aa8 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleClosingCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleClosingCaseMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.cases.mapper.sync;
+package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleClosingCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleClosingCase;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleOpeningCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleOpeningCaseMapper.java
similarity index 64%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleOpeningCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleOpeningCaseMapper.java
index e796ceacd..1960b06a2 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleOpeningCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/DownloadOriginalResidenceSaleOpeningCaseMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.cases.mapper.sync;
+package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/SyncOriginalResidenceRentOpeningCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncOriginalResidenceRentOpeningCaseMapper.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/SyncOriginalResidenceRentOpeningCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncOriginalResidenceRentOpeningCaseMapper.java
index bcaff25c7..c2af56441 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/SyncOriginalResidenceRentOpeningCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncOriginalResidenceRentOpeningCaseMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.cases.mapper.sync;
+package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceRentOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceRentOpeningCase;
import org.apache.ibatis.annotations.Param;
@DS("calc")
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/SyncOriginalResidenceSaleOpeningCaseMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncOriginalResidenceSaleOpeningCaseMapper.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/SyncOriginalResidenceSaleOpeningCaseMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncOriginalResidenceSaleOpeningCaseMapper.java
index 52d1c7554..37352be1d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/mapper/sync/SyncOriginalResidenceSaleOpeningCaseMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/mapper/sync/SyncOriginalResidenceSaleOpeningCaseMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.cases.mapper.sync;
+package com.ruoyi.project.data.cases.mapper.sync;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
import org.apache.ibatis.annotations.Param;
@DS("calc")
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalOfficeCaseService.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalOfficeCaseService.java
similarity index 66%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalOfficeCaseService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalOfficeCaseService.java
index 95110686c..1b005d2b0 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalOfficeCaseService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalOfficeCaseService.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.service;
+package com.ruoyi.project.data.cases.service;
public interface IOriginalOfficeCaseService {
/**
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceRentClosingCaseService.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceRentClosingCaseService.java
similarity index 62%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceRentClosingCaseService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceRentClosingCaseService.java
index 300041939..a52ed4d0b 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceRentClosingCaseService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceRentClosingCaseService.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.service;
+package com.ruoyi.project.data.cases.service;
public interface IOriginalResidenceRentClosingCaseService {
void pullData();
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceRentOpeningCaseService.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceRentOpeningCaseService.java
similarity index 62%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceRentOpeningCaseService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceRentOpeningCaseService.java
index 69bda5e1d..1cb4b8a24 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceRentOpeningCaseService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceRentOpeningCaseService.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.service;
+package com.ruoyi.project.data.cases.service;
public interface IOriginalResidenceRentOpeningCaseService {
void pullData();
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceSaleClosingCaseService.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceSaleClosingCaseService.java
similarity index 61%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceSaleClosingCaseService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceSaleClosingCaseService.java
index b06ea5700..8a99b1612 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceSaleClosingCaseService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceSaleClosingCaseService.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.service;
+package com.ruoyi.project.data.cases.service;
public interface IOriginalResidenceSaleClosingCaseService {
void clear();
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceSaleOpeningCaseService.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceSaleOpeningCaseService.java
similarity index 61%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceSaleOpeningCaseService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceSaleOpeningCaseService.java
index 14e67fee9..eeafbedb7 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/IOriginalResidenceSaleOpeningCaseService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/IOriginalResidenceSaleOpeningCaseService.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.cases.service;
+package com.ruoyi.project.data.cases.service;
public interface IOriginalResidenceSaleOpeningCaseService {
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalOfficeCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalOfficeCaseServiceImpl.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalOfficeCaseServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalOfficeCaseServiceImpl.java
index 2e769bbcf..5675ebf1c 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalOfficeCaseServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalOfficeCaseServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.data.cases.service.impl;
+package com.ruoyi.project.data.cases.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.common.utils.LoadUtil;
-import com.uvaluation.project.data.cases.domain.OriginalOfficeCase;
-import com.uvaluation.project.data.cases.mapper.OriginalOfficeCaseMapper;
-import com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalOfficeCaseMapper;
-import com.uvaluation.project.data.cases.service.IOriginalOfficeCaseService;
+import com.ruoyi.common.utils.LoadUtil;
+import com.ruoyi.project.data.cases.domain.OriginalOfficeCase;
+import com.ruoyi.project.data.cases.mapper.OriginalOfficeCaseMapper;
+import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalOfficeCaseMapper;
+import com.ruoyi.project.data.cases.service.IOriginalOfficeCaseService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java
index 0b6616209..6067ff18d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentClosingCaseServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.data.cases.service.impl;
+package com.ruoyi.project.data.cases.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.common.utils.LoadUtil;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceRentClosingCase;
-import com.uvaluation.project.data.cases.mapper.OriginalResidenceRentClosingCaseMapper;
-import com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalResidenceRentClosingCaseMapper;
-import com.uvaluation.project.data.cases.service.IOriginalResidenceRentClosingCaseService;
+import com.ruoyi.common.utils.LoadUtil;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceRentClosingCase;
+import com.ruoyi.project.data.cases.mapper.OriginalResidenceRentClosingCaseMapper;
+import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceRentClosingCaseMapper;
+import com.ruoyi.project.data.cases.service.IOriginalResidenceRentClosingCaseService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceRentOpeningCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentOpeningCaseServiceImpl.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceRentOpeningCaseServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentOpeningCaseServiceImpl.java
index 45217852a..5fe2f0686 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceRentOpeningCaseServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceRentOpeningCaseServiceImpl.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.data.cases.service.impl;
+package com.ruoyi.project.data.cases.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.common.utils.LoadUtil;
-import com.uvaluation.project.data.cases.domain.OriginalResidencePlatformRentOpeningCase;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceRentOpeningCase;
-import com.uvaluation.project.data.cases.mapper.OriginalResidenceRentOpeningCaseMapper;
-import com.uvaluation.project.data.cases.mapper.sync.*;
-import com.uvaluation.project.data.cases.service.IOriginalResidenceRentOpeningCaseService;
+import com.ruoyi.common.utils.LoadUtil;
+import com.ruoyi.project.data.cases.domain.OriginalResidencePlatformRentOpeningCase;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceRentOpeningCase;
+import com.ruoyi.project.data.cases.mapper.OriginalResidenceRentOpeningCaseMapper;
+import com.ruoyi.project.data.cases.mapper.sync.*;
+import com.ruoyi.project.data.cases.service.IOriginalResidenceRentOpeningCaseService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceSaleClosingCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceSaleClosingCaseServiceImpl.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceSaleClosingCaseServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceSaleClosingCaseServiceImpl.java
index 96f59c158..b2c18de91 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceSaleClosingCaseServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceSaleClosingCaseServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.data.cases.service.impl;
+package com.ruoyi.project.data.cases.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.common.utils.LoadUtil;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleClosingCase;
-import com.uvaluation.project.data.cases.mapper.OriginalResidenceSaleClosingCaseMapper;
-import com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalResidenceSaleClosingCaseMapper;
-import com.uvaluation.project.data.cases.service.IOriginalResidenceSaleClosingCaseService;
+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.IOriginalResidenceSaleClosingCaseService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceSaleOpeningCaseServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceSaleOpeningCaseServiceImpl.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceSaleOpeningCaseServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceSaleOpeningCaseServiceImpl.java
index 49614a5f4..220936701 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/cases/service/impl/OriginalResidenceSaleOpeningCaseServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/cases/service/impl/OriginalResidenceSaleOpeningCaseServiceImpl.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.data.cases.service.impl;
+package com.ruoyi.project.data.cases.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.common.utils.LoadUtil;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
-import com.uvaluation.project.data.cases.mapper.OriginalResidenceSaleOpeningCaseMapper;
-import com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalResidenceSaleOpeningCaseMapper;
-import com.uvaluation.project.data.cases.mapper.sync.SyncOriginalResidenceSaleOpeningCaseMapper;
-import com.uvaluation.project.data.cases.service.IOriginalResidenceSaleOpeningCaseService;
+import com.ruoyi.common.utils.LoadUtil;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase;
+import com.ruoyi.project.data.cases.mapper.OriginalResidenceSaleOpeningCaseMapper;
+import com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceSaleOpeningCaseMapper;
+import com.ruoyi.project.data.cases.mapper.sync.SyncOriginalResidenceSaleOpeningCaseMapper;
+import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleOpeningCaseService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/BasePriceController.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/BasePriceController.java
similarity index 72%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/controller/BasePriceController.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/controller/BasePriceController.java
index 4b04bf3f1..4d5af4f80 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/BasePriceController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/BasePriceController.java
@@ -1,14 +1,14 @@
-package com.uvaluation.project.data.price.controller;
+package com.ruoyi.project.data.price.controller;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.data.basis.domain.UVBasePrice;
-import com.uvaluation.project.data.basis.domain.UVBasePriceQueryModel;
-import com.uvaluation.project.data.basis.service.IUVBasePriceService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.data.basis.domain.UVBasePrice;
+import com.ruoyi.project.data.basis.domain.UVBasePriceQueryModel;
+import com.ruoyi.project.data.basis.service.IUVBasePriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/ResidenceRentBasePriceController.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/ResidenceRentBasePriceController.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/controller/ResidenceRentBasePriceController.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/controller/ResidenceRentBasePriceController.java
index 2a85ab211..b2885b8d5 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/ResidenceRentBasePriceController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/ResidenceRentBasePriceController.java
@@ -1,28 +1,28 @@
-package com.uvaluation.project.data.price.controller;
+package com.ruoyi.project.data.price.controller;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.file.FileUploadUtils;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.config.RuoYiConfig;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.framework.web.page.TableSupport;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ArtificialResidenceRentBasePrice;
-import com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice;
-import com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice;
-import com.uvaluation.project.data.price.service.IArtificialResidenceRentPriceService;
-import com.uvaluation.project.data.price.service.IComputeResidenceRentPriceService;
-import com.uvaluation.project.data.price.service.IUltimateResidenceRentBasePriceService;
-import com.uvaluation.project.system.domain.UploadFile;
-import com.uvaluation.project.system.service.IUploadFileService;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.web.page.TableSupport;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice;
+import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice;
+import com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice;
+import com.ruoyi.project.data.price.service.IArtificialResidenceRentPriceService;
+import com.ruoyi.project.data.price.service.IComputeResidenceRentPriceService;
+import com.ruoyi.project.data.price.service.IUltimateResidenceRentBasePriceService;
+import com.ruoyi.project.system.domain.UploadFile;
+import com.ruoyi.project.system.service.IUploadFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/ResidenceSaleBasePriceController.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/ResidenceSaleBasePriceController.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/controller/ResidenceSaleBasePriceController.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/controller/ResidenceSaleBasePriceController.java
index 6401a4cbd..7366400b6 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/ResidenceSaleBasePriceController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/ResidenceSaleBasePriceController.java
@@ -1,29 +1,29 @@
-package com.uvaluation.project.data.price.controller;
+package com.ruoyi.project.data.price.controller;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.file.FileUploadUtils;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.config.RuoYiConfig;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.framework.web.page.TableSupport;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.domain.DistrictBlockChange;
-import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.domain.UltimateResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.service.IArtificialResidenceSalePriceService;
-import com.uvaluation.project.data.price.service.IComputeResidenceSalePriceService;
-import com.uvaluation.project.data.price.service.IUltimateResidenceSalePriceService;
-import com.uvaluation.project.system.domain.UploadFile;
-import com.uvaluation.project.system.service.IUploadFileService;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.web.page.TableSupport;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.domain.DistrictBlockChange;
+import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.domain.UltimateResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.service.IArtificialResidenceSalePriceService;
+import com.ruoyi.project.data.price.service.IComputeResidenceSalePriceService;
+import com.ruoyi.project.data.price.service.IUltimateResidenceSalePriceService;
+import com.ruoyi.project.system.domain.UploadFile;
+import com.ruoyi.project.system.service.IUploadFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/UltimateOfficeBasePriceController.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/UltimateOfficeBasePriceController.java
similarity index 84%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/controller/UltimateOfficeBasePriceController.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/controller/UltimateOfficeBasePriceController.java
index 0f35e51da..185f2ea20 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/UltimateOfficeBasePriceController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/UltimateOfficeBasePriceController.java
@@ -1,14 +1,14 @@
-package com.uvaluation.project.data.price.controller;
+package com.ruoyi.project.data.price.controller;
import java.util.List;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
-import com.uvaluation.framework.web.page.TableSupport;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice;
-import com.uvaluation.project.data.price.service.IUltimateOfficeBasePriceService;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.page.TableSupport;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice;
+import com.ruoyi.project.data.price.service.IUltimateOfficeBasePriceService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -16,12 +16,12 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
/**
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/UltimateResidenceSaleBasePriceController.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/UltimateResidenceSaleBasePriceController.java
similarity index 52%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/controller/UltimateResidenceSaleBasePriceController.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/controller/UltimateResidenceSaleBasePriceController.java
index 4a070423d..7ca3fb3af 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/controller/UltimateResidenceSaleBasePriceController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/controller/UltimateResidenceSaleBasePriceController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.price.controller;
+package com.ruoyi.project.data.price.controller;
public class UltimateResidenceSaleBasePriceController {
}
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ArtificialResidenceRentBasePrice.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ArtificialResidenceRentBasePrice.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ArtificialResidenceRentBasePrice.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ArtificialResidenceRentBasePrice.java
index 0ace80c77..712723247 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ArtificialResidenceRentBasePrice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ArtificialResidenceRentBasePrice.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
import java.math.BigDecimal;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ArtificialResidenceSaleBasePrice.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ArtificialResidenceSaleBasePrice.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ArtificialResidenceSaleBasePrice.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ArtificialResidenceSaleBasePrice.java
index cf3206e91..ce0b5adba 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ArtificialResidenceSaleBasePrice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ArtificialResidenceSaleBasePrice.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ComputeResidenceRentBasePrice.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ComputeResidenceRentBasePrice.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ComputeResidenceRentBasePrice.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ComputeResidenceRentBasePrice.java
index be09612e3..6a8fa9f7b 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ComputeResidenceRentBasePrice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ComputeResidenceRentBasePrice.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
import java.math.BigDecimal;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ComputeResidenceSaleBasePrice.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ComputeResidenceSaleBasePrice.java
similarity index 99%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ComputeResidenceSaleBasePrice.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ComputeResidenceSaleBasePrice.java
index 3223be867..8f8cc4eb6 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/ComputeResidenceSaleBasePrice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/ComputeResidenceSaleBasePrice.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
import com.alibaba.fastjson.annotation.JSONField;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/DistrictBlockChange.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/DistrictBlockChange.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/DistrictBlockChange.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/DistrictBlockChange.java
index d0cb09130..3bc2e4661 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/DistrictBlockChange.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/DistrictBlockChange.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
import java.math.BigDecimal;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/OfficeBasePriceModifyModel.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/OfficeBasePriceModifyModel.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/OfficeBasePriceModifyModel.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/OfficeBasePriceModifyModel.java
index 85c735594..3e7149b3b 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/OfficeBasePriceModifyModel.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/OfficeBasePriceModifyModel.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
import java.math.BigDecimal;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateOfficeBasePrice.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateOfficeBasePrice.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateOfficeBasePrice.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateOfficeBasePrice.java
index 489b50ef1..a34bd6790 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateOfficeBasePrice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateOfficeBasePrice.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
import com.alibaba.fastjson.annotation.JSONField;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateResidenceRentBasePrice.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateResidenceRentBasePrice.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateResidenceRentBasePrice.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateResidenceRentBasePrice.java
index 7b2f1bf98..e0ed3d0b3 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateResidenceRentBasePrice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateResidenceRentBasePrice.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
import com.alibaba.fastjson.annotation.JSONField;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateResidenceSaleBasePrice.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateResidenceSaleBasePrice.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateResidenceSaleBasePrice.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateResidenceSaleBasePrice.java
index a7ccab755..b22e18cb2 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/domain/UltimateResidenceSaleBasePrice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/domain/UltimateResidenceSaleBasePrice.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.domain;
+package com.ruoyi.project.data.price.domain;
import com.alibaba.fastjson.annotation.JSONField;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ArtificialResidenceRentPriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ArtificialResidenceRentPriceMapper.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ArtificialResidenceRentPriceMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ArtificialResidenceRentPriceMapper.java
index 506fdb1db..f03184132 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ArtificialResidenceRentPriceMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ArtificialResidenceRentPriceMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.mapper;
+package com.ruoyi.project.data.price.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ArtificialResidenceRentBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ArtificialResidenceSalePriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ArtificialResidenceSalePriceMapper.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ArtificialResidenceSalePriceMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ArtificialResidenceSalePriceMapper.java
index 265517393..122c2ddc9 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ArtificialResidenceSalePriceMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ArtificialResidenceSalePriceMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.mapper;
+package com.ruoyi.project.data.price.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ComputeResidenceRentPriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceRentPriceMapper.java
similarity index 82%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ComputeResidenceRentPriceMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceRentPriceMapper.java
index 971c68d07..8723041ec 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ComputeResidenceRentPriceMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceRentPriceMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.mapper;
+package com.ruoyi.project.data.price.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ComputeResidenceSalePriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceSalePriceMapper.java
similarity index 80%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ComputeResidenceSalePriceMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceSalePriceMapper.java
index 6138f9dbc..749bdcdc1 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/ComputeResidenceSalePriceMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/ComputeResidenceSalePriceMapper.java
@@ -1,9 +1,9 @@
-package com.uvaluation.project.data.price.mapper;
+package com.ruoyi.project.data.price.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.DistrictBlockChange;
-import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.DistrictBlockChange;
+import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateOfficeBasePriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateOfficeBasePriceMapper.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateOfficeBasePriceMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateOfficeBasePriceMapper.java
index 5331c188a..5936611ac 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateOfficeBasePriceMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateOfficeBasePriceMapper.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.data.price.mapper;
+package com.ruoyi.project.data.price.mapper;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.OfficeBasePriceModifyModel;
-import com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.OfficeBasePriceModifyModel;
+import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateResidenceRentPriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateResidenceRentPriceMapper.java
similarity index 74%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateResidenceRentPriceMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateResidenceRentPriceMapper.java
index 8e0bad818..398716e59 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateResidenceRentPriceMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateResidenceRentPriceMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.mapper;
+package com.ruoyi.project.data.price.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateResidenceSalePriceMapper.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateResidenceSalePriceMapper.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateResidenceSalePriceMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateResidenceSalePriceMapper.java
index 5fe71dd75..0f6ee9949 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/mapper/UltimateResidenceSalePriceMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/mapper/UltimateResidenceSalePriceMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.mapper;
+package com.ruoyi.project.data.price.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.UltimateResidenceSaleBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.UltimateResidenceSaleBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IArtificialResidenceRentPriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceRentPriceService.java
similarity index 83%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/IArtificialResidenceRentPriceService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceRentPriceService.java
index ba39bcf47..8786032d3 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IArtificialResidenceRentPriceService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceRentPriceService.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.service;
+package com.ruoyi.project.data.price.service;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ArtificialResidenceRentBasePrice;
-import com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice;
+import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IArtificialResidenceSalePriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceSalePriceService.java
similarity index 81%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/IArtificialResidenceSalePriceService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceSalePriceService.java
index 6d691313a..76942f207 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IArtificialResidenceSalePriceService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IArtificialResidenceSalePriceService.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.service;
+package com.ruoyi.project.data.price.service;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IComputeResidenceRentPriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IComputeResidenceRentPriceService.java
similarity index 79%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/IComputeResidenceRentPriceService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/IComputeResidenceRentPriceService.java
index 35019a2f8..d1aad9611 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IComputeResidenceRentPriceService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IComputeResidenceRentPriceService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.price.service;
+package com.ruoyi.project.data.price.service;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IComputeResidenceSalePriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IComputeResidenceSalePriceService.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/IComputeResidenceSalePriceService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/IComputeResidenceSalePriceService.java
index 92c56f7ad..bcdcb4849 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IComputeResidenceSalePriceService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IComputeResidenceSalePriceService.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.data.price.service;
+package com.ruoyi.project.data.price.service;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.DistrictBlockChange;
-import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.DistrictBlockChange;
+import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateOfficeBasePriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateOfficeBasePriceService.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateOfficeBasePriceService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateOfficeBasePriceService.java
index 0b743fbcd..664896530 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateOfficeBasePriceService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateOfficeBasePriceService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.price.service;
+package com.ruoyi.project.data.price.service;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateResidenceRentBasePriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateResidenceRentBasePriceService.java
similarity index 75%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateResidenceRentBasePriceService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateResidenceRentBasePriceService.java
index aa6bf3a86..183b34b51 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateResidenceRentBasePriceService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateResidenceRentBasePriceService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.price.service;
+package com.ruoyi.project.data.price.service;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateResidenceSalePriceService.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateResidenceSalePriceService.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateResidenceSalePriceService.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateResidenceSalePriceService.java
index 83912370f..902eba56d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/IUltimateResidenceSalePriceService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/IUltimateResidenceSalePriceService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.data.price.service;
+package com.ruoyi.project.data.price.service;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.UltimateResidenceSaleBasePrice;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.UltimateResidenceSaleBasePrice;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java
index dbb790251..f130524c0 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceRentPriceServiceImpl.java
@@ -1,15 +1,15 @@
-package com.uvaluation.project.data.price.service.impl;
+package com.ruoyi.project.data.price.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.microsoft.sqlserver.jdbc.SQLServerCallableStatement;
import com.microsoft.sqlserver.jdbc.SQLServerDataTable;
import com.microsoft.sqlserver.jdbc.SQLServerException;
-import com.uvaluation.common.utils.LoadUtil;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ArtificialResidenceRentBasePrice;
-import com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice;
-import com.uvaluation.project.data.price.mapper.ArtificialResidenceRentPriceMapper;
-import com.uvaluation.project.data.price.service.IArtificialResidenceRentPriceService;
+import com.ruoyi.common.utils.LoadUtil;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice;
+import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice;
+import com.ruoyi.project.data.price.mapper.ArtificialResidenceRentPriceMapper;
+import com.ruoyi.project.data.price.service.IArtificialResidenceRentPriceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ArtificialResidenceSalePriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceSalePriceServiceImpl.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ArtificialResidenceSalePriceServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceSalePriceServiceImpl.java
index 93d3decf3..b4de5d3cc 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ArtificialResidenceSalePriceServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ArtificialResidenceSalePriceServiceImpl.java
@@ -1,13 +1,13 @@
-package com.uvaluation.project.data.price.service.impl;
+package com.ruoyi.project.data.price.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.microsoft.sqlserver.jdbc.*;
-import com.uvaluation.common.utils.LoadUtil;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.mapper.ArtificialResidenceSalePriceMapper;
-import com.uvaluation.project.data.price.service.IArtificialResidenceSalePriceService;
+import com.ruoyi.common.utils.LoadUtil;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.mapper.ArtificialResidenceSalePriceMapper;
+import com.ruoyi.project.data.price.service.IArtificialResidenceSalePriceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ComputeResidenceRentPriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ComputeResidenceRentPriceServiceImpl.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ComputeResidenceRentPriceServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ComputeResidenceRentPriceServiceImpl.java
index a8fc6fdf0..2ea879772 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ComputeResidenceRentPriceServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ComputeResidenceRentPriceServiceImpl.java
@@ -1,9 +1,9 @@
-package com.uvaluation.project.data.price.service.impl;
+package com.ruoyi.project.data.price.service.impl;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice;
-import com.uvaluation.project.data.price.mapper.ComputeResidenceRentPriceMapper;
-import com.uvaluation.project.data.price.service.IComputeResidenceRentPriceService;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice;
+import com.ruoyi.project.data.price.mapper.ComputeResidenceRentPriceMapper;
+import com.ruoyi.project.data.price.service.IComputeResidenceRentPriceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ComputeResidenceSalePriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ComputeResidenceSalePriceServiceImpl.java
similarity index 78%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ComputeResidenceSalePriceServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ComputeResidenceSalePriceServiceImpl.java
index 969b2afa4..37fc87b07 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/ComputeResidenceSalePriceServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/ComputeResidenceSalePriceServiceImpl.java
@@ -1,10 +1,10 @@
-package com.uvaluation.project.data.price.service.impl;
+package com.ruoyi.project.data.price.service.impl;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.DistrictBlockChange;
-import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.mapper.ComputeResidenceSalePriceMapper;
-import com.uvaluation.project.data.price.service.IComputeResidenceSalePriceService;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.DistrictBlockChange;
+import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.mapper.ComputeResidenceSalePriceMapper;
+import com.ruoyi.project.data.price.service.IComputeResidenceSalePriceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateOfficeBasePriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateOfficeBasePriceServiceImpl.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateOfficeBasePriceServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateOfficeBasePriceServiceImpl.java
index 30067ca40..36b246081 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateOfficeBasePriceServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateOfficeBasePriceServiceImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.data.price.service.impl;
+package com.ruoyi.project.data.price.service.impl;
import java.math.BigDecimal;
import java.sql.*;
@@ -10,14 +10,14 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.microsoft.sqlserver.jdbc.SQLServerCallableStatement;
import com.microsoft.sqlserver.jdbc.SQLServerDataTable;
import com.microsoft.sqlserver.jdbc.SQLServerException;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.utils.LoadUtil;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.OfficeBasePriceModifyModel;
-import com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice;
-import com.uvaluation.project.data.price.mapper.UltimateOfficeBasePriceMapper;
-import com.uvaluation.project.data.price.service.IUltimateOfficeBasePriceService;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.LoadUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.OfficeBasePriceModifyModel;
+import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice;
+import com.ruoyi.project.data.price.mapper.UltimateOfficeBasePriceMapper;
+import com.ruoyi.project.data.price.service.IUltimateOfficeBasePriceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateResidenceRentBasePriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateResidenceRentBasePriceServiceImpl.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateResidenceRentBasePriceServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateResidenceRentBasePriceServiceImpl.java
index 464df2691..286475287 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateResidenceRentBasePriceServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateResidenceRentBasePriceServiceImpl.java
@@ -1,9 +1,9 @@
-package com.uvaluation.project.data.price.service.impl;
+package com.ruoyi.project.data.price.service.impl;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice;
-import com.uvaluation.project.data.price.mapper.UltimateResidenceRentPriceMapper;
-import com.uvaluation.project.data.price.service.IUltimateResidenceRentBasePriceService;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice;
+import com.ruoyi.project.data.price.mapper.UltimateResidenceRentPriceMapper;
+import com.ruoyi.project.data.price.service.IUltimateResidenceRentBasePriceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateResidenceSalePriceServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateResidenceSalePriceServiceImpl.java
similarity index 83%
rename from ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateResidenceSalePriceServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateResidenceSalePriceServiceImpl.java
index 8fc567ae7..44acaae34 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/data/price/service/impl/UltimateResidenceSalePriceServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/data/price/service/impl/UltimateResidenceSalePriceServiceImpl.java
@@ -1,9 +1,9 @@
-package com.uvaluation.project.data.price.service.impl;
+package com.ruoyi.project.data.price.service.impl;
-import com.uvaluation.project.common.VueSelectModel;
-import com.uvaluation.project.data.price.domain.UltimateResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.mapper.UltimateResidenceSalePriceMapper;
-import com.uvaluation.project.data.price.service.IUltimateResidenceSalePriceService;
+import com.ruoyi.project.common.VueSelectModel;
+import com.ruoyi.project.data.price.domain.UltimateResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.mapper.UltimateResidenceSalePriceMapper;
+import com.ruoyi.project.data.price.service.IUltimateResidenceSalePriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/ServerController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
similarity index 74%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/controller/ServerController.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
index 943591425..c9d800727 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/ServerController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.monitor.controller;
+package com.ruoyi.project.monitor.controller;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.domain.Server;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.Server;
/**
* 服务器监控
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysJobController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysJobController.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
index 979486059..9894cd8d2 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysJobController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.monitor.controller;
+package com.ruoyi.project.monitor.controller;
import java.util.List;
import org.quartz.SchedulerException;
@@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.exception.job.TaskException;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.monitor.domain.SysJob;
-import com.uvaluation.project.monitor.service.ISysJobService;
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysJob;
+import com.ruoyi.project.monitor.service.ISysJobService;
/**
* 调度任务信息操作处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysJobLogController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
similarity index 82%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysJobLogController.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
index 851001e30..ba1181649 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysJobLogController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.monitor.controller;
+package com.ruoyi.project.monitor.controller;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.project.monitor.domain.SysJobLog;
-import com.uvaluation.project.monitor.service.ISysJobLogService;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.monitor.domain.SysJobLog;
+import com.ruoyi.project.monitor.service.ISysJobLogService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
/**
* 调度日志操作处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysLogininforController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
similarity index 79%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysLogininforController.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
index bd2d86a54..d9258fee9 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysLogininforController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.monitor.controller;
+package com.ruoyi.project.monitor.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.monitor.domain.SysLogininfor;
-import com.uvaluation.project.monitor.service.ISysLogininforService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysLogininfor;
+import com.ruoyi.project.monitor.service.ISysLogininforService;
/**
* 系统访问记录
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysOperlogController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
similarity index 78%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysOperlogController.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
index 088694161..0cabf9211 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysOperlogController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.monitor.controller;
+package com.ruoyi.project.monitor.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.monitor.domain.SysOperLog;
-import com.uvaluation.project.monitor.service.ISysOperLogService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysOperLog;
+import com.ruoyi.project.monitor.service.ISysOperLogService;
/**
* 操作日志记录
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysUserOnlineController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
similarity index 81%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysUserOnlineController.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
index 831686a35..1d28b19ad 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/controller/SysUserOnlineController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.monitor.controller;
+package com.ruoyi.project.monitor.controller;
import java.util.ArrayList;
import java.util.Collection;
@@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.redis.RedisCache;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.monitor.domain.SysUserOnline;
-import com.uvaluation.project.system.service.ISysUserOnlineService;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.redis.RedisCache;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysUserOnline;
+import com.ruoyi.project.system.service.ISysUserOnlineService;
/**
* 在线用户监控
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysJob.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysJob.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
index af6b4515d..126be47f3 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysJob.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.monitor.domain;
+package com.ruoyi.project.monitor.domain;
import java.io.Serializable;
import java.util.Date;
@@ -7,12 +7,12 @@ import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.uvaluation.common.constant.ScheduleConstants;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.job.CronUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.job.CronUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 定时任务调度表 sys_job
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysJobLog.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysJobLog.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java
index 5a023eec4..c7a3cd229 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysJobLog.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java
@@ -1,10 +1,10 @@
-package com.uvaluation.project.monitor.domain;
+package com.ruoyi.project.monitor.domain;
import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 定时任务调度日志表 sys_job_log
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysLogininfor.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysLogininfor.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
index a714b04a2..147a0a502 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysLogininfor.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
@@ -1,10 +1,10 @@
-package com.uvaluation.project.monitor.domain;
+package com.ruoyi.project.monitor.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 系统访问记录表 sys_logininfor
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysOperLog.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysOperLog.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
index bcdbea18a..f17723d5a 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysOperLog.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
@@ -1,10 +1,10 @@
-package com.uvaluation.project.monitor.domain;
+package com.ruoyi.project.monitor.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 操作日志记录表 oper_log
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysUserOnline.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysUserOnline.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java
index c9541f0fa..387d49c3c 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/domain/SysUserOnline.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.monitor.domain;
+package com.ruoyi.project.monitor.domain;
/**
* 当前在线会话
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysJobLogMapper.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysJobLogMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java
index d2d330a79..39137dd85 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysJobLogMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.monitor.mapper;
+package com.ruoyi.project.monitor.mapper;
import java.util.List;
-import com.uvaluation.project.monitor.domain.SysJobLog;
+import com.ruoyi.project.monitor.domain.SysJobLog;
/**
* 调度任务日志信息 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysJobMapper.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysJobMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java
index 83ae433b4..ab1146188 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysJobMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.monitor.mapper;
+package com.ruoyi.project.monitor.mapper;
import java.util.List;
-import com.uvaluation.project.monitor.domain.SysJob;
+import com.ruoyi.project.monitor.domain.SysJob;
/**
* 调度任务信息 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysLogininforMapper.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysLogininforMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java
index cbdd3b27c..05b8c9b95 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysLogininforMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.monitor.mapper;
+package com.ruoyi.project.monitor.mapper;
import java.util.List;
-import com.uvaluation.project.monitor.domain.SysLogininfor;
+import com.ruoyi.project.monitor.domain.SysLogininfor;
/**
* 系统访问日志情况信息 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysOperLogMapper.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysOperLogMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java
index 358c45138..ed5d5737c 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/mapper/SysOperLogMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.monitor.mapper;
+package com.ruoyi.project.monitor.mapper;
import java.util.List;
-import com.uvaluation.project.monitor.domain.SysOperLog;
+import com.ruoyi.project.monitor.domain.SysOperLog;
/**
* 操作日志 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysJobLogService.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysJobLogService.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java
index 888f000f7..85561e766 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysJobLogService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.monitor.service;
+package com.ruoyi.project.monitor.service;
import java.util.List;
-import com.uvaluation.project.monitor.domain.SysJobLog;
+import com.ruoyi.project.monitor.domain.SysJobLog;
/**
* 定时任务调度日志信息信息 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysJobService.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysJobService.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java
index 00be0e373..f7da1ac62 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysJobService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java
@@ -1,9 +1,9 @@
-package com.uvaluation.project.monitor.service;
+package com.ruoyi.project.monitor.service;
import java.util.List;
import org.quartz.SchedulerException;
-import com.uvaluation.common.exception.job.TaskException;
-import com.uvaluation.project.monitor.domain.SysJob;
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.project.monitor.domain.SysJob;
/**
* 定时任务调度信息信息 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysLogininforService.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysLogininforService.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java
index 786e05b7a..d3eede4b6 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysLogininforService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.monitor.service;
+package com.ruoyi.project.monitor.service;
import java.util.List;
-import com.uvaluation.project.monitor.domain.SysLogininfor;
+import com.ruoyi.project.monitor.domain.SysLogininfor;
/**
* 系统访问日志情况信息 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysOperLogService.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysOperLogService.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java
index ccd1c50b1..0e63d8d61 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/ISysOperLogService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.monitor.service;
+package com.ruoyi.project.monitor.service;
import java.util.List;
-import com.uvaluation.project.monitor.domain.SysOperLog;
+import com.ruoyi.project.monitor.domain.SysOperLog;
/**
* 操作日志 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysJobLogServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysJobLogServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java
index 089a72e19..991cf813f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysJobLogServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.monitor.service.impl;
+package com.ruoyi.project.monitor.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.project.monitor.domain.SysJobLog;
-import com.uvaluation.project.monitor.mapper.SysJobLogMapper;
-import com.uvaluation.project.monitor.service.ISysJobLogService;
+import com.ruoyi.project.monitor.domain.SysJobLog;
+import com.ruoyi.project.monitor.mapper.SysJobLogMapper;
+import com.ruoyi.project.monitor.service.ISysJobLogService;
/**
* 定时任务调度日志信息 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysJobServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysJobServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
index c7c6f746d..c53cd3c91 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysJobServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.monitor.service.impl;
+package com.ruoyi.project.monitor.service.impl;
import java.util.List;
import javax.annotation.PostConstruct;
@@ -9,13 +9,13 @@ import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.uvaluation.common.constant.ScheduleConstants;
-import com.uvaluation.common.exception.job.TaskException;
-import com.uvaluation.common.utils.job.CronUtils;
-import com.uvaluation.common.utils.job.ScheduleUtils;
-import com.uvaluation.project.monitor.domain.SysJob;
-import com.uvaluation.project.monitor.mapper.SysJobMapper;
-import com.uvaluation.project.monitor.service.ISysJobService;
+import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.common.utils.job.CronUtils;
+import com.ruoyi.common.utils.job.ScheduleUtils;
+import com.ruoyi.project.monitor.domain.SysJob;
+import com.ruoyi.project.monitor.mapper.SysJobMapper;
+import com.ruoyi.project.monitor.service.ISysJobService;
/**
* 定时任务调度信息 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysLogininforServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
similarity index 84%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysLogininforServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
index b7fa9c04b..d10bac667 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.monitor.service.impl;
+package com.ruoyi.project.monitor.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.project.monitor.domain.SysLogininfor;
-import com.uvaluation.project.monitor.mapper.SysLogininforMapper;
-import com.uvaluation.project.monitor.service.ISysLogininforService;
+import com.ruoyi.project.monitor.domain.SysLogininfor;
+import com.ruoyi.project.monitor.mapper.SysLogininforMapper;
+import com.ruoyi.project.monitor.service.ISysLogininforService;
/**
* 系统访问日志情况信息 服务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysOperLogServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
similarity index 86%
rename from ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysOperLogServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
index c380df301..2f114694a 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/monitor/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.monitor.service.impl;
+package com.ruoyi.project.monitor.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.project.monitor.domain.SysOperLog;
-import com.uvaluation.project.monitor.mapper.SysOperLogMapper;
-import com.uvaluation.project.monitor.service.ISysOperLogService;
+import com.ruoyi.project.monitor.domain.SysOperLog;
+import com.ruoyi.project.monitor.mapper.SysOperLogMapper;
+import com.ruoyi.project.monitor.service.ISysOperLogService;
/**
* 操作日志 服务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysConfigController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
similarity index 85%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysConfigController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
index d806785ad..db9566967 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysConfigController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.system.domain.SysConfig;
-import com.uvaluation.project.system.service.ISysConfigService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysConfig;
+import com.ruoyi.project.system.service.ISysConfigService;
/**
* 参数配置 信息操作处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDeptController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDeptController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
index 07c49c1a5..57154ece6 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDeptController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.Iterator;
import java.util.List;
@@ -14,15 +14,15 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.project.system.domain.SysDept;
-import com.uvaluation.project.system.service.ISysDeptService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.service.ISysDeptService;
/**
* 部门信息
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDictDataController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
similarity index 85%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDictDataController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
index 5e5ec2de4..3fa53d5d6 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDictDataController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.system.domain.SysDictData;
-import com.uvaluation.project.system.service.ISysDictDataService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.service.ISysDictDataService;
/**
* 数据字典信息
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDictTypeController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
similarity index 85%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDictTypeController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
index a77d0090f..82d93d92c 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysDictTypeController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.system.domain.SysDictType;
-import com.uvaluation.project.system.service.ISysDictTypeService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysDictType;
+import com.ruoyi.project.system.service.ISysDictTypeService;
/**
* 数据字典信息
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysLoginController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index d1349c030..35d374da6 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysLoginController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import java.util.Set;
@@ -7,17 +7,17 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.framework.security.LoginBody;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.SysLoginService;
-import com.uvaluation.framework.security.service.SysPermissionService;
-import com.uvaluation.framework.security.service.TokenService;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.project.system.domain.SysMenu;
-import com.uvaluation.project.system.domain.SysUser;
-import com.uvaluation.project.system.service.ISysMenuService;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.security.LoginBody;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.SysLoginService;
+import com.ruoyi.framework.security.service.SysPermissionService;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysMenu;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysMenuService;
/**
* 登录验证
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysMenuController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
similarity index 86%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysMenuController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
index 71cbab97d..a68abcfd2 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysMenuController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,17 +12,17 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.project.system.domain.SysMenu;
-import com.uvaluation.project.system.service.ISysMenuService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysMenu;
+import com.ruoyi.project.system.service.ISysMenuService;
/**
* 菜单信息
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysNoticeController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
similarity index 83%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysNoticeController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
index 54a927c9d..2d8d6c874 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysNoticeController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.system.domain.SysNotice;
-import com.uvaluation.project.system.service.ISysNoticeService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.project.system.service.ISysNoticeService;
/**
* 公告 信息操作处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysPostController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
similarity index 86%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysPostController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
index c4d899682..5bce6a6fe 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysPostController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.system.domain.SysPost;
-import com.uvaluation.project.system.service.ISysPostService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysPost;
+import com.ruoyi.project.system.service.ISysPostService;
/**
* 岗位信息操作处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysProfileController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
similarity index 85%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysProfileController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
index ba4f55396..24865076f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysProfileController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.io.IOException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.file.FileUploadUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.config.RuoYiConfig;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.project.system.domain.SysUser;
-import com.uvaluation.project.system.service.ISysUserService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
/**
* 个人信息 业务处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysRoleController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysRoleController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
index 0b55c2d82..2343ed9db 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysRoleController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.system.domain.SysRole;
-import com.uvaluation.project.system.service.ISysRoleService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysRole;
+import com.ruoyi.project.system.service.ISysRoleService;
/**
* 角色信息
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/system/controller/SysUserController.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 2edba7588..a1eb4423f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/controller/SysUserController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.controller;
+package com.ruoyi.project.system.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,22 +13,22 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.ServletUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.poi.ExcelUtil;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.framework.security.service.TokenService;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.system.domain.SysUser;
-import com.uvaluation.project.system.service.ISysPostService;
-import com.uvaluation.project.system.service.ISysRoleService;
-import com.uvaluation.project.system.service.ISysUserService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysPostService;
+import com.ruoyi.project.system.service.ISysRoleService;
+import com.ruoyi.project.system.service.ISysUserService;
/**
* 用户信息
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysConfig.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysConfig.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
index f7adbbdcf..f9b290b1f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysConfig.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 参数配置表 sys_config
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDept.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDept.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java
index 4905845aa..90734393e 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDept.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import java.util.ArrayList;
import java.util.List;
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 部门表 sys_dept
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDictData.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDictData.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
index d065365b6..d14965395 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDictData.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
@@ -1,13 +1,13 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 字典数据表 sys_dict_data
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDictType.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDictType.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
index bf50bbed7..7887e6669 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysDictType.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 字典类型表 sys_dict_type
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysMenu.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysMenu.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
index 5abfbd661..511128a06 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysMenu.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import java.util.ArrayList;
import java.util.List;
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 菜单权限表 sys_menu
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysNotice.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysNotice.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
index b064d6b77..0215f4a7a 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysNotice.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
@@ -1,10 +1,10 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 通知公告表 sys_notice
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysPost.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysPost.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysPost.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysPost.java
index 7749a9075..c41a9954f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysPost.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysPost.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 岗位表 sys_post
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRole.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRole.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
index db4e19871..d9acb73f8 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRole.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
-import com.uvaluation.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 角色表 sys_role
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRoleDept.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRoleDept.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java
index d3b9d8972..5cbeed4f0 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRoleDept.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRoleMenu.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRoleMenu.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java
index 8b0e2c0f4..2772cbbc0 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysRoleMenu.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUser.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 88cb178d2..74cb754bc 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import java.util.Date;
import java.util.List;
@@ -8,11 +8,11 @@ import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonProperty;
-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.web.domain.BaseEntity;
+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.web.domain.BaseEntity;
/**
* 用户对象 sys_user
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUserPost.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUserPost.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java
index 32b8f4953..2633a2f40 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUserPost.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUserRole.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUserRole.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java
index cbb9b98cc..3be48290d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/SysUserRole.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/UploadFile.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/UploadFile.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/UploadFile.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/UploadFile.java
index 2242a94e8..ffeddb45d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/UploadFile.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/UploadFile.java
@@ -1,6 +1,6 @@
-package com.uvaluation.project.system.domain;
+package com.ruoyi.project.system.domain;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.framework.web.domain.BaseEntity;
public class UploadFile extends BaseEntity {
private Long id;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/vo/MetaVo.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/vo/MetaVo.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java
index b2465ce33..9a1ccb6dd 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/vo/MetaVo.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain.vo;
+package com.ruoyi.project.system.domain.vo;
/**
* 路由显示信息
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/domain/vo/RouterVo.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/project/system/domain/vo/RouterVo.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
index 222d8e531..342bc01d4 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/domain/vo/RouterVo.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.domain.vo;
+package com.ruoyi.project.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysConfigMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysConfigMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java
index f99b34cf5..ea275d76d 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysConfigMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
-import com.uvaluation.project.system.domain.SysConfig;
+import com.ruoyi.project.system.domain.SysConfig;
/**
* 参数配置 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDeptMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDeptMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
index 8dca31950..b1445ec87 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDeptMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.uvaluation.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysDept;
/**
* 部门管理 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDictDataMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDictDataMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java
index 4cc071cb6..4977bb478 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDictDataMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.uvaluation.project.system.domain.SysDictData;
+import com.ruoyi.project.system.domain.SysDictData;
/**
* 字典表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDictTypeMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDictTypeMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java
index ceb699168..a0709551f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysDictTypeMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
-import com.uvaluation.project.system.domain.SysDictType;
+import com.ruoyi.project.system.domain.SysDictType;
/**
* 字典表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysMenuMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysMenuMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java
index cd15bced2..f4e0c32d6 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysMenuMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.uvaluation.project.system.domain.SysMenu;
+import com.ruoyi.project.system.domain.SysMenu;
/**
* 菜单表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysNoticeMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysNoticeMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java
index 1a61193c6..b80c50bf5 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysNoticeMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
-import com.uvaluation.project.system.domain.SysNotice;
+import com.ruoyi.project.system.domain.SysNotice;
/**
* 通知公告表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysPostMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysPostMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java
index 21e196dff..c7cec0c7c 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysPostMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
-import com.uvaluation.project.system.domain.SysPost;
+import com.ruoyi.project.system.domain.SysPost;
/**
* 岗位信息 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleDeptMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleDeptMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java
index e29ef3cb0..77ead0800 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleDeptMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
-import com.uvaluation.project.system.domain.SysRoleDept;
+import com.ruoyi.project.system.domain.SysRoleDept;
/**
* 角色与部门关联表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java
index 33d30d8d0..fad471bc2 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
-import com.uvaluation.project.system.domain.SysRole;
+import com.ruoyi.project.system.domain.SysRole;
/**
* 角色表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleMenuMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java
similarity index 86%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleMenuMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java
index f57b3859f..50666f4e7 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysRoleMenuMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
-import com.uvaluation.project.system.domain.SysRoleMenu;
+import com.ruoyi.project.system.domain.SysRoleMenu;
/**
* 角色与菜单关联表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
index a49fa54b4..aad463eaf 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
@@ -1,10 +1,10 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.uvaluation.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUser;
/**
* 用户表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserPostMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserPostMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java
index b53cec821..7c54fdf70 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserPostMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
-import com.uvaluation.project.system.domain.SysUserPost;
+import com.ruoyi.project.system.domain.SysUserPost;
/**
* 用户与岗位关联表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserRoleMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserRoleMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java
index 4c4d4a767..e53590589 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/SysUserRoleMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.uvaluation.project.system.domain.SysUserRole;
+import com.ruoyi.project.system.domain.SysUserRole;
/**
* 用户与角色关联表 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/UploadFileMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/UploadFileMapper.java
similarity index 75%
rename from ruoyi/src/main/java/com/uvaluation/project/system/mapper/UploadFileMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/mapper/UploadFileMapper.java
index a45ae52b1..df12fad2c 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/mapper/UploadFileMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/UploadFileMapper.java
@@ -1,6 +1,6 @@
-package com.uvaluation.project.system.mapper;
+package com.ruoyi.project.system.mapper;
-import com.uvaluation.project.system.domain.UploadFile;
+import com.ruoyi.project.system.domain.UploadFile;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysConfigService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysConfigService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
index 1e33ad5c8..ec2411088 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysConfigService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
-import com.uvaluation.project.system.domain.SysConfig;
+import com.ruoyi.project.system.domain.SysConfig;
/**
* 参数配置 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDeptService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDeptService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
index 4bf9329e3..a45c94c94 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDeptService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
-import com.uvaluation.framework.web.domain.TreeSelect;
-import com.uvaluation.project.system.domain.SysDept;
+import com.ruoyi.framework.web.domain.TreeSelect;
+import com.ruoyi.project.system.domain.SysDept;
/**
* 部门管理 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDictDataService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDictDataService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
index 89025ca94..8330365bd 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDictDataService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
-import com.uvaluation.project.system.domain.SysDictData;
+import com.ruoyi.project.system.domain.SysDictData;
/**
* 字典 业务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDictTypeService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDictTypeService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
index b60fdc82e..7c650db00 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysDictTypeService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
-import com.uvaluation.project.system.domain.SysDictType;
+import com.ruoyi.project.system.domain.SysDictType;
/**
* 字典 业务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysMenuService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysMenuService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java
index 617e848bb..dbd2cded3 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysMenuService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java
@@ -1,10 +1,10 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
import java.util.Set;
-import com.uvaluation.framework.web.domain.TreeSelect;
-import com.uvaluation.project.system.domain.SysMenu;
-import com.uvaluation.project.system.domain.vo.RouterVo;
+import com.ruoyi.framework.web.domain.TreeSelect;
+import com.ruoyi.project.system.domain.SysMenu;
+import com.ruoyi.project.system.domain.vo.RouterVo;
/**
* 菜单 业务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysNoticeService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysNoticeService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java
index 0b7c2b3ba..3f7455123 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysNoticeService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
-import com.uvaluation.project.system.domain.SysNotice;
+import com.ruoyi.project.system.domain.SysNotice;
/**
* 公告 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysPostService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysPostService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
index 5d94b1049..b93e10062 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysPostService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
-import com.uvaluation.project.system.domain.SysPost;
+import com.ruoyi.project.system.domain.SysPost;
/**
* 岗位信息 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysRoleService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysRoleService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java
index ba976db9b..93b013f86 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysRoleService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
import java.util.Set;
-import com.uvaluation.project.system.domain.SysRole;
+import com.ruoyi.project.system.domain.SysRole;
/**
* 角色业务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysUserOnlineService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java
similarity index 87%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysUserOnlineService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java
index 122b09a38..7974ae7af 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysUserOnlineService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.project.monitor.domain.SysUserOnline;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.monitor.domain.SysUserOnline;
/**
* 在线用户 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysUserService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java
similarity index 97%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/ISysUserService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java
index f33cdf305..366fb4534 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/ISysUserService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
import java.util.List;
-import com.uvaluation.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUser;
/**
* 用户 业务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/IUploadFileService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/IUploadFileService.java
similarity index 77%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/IUploadFileService.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/IUploadFileService.java
index 58a79900e..422a5aaa8 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/IUploadFileService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/IUploadFileService.java
@@ -1,6 +1,6 @@
-package com.uvaluation.project.system.service;
+package com.ruoyi.project.system.service;
-import com.uvaluation.project.system.domain.UploadFile;
+import com.ruoyi.project.system.domain.UploadFile;
import java.util.List;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysConfigServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysConfigServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
index bdb582c10..684338879 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
@@ -1,13 +1,13 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.project.system.domain.SysConfig;
-import com.uvaluation.project.system.mapper.SysConfigMapper;
-import com.uvaluation.project.system.service.ISysConfigService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.system.domain.SysConfig;
+import com.ruoyi.project.system.mapper.SysConfigMapper;
+import com.ruoyi.project.system.service.ISysConfigService;
/**
* 参数配置 服务层实现
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDeptServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDeptServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
index 6f70bcb10..9ab87a3dc 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.ArrayList;
import java.util.Iterator;
@@ -6,14 +6,14 @@ import java.util.List;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.DataScope;
-import com.uvaluation.framework.web.domain.TreeSelect;
-import com.uvaluation.project.system.domain.SysDept;
-import com.uvaluation.project.system.mapper.SysDeptMapper;
-import com.uvaluation.project.system.service.ISysDeptService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.web.domain.TreeSelect;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.service.ISysDeptService;
/**
* 部门管理 服务实现
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDictDataServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDictDataServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
index 679d97d78..d3ac0bf46 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.project.system.domain.SysDictData;
-import com.uvaluation.project.system.mapper.SysDictDataMapper;
-import com.uvaluation.project.system.service.ISysDictDataService;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.mapper.SysDictDataMapper;
+import com.ruoyi.project.system.service.ISysDictDataService;
/**
* 字典 业务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDictTypeServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
index 43012fd9a..8249dca31 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
@@ -1,15 +1,15 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.project.system.domain.SysDictType;
-import com.uvaluation.project.system.mapper.SysDictDataMapper;
-import com.uvaluation.project.system.mapper.SysDictTypeMapper;
-import com.uvaluation.project.system.service.ISysDictTypeService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.system.domain.SysDictType;
+import com.ruoyi.project.system.mapper.SysDictDataMapper;
+import com.ruoyi.project.system.mapper.SysDictTypeMapper;
+import com.ruoyi.project.system.service.ISysDictTypeService;
/**
* 字典 业务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysMenuServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysMenuServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
index ddaa3baa5..8f616b033 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
@@ -10,17 +10,17 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.web.domain.TreeSelect;
-import com.uvaluation.project.system.domain.SysMenu;
-import com.uvaluation.project.system.domain.SysUser;
-import com.uvaluation.project.system.domain.vo.MetaVo;
-import com.uvaluation.project.system.domain.vo.RouterVo;
-import com.uvaluation.project.system.mapper.SysMenuMapper;
-import com.uvaluation.project.system.mapper.SysRoleMenuMapper;
-import com.uvaluation.project.system.service.ISysMenuService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.domain.TreeSelect;
+import com.ruoyi.project.system.domain.SysMenu;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.vo.MetaVo;
+import com.ruoyi.project.system.domain.vo.RouterVo;
+import com.ruoyi.project.system.mapper.SysMenuMapper;
+import com.ruoyi.project.system.mapper.SysRoleMenuMapper;
+import com.ruoyi.project.system.service.ISysMenuService;
/**
* 菜单 业务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysNoticeServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysNoticeServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
index 374792efe..f607b4fb7 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.project.system.domain.SysNotice;
-import com.uvaluation.project.system.mapper.SysNoticeMapper;
-import com.uvaluation.project.system.service.ISysNoticeService;
+import com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.project.system.mapper.SysNoticeMapper;
+import com.ruoyi.project.system.service.ISysNoticeService;
/**
* 公告 服务层实现
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysPostServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysPostServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
index 3edc6e81f..b31e8cb74 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
@@ -1,15 +1,15 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.project.system.domain.SysPost;
-import com.uvaluation.project.system.mapper.SysPostMapper;
-import com.uvaluation.project.system.mapper.SysUserPostMapper;
-import com.uvaluation.project.system.service.ISysPostService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.system.domain.SysPost;
+import com.ruoyi.project.system.mapper.SysPostMapper;
+import com.ruoyi.project.system.mapper.SysUserPostMapper;
+import com.ruoyi.project.system.service.ISysPostService;
/**
* 岗位信息 服务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysRoleServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysRoleServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
index 2e738fa4a..65019499a 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
@@ -8,19 +8,19 @@ import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.common.utils.spring.SpringUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.DataScope;
-import com.uvaluation.project.system.domain.SysRole;
-import com.uvaluation.project.system.domain.SysRoleDept;
-import com.uvaluation.project.system.domain.SysRoleMenu;
-import com.uvaluation.project.system.mapper.SysRoleDeptMapper;
-import com.uvaluation.project.system.mapper.SysRoleMapper;
-import com.uvaluation.project.system.mapper.SysRoleMenuMapper;
-import com.uvaluation.project.system.mapper.SysUserRoleMapper;
-import com.uvaluation.project.system.service.ISysRoleService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.system.domain.SysRole;
+import com.ruoyi.project.system.domain.SysRoleDept;
+import com.ruoyi.project.system.domain.SysRoleMenu;
+import com.ruoyi.project.system.mapper.SysRoleDeptMapper;
+import com.ruoyi.project.system.mapper.SysRoleMapper;
+import com.ruoyi.project.system.mapper.SysRoleMenuMapper;
+import com.ruoyi.project.system.mapper.SysUserRoleMapper;
+import com.ruoyi.project.system.service.ISysRoleService;
/**
* 角色 业务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysUserOnlineServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
index aef8e0556..261e7f113 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,10 +1,10 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import org.springframework.stereotype.Service;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.security.LoginUser;
-import com.uvaluation.project.monitor.domain.SysUserOnline;
-import com.uvaluation.project.system.service.ISysUserOnlineService;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.monitor.domain.SysUserOnline;
+import com.ruoyi.project.system.service.ISysUserOnlineService;
/**
* 在线用户 服务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
similarity index 91%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysUserServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 8282f11ed..396ea3ad3 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
import java.util.ArrayList;
import java.util.List;
@@ -7,23 +7,23 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.uvaluation.common.constant.UserConstants;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.aspectj.lang.annotation.DataScope;
-import com.uvaluation.project.system.domain.SysPost;
-import com.uvaluation.project.system.domain.SysRole;
-import com.uvaluation.project.system.domain.SysUser;
-import com.uvaluation.project.system.domain.SysUserPost;
-import com.uvaluation.project.system.domain.SysUserRole;
-import com.uvaluation.project.system.mapper.SysPostMapper;
-import com.uvaluation.project.system.mapper.SysRoleMapper;
-import com.uvaluation.project.system.mapper.SysUserMapper;
-import com.uvaluation.project.system.mapper.SysUserPostMapper;
-import com.uvaluation.project.system.mapper.SysUserRoleMapper;
-import com.uvaluation.project.system.service.ISysConfigService;
-import com.uvaluation.project.system.service.ISysUserService;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.system.domain.SysPost;
+import com.ruoyi.project.system.domain.SysRole;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUserPost;
+import com.ruoyi.project.system.domain.SysUserRole;
+import com.ruoyi.project.system.mapper.SysPostMapper;
+import com.ruoyi.project.system.mapper.SysRoleMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.project.system.mapper.SysUserPostMapper;
+import com.ruoyi.project.system.mapper.SysUserRoleMapper;
+import com.ruoyi.project.system.service.ISysConfigService;
+import com.ruoyi.project.system.service.ISysUserService;
/**
* 用户 业务层处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/UploadFileServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/UploadFileServiceImpl.java
similarity index 76%
rename from ruoyi/src/main/java/com/uvaluation/project/system/service/impl/UploadFileServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/system/service/impl/UploadFileServiceImpl.java
index 023a02cc8..4407bce5f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/system/service/impl/UploadFileServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/UploadFileServiceImpl.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.system.service.impl;
+package com.ruoyi.project.system.service.impl;
-import com.uvaluation.project.system.domain.*;
-import com.uvaluation.project.system.mapper.*;
-import com.uvaluation.project.system.service.IUploadFileService;
+import com.ruoyi.project.system.domain.*;
+import com.ruoyi.project.system.mapper.*;
+import com.ruoyi.project.system.service.IUploadFileService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/controller/GenController.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
similarity index 89%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/controller/GenController.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
index 044420b10..10d7d65e3 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/controller/GenController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.tool.gen.controller;
+package com.ruoyi.project.tool.gen.controller;
import java.io.IOException;
import java.util.HashMap;
@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.core.text.Convert;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.framework.web.page.TableDataInfo;
-import com.uvaluation.project.tool.gen.domain.GenTable;
-import com.uvaluation.project.tool.gen.domain.GenTableColumn;
-import com.uvaluation.project.tool.gen.service.IGenTableColumnService;
-import com.uvaluation.project.tool.gen.service.IGenTableService;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.tool.gen.domain.GenTable;
+import com.ruoyi.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.project.tool.gen.service.IGenTableColumnService;
+import com.ruoyi.project.tool.gen.service.IGenTableService;
/**
* 代码生成 操作处理
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/domain/GenTable.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/domain/GenTable.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
index 0a13b5c89..d24014b29 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/domain/GenTable.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.tool.gen.domain;
+package com.ruoyi.project.tool.gen.domain;
import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import org.apache.commons.lang3.ArrayUtils;
-import com.uvaluation.common.constant.GenConstants;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 业务表 gen_table
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/domain/GenTableColumn.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java
similarity index 98%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/domain/GenTableColumn.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java
index 995820149..b73f28ca2 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/domain/GenTableColumn.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.tool.gen.domain;
+package com.ruoyi.project.tool.gen.domain;
import javax.validation.constraints.NotBlank;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.web.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 代码生成业务字段表 gen_table_column
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/mapper/GenTableColumnMapper.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/mapper/GenTableColumnMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java
index a37961ed7..3aa09e823 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/mapper/GenTableColumnMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.tool.gen.mapper;
+package com.ruoyi.project.tool.gen.mapper;
import java.util.List;
-import com.uvaluation.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.project.tool.gen.domain.GenTableColumn;
/**
* 业务字段 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/mapper/GenTableMapper.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java
similarity index 93%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/mapper/GenTableMapper.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java
index 533dd2649..a7bcf9563 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/mapper/GenTableMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.tool.gen.mapper;
+package com.ruoyi.project.tool.gen.mapper;
import java.util.List;
-import com.uvaluation.project.tool.gen.domain.GenTable;
+import com.ruoyi.project.tool.gen.domain.GenTable;
/**
* 业务 数据层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/GenTableColumnServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
similarity index 86%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/GenTableColumnServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
index 6afdde3ff..ee85a472b 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/GenTableColumnServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
@@ -1,11 +1,11 @@
-package com.uvaluation.project.tool.gen.service;
+package com.ruoyi.project.tool.gen.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.uvaluation.common.core.text.Convert;
-import com.uvaluation.project.tool.gen.domain.GenTableColumn;
-import com.uvaluation.project.tool.gen.mapper.GenTableColumnMapper;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;
/**
* 业务字段 服务层实现
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/GenTableServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
similarity index 92%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/GenTableServiceImpl.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
index 009b1bd4e..85a3613b5 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/GenTableServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.tool.gen.service;
+package com.ruoyi.project.tool.gen.service;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -19,18 +19,18 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.uvaluation.common.constant.Constants;
-import com.uvaluation.common.constant.GenConstants;
-import com.uvaluation.common.exception.CustomException;
-import com.uvaluation.common.utils.SecurityUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.project.tool.gen.domain.GenTable;
-import com.uvaluation.project.tool.gen.domain.GenTableColumn;
-import com.uvaluation.project.tool.gen.mapper.GenTableColumnMapper;
-import com.uvaluation.project.tool.gen.mapper.GenTableMapper;
-import com.uvaluation.project.tool.gen.util.GenUtils;
-import com.uvaluation.project.tool.gen.util.VelocityInitializer;
-import com.uvaluation.project.tool.gen.util.VelocityUtils;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.tool.gen.domain.GenTable;
+import com.ruoyi.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;
+import com.ruoyi.project.tool.gen.mapper.GenTableMapper;
+import com.ruoyi.project.tool.gen.util.GenUtils;
+import com.ruoyi.project.tool.gen.util.VelocityInitializer;
+import com.ruoyi.project.tool.gen.util.VelocityUtils;
/**
* 业务 服务层实现
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/IGenTableColumnService.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
similarity index 88%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/IGenTableColumnService.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
index 65e06292a..c8c5c6f69 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/IGenTableColumnService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
@@ -1,7 +1,7 @@
-package com.uvaluation.project.tool.gen.service;
+package com.ruoyi.project.tool.gen.service;
import java.util.List;
-import com.uvaluation.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.project.tool.gen.domain.GenTableColumn;
/**
* 业务字段 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/IGenTableService.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java
similarity index 94%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/IGenTableService.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java
index c8e668a6f..2bf015c6f 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/service/IGenTableService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.tool.gen.service;
+package com.ruoyi.project.tool.gen.service;
import java.util.List;
import java.util.Map;
-import com.uvaluation.project.tool.gen.domain.GenTable;
+import com.ruoyi.project.tool.gen.domain.GenTable;
/**
* 业务 服务层
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/GenUtils.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/GenUtils.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
index 90326043e..406864368 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/GenUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
@@ -1,12 +1,12 @@
-package com.uvaluation.project.tool.gen.util;
+package com.ruoyi.project.tool.gen.util;
import java.util.Arrays;
import org.apache.commons.lang3.RegExUtils;
-import com.uvaluation.common.constant.GenConstants;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.config.GenConfig;
-import com.uvaluation.project.tool.gen.domain.GenTable;
-import com.uvaluation.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.config.GenConfig;
+import com.ruoyi.project.tool.gen.domain.GenTable;
+import com.ruoyi.project.tool.gen.domain.GenTableColumn;
/**
* 代码生成器 工具类
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/VelocityInitializer.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java
similarity index 90%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/VelocityInitializer.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java
index fb922028c..28d7c30b9 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/VelocityInitializer.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java
@@ -1,8 +1,8 @@
-package com.uvaluation.project.tool.gen.util;
+package com.ruoyi.project.tool.gen.util;
import java.util.Properties;
import org.apache.velocity.app.Velocity;
-import com.uvaluation.common.constant.Constants;
+import com.ruoyi.common.constant.Constants;
/**
* VelocityEngine工厂
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/VelocityUtils.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
similarity index 96%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/VelocityUtils.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
index 088bbbfae..e464974b7 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/gen/util/VelocityUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
@@ -1,15 +1,15 @@
-package com.uvaluation.project.tool.gen.util;
+package com.ruoyi.project.tool.gen.util;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson.JSONObject;
-import com.uvaluation.common.constant.GenConstants;
-import com.uvaluation.common.utils.DateUtils;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.project.tool.gen.domain.GenTable;
-import com.uvaluation.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.tool.gen.domain.GenTable;
+import com.ruoyi.project.tool.gen.domain.GenTableColumn;
public class VelocityUtils
{
diff --git a/ruoyi/src/main/java/com/uvaluation/project/tool/swagger/TestController.java b/ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
similarity index 95%
rename from ruoyi/src/main/java/com/uvaluation/project/tool/swagger/TestController.java
rename to ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
index 927b5e922..841b5317b 100644
--- a/ruoyi/src/main/java/com/uvaluation/project/tool/swagger/TestController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
@@ -1,4 +1,4 @@
-package com.uvaluation.project.tool.swagger;
+package com.ruoyi.project.tool.swagger;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.common.utils.StringUtils;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel;
diff --git a/ruoyi/src/main/resources/application-prod.yml b/ruoyi/src/main/resources/application-prod.yml
index 758fb6f67..e9bb7aff1 100644
--- a/ruoyi/src/main/resources/application-prod.yml
+++ b/ruoyi/src/main/resources/application-prod.yml
@@ -26,6 +26,12 @@ server:
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
+logging:
+ level:
+ root: debug
+ path: /var/log/uv-data-backend
+ config: classpath:logback-spring.xml
+
spring:
datasource:
dynamic:
diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml
index 3bc2c238a..709f61947 100644
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -49,7 +49,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
- active: dev
+ active: prod
# 文件上传
servlet:
multipart:
diff --git a/ruoyi/src/main/resources/logback-spring.xml b/ruoyi/src/main/resources/logback-spring.xml
index 6f892f67e..5538041da 100644
--- a/ruoyi/src/main/resources/logback-spring.xml
+++ b/ruoyi/src/main/resources/logback-spring.xml
@@ -139,7 +139,7 @@
<logger name="java.sql.Connection" level="DEBUG"/>
<logger name="java.sql.Statement" level="DEBUG"/>
<logger name="java.sql.PreparedStatement" level="DEBUG"/>
- <logger name="com.uvaluation" level="info"/>
+ <logger name="com.ruoyi" level="info"/>
</springProfile>
<root level="info">
diff --git a/ruoyi/src/main/resources/logback.xml b/ruoyi/src/main/resources/logback.xml
index c072be202..a360583fa 100644
--- a/ruoyi/src/main/resources/logback.xml
+++ b/ruoyi/src/main/resources/logback.xml
@@ -72,7 +72,7 @@
</appender>
<!-- 系统模块日志级别控制 -->
- <logger name="com.uvaluation" level="info" />
+ <logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
diff --git a/ruoyi/src/main/resources/mybatis/data/ArtificialResidenceRentPriceMapper.xml b/ruoyi/src/main/resources/mybatis/data/ArtificialResidenceRentPriceMapper.xml
index 59feb7673..cec164f31 100644
--- a/ruoyi/src/main/resources/mybatis/data/ArtificialResidenceRentPriceMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/ArtificialResidenceRentPriceMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.price.mapper.ArtificialResidenceRentPriceMapper">
+<mapper namespace="com.ruoyi.project.data.price.mapper.ArtificialResidenceRentPriceMapper">
- <resultMap type="com.uvaluation.project.data.price.domain.ArtificialResidenceRentBasePrice"
+ <resultMap type="com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice"
id="MainMappingResult">
<result property="id" column="id"/>
<result property="communityId" column="ProjectID"/>
@@ -22,7 +22,7 @@
</select>
<select id="selectPageCount"
- parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceRentBasePrice" resultType="int">
+ parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice" resultType="int">
select count(1) from DWA_PROJECTBASEPRICE_RENT_MANU_${yearMonth}
<where>
<if test="communityId != null">
@@ -32,7 +32,7 @@
</select>
<!-- 分页 -->
<select id="selectPageList"
- parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceRentBasePrice"
+ parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice"
resultMap="MainMappingResult">
SELECT ID,ProjectID,MainCoff_Rent,RentPrice,MainRentPrice,RentPrice_1,VOPPAT,VOPPA
FROM dbo.DWA_PROJECTBASEPRICE_RENT_MANU_${yearMonth}
@@ -45,7 +45,7 @@
</select>
<!-- 获取表名 -->
- <select id="yearMonthList" resultType="com.uvaluation.project.common.VueSelectModel">
+ <select id="yearMonthList" resultType="com.ruoyi.project.common.VueSelectModel">
SELECT right(name,6) as value, right(name,6) as label
FROM sys.tables
where name like 'DWA_PROJECTBASEPRICE_RENT_MANU_%' and name not like '%_bak'
@@ -63,7 +63,7 @@
truncate table DWA_PROJECTBASEPRICE_RENT_MANU_${yearMonth};
</update>
<!-- 更新人工修正租赁基价-->
- <update id="update" parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceRentBasePrice">
+ <update id="update" parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceRentBasePrice">
update dbo.DWA_PROJECTBASEPRICE_RENT_MANU_${yearMonth}
set RentPrice=#{rentPrice},MainRentPrice=#{mainRentPrice},VOPPAT=#{voppat},VOPPA=#{voppa},RentPrice_1=#{rentPrice_1}
,ModifyDate=getdate()
diff --git a/ruoyi/src/main/resources/mybatis/data/ArtificialResidenceSalePriceMapper.xml b/ruoyi/src/main/resources/mybatis/data/ArtificialResidenceSalePriceMapper.xml
index 9f66a557a..17e9b17c2 100644
--- a/ruoyi/src/main/resources/mybatis/data/ArtificialResidenceSalePriceMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/ArtificialResidenceSalePriceMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.price.mapper.ArtificialResidenceSalePriceMapper">
+<mapper namespace="com.ruoyi.project.data.price.mapper.ArtificialResidenceSalePriceMapper">
- <resultMap type="com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice"
+ <resultMap type="com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice"
id="MainMappingResult">
<result property="communityId" column="ProjectID"/>
<result property="communityName" column="ProjectName"/>
@@ -134,7 +134,7 @@
</sql>
<!-- 分页总数 -->
<select id="selectPageCount"
- parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice" resultType="int">
+ parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice" resultType="int">
select count(1) from dbo.DWA_PROJECTBASEPRICE_MANU_${yearMonth}
<where>
<if test="communityId != null">
@@ -148,7 +148,7 @@
</select>
<!-- 分页列表 -->
<select id="selectPageList"
- parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice"
+ parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice"
resultMap="MainMappingResult">
<include refid="selectAllField"/>
<where>
@@ -169,7 +169,7 @@
where id = #{id}
</select>
<!-- 获取表名 -->
- <select id="yearMonthList" resultType="com.uvaluation.project.common.VueSelectModel">
+ <select id="yearMonthList" resultType="com.ruoyi.project.common.VueSelectModel">
SELECT right(name,6) as value, right(name,6) as label
FROM sys.tables
where name like 'DWA_PROJECTBASEPRICE_MANU_%'
@@ -177,7 +177,7 @@
</select>
<!-- 修改价格信息（基价、主力基价、上月基价、幅度）、注意修改上期基价问题、还要把基价更新一下。 -->
- <update id="updateEntity" parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice">
+ <update id="updateEntity" parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice">
update dbo.DWA_PROJECTBASEPRICE_MANU_${yearMonth} set
BasePrice=#{basePrice},mainPrice=#{mainPrice},BasePrice_1=#{basePrice_1},VOPPAT=#{voppat},VOPPA=#{voppa},
PriceNote=#{comment}
@@ -198,7 +198,7 @@
from @table;
end;
</update>
- <insert id="insert" parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice">
+ <insert id="insert" parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice">
insert into dbo.DWA_PROJECTBASEPRICE_MANU_${yearMonth}
(
ProjectID
@@ -322,7 +322,7 @@
)
</insert>
<!-- 同步到基价库 -->
- <insert id="insertUVBasePrice" parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice">
+ <insert id="insertUVBasePrice" parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice">
insert into obpm_LianCheng_Data.dbo.TLK_基价信息
(
LASTMODIFIED
@@ -381,7 +381,7 @@
, #{voppa}
)
</insert>
- <insert id="insertUVDocument" parameterType="com.uvaluation.project.data.price.domain.ArtificialResidenceSaleBasePrice">
+ <insert id="insertUVDocument" parameterType="com.ruoyi.project.data.price.domain.ArtificialResidenceSaleBasePrice">
insert into obpm_LianCheng_Data.dbo.T_DOCUMENT
(
ID
diff --git a/ruoyi/src/main/resources/mybatis/data/ComputeResidenceRentPriceMapper.xml b/ruoyi/src/main/resources/mybatis/data/ComputeResidenceRentPriceMapper.xml
index 29940da34..3162b5cad 100644
--- a/ruoyi/src/main/resources/mybatis/data/ComputeResidenceRentPriceMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/ComputeResidenceRentPriceMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.price.mapper.ComputeResidenceRentPriceMapper">
+<mapper namespace="com.ruoyi.project.data.price.mapper.ComputeResidenceRentPriceMapper">
- <resultMap type="com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice"
+ <resultMap type="com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice"
id="MainMappingResult">
<result property="id" column="id"/>
<result property="communityId" column="ProjectID"/>
@@ -131,7 +131,7 @@
</sql>
<select id="selectPageCount"
- parameterType="com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice" resultType="int">
+ parameterType="com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice" resultType="int">
select count(1) from DWA_PROJECTBASEPRICE_RENT_IMDT_${yearMonth}
<where>
<if test="communityId != null">
@@ -141,7 +141,7 @@
</select>
<!-- 分页 -->
<select id="selectPageList"
- parameterType="com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice"
+ parameterType="com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice"
resultMap="MainMappingResult">
<![CDATA[ SELECT ID,ProjectID,ProjectName,ProjectAddr,County,Block,[Loop] as loopLine,IsIndxGen,IsPstCalc,StatusRun,PropertyType,ProjectType,ProjectTypeDtl,ProjectLevel,PropertyDevPeriod,BindClassID,MainCoff_Rent,RentPriceDft,MainRentPriceDft,RentPrice_1,PriceDealMean_1,PriceDealMax_1,SumDeal_1,PriceDeal_1_ToAI_Pst,PriceDealMean,PriceDealMax,SumDeal,PriceDeal_ToAI_Pst,PriceDeal_ToLst_Pst,PriceCaseOff,PriceCaseOff_ToLst_Pst,PriceListedMin,PriceLstMn_ToAI_Pst,PriceCase1_ToAI_Pst,PriceCase2_ToAI_Pst,PriceCase1_ToLst_Pst,PriceCase2_ToLst_Pst,PriceCase1,PriceCase1AdjPst,SumCase1,PriceCase2,PriceCase2AdjPst,SumCase2,VOPPBT,VOPPB,BindProjID,Bind_Proj_Pst,Bind_Block_Class,Bind_Block_Class_Pst,Bind_Block_Plevel,Bind_Block_Plevel_Pst,Bind_Block_PType,Bind_Block_Ptype_Pst,Bind_County_PType,Bind_County_Ptype_Pst,Bind_MixProject_PType,Bind_MixProject_Pst,VOPPAT,VOPPA ]]>
FROM dbo.DWA_PROJECTBASEPRICE_RENT_IMDT_${yearMonth}
@@ -154,7 +154,7 @@
where id = #{id}
</select>
<!-- 获取表名 -->
- <select id="yearMonthList" resultType="com.uvaluation.project.common.VueSelectModel">
+ <select id="yearMonthList" resultType="com.ruoyi.project.common.VueSelectModel">
SELECT right(name,6) as value, right(name,6) as label
FROM sys.tables
where name like 'DWA_PROJECTBASEPRICE_RENT_IMDT_%'
diff --git a/ruoyi/src/main/resources/mybatis/data/ComputeResidenceSalePriceMapper.xml b/ruoyi/src/main/resources/mybatis/data/ComputeResidenceSalePriceMapper.xml
index ce074325a..2ae71bef4 100644
--- a/ruoyi/src/main/resources/mybatis/data/ComputeResidenceSalePriceMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/ComputeResidenceSalePriceMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.price.mapper.ComputeResidenceSalePriceMapper">
+<mapper namespace="com.ruoyi.project.data.price.mapper.ComputeResidenceSalePriceMapper">
- <resultMap type="com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice"
+ <resultMap type="com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice"
id="MainMappingResult">
<result property="id" column="sid"/>
<result property="communityId" column="ProjectID"/>
@@ -136,7 +136,7 @@
</sql>
<!-- 分页总数 -->
<select id="selectPageCount"
- parameterType="com.uvaluation.project.data.price.domain.ComputeResidenceRentBasePrice" resultType="int">
+ parameterType="com.ruoyi.project.data.price.domain.ComputeResidenceRentBasePrice" resultType="int">
select count(1) from dbo.DWA_PROJECTBASEPRICE_IMDT_${yearMonth}
<where>
<if test="communityId != null">
@@ -150,7 +150,7 @@
</select>
<!-- 分页列表 -->
<select id="selectPageList"
- parameterType="com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice"
+ parameterType="com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice"
resultMap="MainMappingResult">
<include refid="selectAllField"/>
<where>
@@ -171,14 +171,14 @@
where id = #{id}
</select>
<!-- 获取表名 -->
- <select id="yearMonthList" resultType="com.uvaluation.project.common.VueSelectModel">
+ <select id="yearMonthList" resultType="com.ruoyi.project.common.VueSelectModel">
SELECT top 12 right(name,6) as value, right(name,6) as label
FROM sys.tables
where name like 'DWA_PROJECTBASEPRICE_IMDT_%'
order by cast(right(name,6) as int) desc
</select>
<!-- 区域涨跌幅 -->
- <select id="getBlockChange" resultType="com.uvaluation.project.data.price.domain.DistrictBlockChange">
+ <select id="getBlockChange" resultType="com.ruoyi.project.data.price.domain.DistrictBlockChange">
select Block as name
, avg(VOPPA) as value
from dbo.DWA_PROJECTBASEPRICE_IMDT_${yearMonth}
@@ -187,7 +187,7 @@
order by avg(VOPPA)
</select>
<!--区域涨跌幅-->
- <select id="getCountyChange" resultType="com.uvaluation.project.data.price.domain.DistrictBlockChange">
+ <select id="getCountyChange" resultType="com.ruoyi.project.data.price.domain.DistrictBlockChange">
select left(County,2) as name
, avg(VOPPA) as value
from dbo.DWA_PROJECTBASEPRICE_IMDT_${yearMonth}
diff --git a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalOfficeCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalOfficeCaseMapper.xml
index 912780aed..9169deb09 100644
--- a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalOfficeCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalOfficeCaseMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalOfficeCaseMapper">
- <resultMap id="DownloadMapping" type="com.uvaluation.project.data.cases.domain.OriginalOfficeCase">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalOfficeCaseMapper">
+ <resultMap id="DownloadMapping" type="com.ruoyi.project.data.cases.domain.OriginalOfficeCase">
<result property="url" column="url"/>
<result property="title" column="title"/>
<result property="floorAreaRatio" column="容积率"/>
diff --git a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentClosingCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentClosingCaseMapper.xml
index c657024fd..9735b39b2 100644
--- a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentClosingCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentClosingCaseMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalResidenceRentClosingCaseMapper">
- <select id="download" resultType="com.uvaluation.project.data.cases.domain.OriginalResidenceRentClosingCase">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceRentClosingCaseMapper">
+ <select id="download" resultType="com.ruoyi.project.data.cases.domain.OriginalResidenceRentClosingCase">
SELECT 合同编号 as caseContractNo
,小区名称 as caseCommunityName
,挂牌时间 as caseOpeningDate
diff --git a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentOpeningCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentOpeningCaseMapper.xml
index 32802aff3..f3f4b26b8 100644
--- a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentOpeningCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentOpeningCaseMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalResidenceRentOpeningCaseMapper">
- <resultMap id="resultMapping" type="com.uvaluation.project.data.cases.domain.OriginalResidenceRentOpeningCase">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceRentOpeningCaseMapper">
+ <resultMap id="resultMapping" type="com.ruoyi.project.data.cases.domain.OriginalResidenceRentOpeningCase">
<result property="caseLianJiaId" column="llid"/>
<result property="caseLianJiaCommunityId" column="lcid"/>
<result property="cleanCommunityId" column="airaid" />
diff --git a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentPlatformCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentPlatformCaseMapper.xml
index 884809f3a..540fe4dc6 100644
--- a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentPlatformCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceRentPlatformCaseMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalResidenceRentPlatformCaseMapper">
- <resultMap id="resultMapping" type="com.uvaluation.project.data.cases.domain.OriginalResidencePlatformRentOpeningCase">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceRentPlatformCaseMapper">
+ <resultMap id="resultMapping" type="com.ruoyi.project.data.cases.domain.OriginalResidencePlatformRentOpeningCase">
<result property="caseArea" column="面积" javaType="java.math.BigDecimal"/>
<result property="caseBlock" column="block" />
<result property="caseAddress" column="地址"/>
diff --git a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceSaleClosingCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceSaleClosingCaseMapper.xml
index 924eeabfe..3ff88a250 100644
--- a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceSaleClosingCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceSaleClosingCaseMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalResidenceSaleClosingCaseMapper">
- <resultMap id="resultMapping" type="com.uvaluation.project.data.cases.domain.OriginalResidenceSaleClosingCase">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceSaleClosingCaseMapper">
+ <resultMap id="resultMapping" type="com.ruoyi.project.data.cases.domain.OriginalResidenceSaleClosingCase">
<result property="caseCountyName" column="区域"/>
<result property="caseBlockName" column="板块"/>
<result property="caseLoopName" column="环线"/>
diff --git a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceSaleOpeningCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceSaleOpeningCaseMapper.xml
index 003541be6..ee95f94c3 100644
--- a/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceSaleOpeningCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/DownloadOriginalResidenceSaleOpeningCaseMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.sync.DownloadOriginalResidenceSaleOpeningCaseMapper">
- <resultMap id="resultMapping" type="com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.sync.DownloadOriginalResidenceSaleOpeningCaseMapper">
+ <resultMap id="resultMapping" type="com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase">
<result property="caseLianJiaId" column="llid"/>
<result property="caseLianJiaCommunityId" column="lcid"/>
<result property="caseTitle" column="name"/>
diff --git a/ruoyi/src/main/resources/mybatis/data/LianJiaCommunityDictMapper.xml b/ruoyi/src/main/resources/mybatis/data/LianJiaCommunityDictMapper.xml
index 67b0a9745..b645ebd46 100644
--- a/ruoyi/src/main/resources/mybatis/data/LianJiaCommunityDictMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/LianJiaCommunityDictMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.basis.mapper.LianJiaCommunityDictMapper">
+<mapper namespace="com.ruoyi.project.data.basis.mapper.LianJiaCommunityDictMapper">
- <select id="selectPageOfList" resultType="com.uvaluation.project.data.basis.domain.LianJiaCommunityDict">
+ <select id="selectPageOfList" resultType="com.ruoyi.project.data.basis.domain.LianJiaCommunityDict">
SELECT id
,lianjia_community_id AS lianJiaCommunityid
,lianjia_community_name as lianJiaCommunityName
@@ -59,7 +59,7 @@
</if>
</where>
</select>
- <select id="selectById" resultType="com.uvaluation.project.data.basis.domain.LianJiaCommunityDict">
+ <select id="selectById" resultType="com.ruoyi.project.data.basis.domain.LianJiaCommunityDict">
SELECT id
,lianjia_community_id AS lianJiaCommunityid
,lianjia_community_name as lianJiaCommunityName
diff --git a/ruoyi/src/main/resources/mybatis/data/OriginalOfficeCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/OriginalOfficeCaseMapper.xml
index e6ef153a0..96879f40a 100644
--- a/ruoyi/src/main/resources/mybatis/data/OriginalOfficeCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/OriginalOfficeCaseMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.OriginalOfficeCaseMapper">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.OriginalOfficeCaseMapper">
<update id="createTable">
<bind name="targetTableName" value="'dbo.ODS_OFFICECASELISTED_' + yearMonth + '_RAW'"/>
IF OBJECT_ID(#{targetTableName}, 'U') IS NOT NULL
diff --git a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentClosingCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentClosingCaseMapper.xml
index 843299fbd..64d500f90 100644
--- a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentClosingCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentClosingCaseMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.OriginalResidenceRentClosingCaseMapper">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.OriginalResidenceRentClosingCaseMapper">
<update id="createRawTable">
<bind name="targetTableName" value="'dbo.ODS_HOUSINGCASEDEAL_RENT_' + yearMonth+'_RAW'"/>
IF OBJECT_ID(#{targetTableName}, 'U') IS NOT NULL
diff --git a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentOpeningCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentOpeningCaseMapper.xml
index 7fe9d168a..ff23c8c09 100644
--- a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentOpeningCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceRentOpeningCaseMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.OriginalResidenceRentOpeningCaseMapper">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.OriginalResidenceRentOpeningCaseMapper">
<!--挂牌案例-->
<update id="createTable">
<bind name="targetTableName" value="'dbo.ODS_HOUSINGCASELISTED_RENT_LJ_' + yearMonth +'_RAW' "/>
diff --git a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleClosingCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleClosingCaseMapper.xml
index 2462225fe..e392ec8a2 100644
--- a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleClosingCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleClosingCaseMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.OriginalResidenceSaleClosingCaseMapper">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.OriginalResidenceSaleClosingCaseMapper">
<update id="createRawClosingCaseTable">
<bind name="targetTableName" value="'dbo.二手房成交数据' + yearMonth" />
diff --git a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleOpeningCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleOpeningCaseMapper.xml
index 9eea12ab8..9e197b63e 100644
--- a/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleOpeningCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/OriginalResidenceSaleOpeningCaseMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.OriginalResidenceSaleOpeningCaseMapper">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.OriginalResidenceSaleOpeningCaseMapper">
<!--案例原始表-->
<update id="createOpeningCaseRawTable">
<bind name="targetTableName" value="'dbo.ODS_HOUSINGCASELISTED_LJ_' + yearMonth +'_RAW'"/>
diff --git a/ruoyi/src/main/resources/mybatis/data/SyncOriginalResidenceOpeningCaseMapper.xml b/ruoyi/src/main/resources/mybatis/data/SyncOriginalResidenceOpeningCaseMapper.xml
index ef5007dcd..e14c76304 100644
--- a/ruoyi/src/main/resources/mybatis/data/SyncOriginalResidenceOpeningCaseMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/SyncOriginalResidenceOpeningCaseMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.cases.mapper.sync.SyncOriginalResidenceSaleOpeningCaseMapper">
+<mapper namespace="com.ruoyi.project.data.cases.mapper.sync.SyncOriginalResidenceSaleOpeningCaseMapper">
<update id="createTable">
<bind name="targetTableName" value="'dbo.ODS_HOUSINGCASELISTED_LJ_' + yearMonth + '_RAW'"/>
IF OBJECT_ID(#{targetTableName}, 'U') IS NULL
@@ -35,7 +35,7 @@
truncate table ${targetTableName}
</update>
- <insert id="insert" parameterType="com.uvaluation.project.data.cases.domain.OriginalResidenceSaleOpeningCase">
+ <insert id="insert" parameterType="com.ruoyi.project.data.cases.domain.OriginalResidenceSaleOpeningCase">
insert into dbo.ODS_HOUSINGCASELISTED_LJ_${yearMonth}_RAW
(
llid
diff --git a/ruoyi/src/main/resources/mybatis/data/UVBasePriceMapper.xml b/ruoyi/src/main/resources/mybatis/data/UVBasePriceMapper.xml
index 5ca771259..4b1ed925d 100644
--- a/ruoyi/src/main/resources/mybatis/data/UVBasePriceMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/UVBasePriceMapper.xml
@@ -2,12 +2,12 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.basis.mapper.UVBasePriceMapper">
+<mapper namespace="com.ruoyi.project.data.basis.mapper.UVBasePriceMapper">
<!-- <resultMap id="resultMapping" type="com.ruoyi.project.data.basis.domain.UVBasePrice">-->
<!-- -->
<!-- </resultMap>-->
<select id="pageCount"
- parameterType="com.uvaluation.project.data.basis.domain.UVBasePriceQueryModel"
+ parameterType="com.ruoyi.project.data.basis.domain.UVBasePriceQueryModel"
resultType="int">
select count(1) from dbo.TLK_基价信息
<where>
@@ -26,8 +26,8 @@
</where>
</select>
<select id="pageList"
- parameterType="com.uvaluation.project.data.basis.domain.UVBasePriceQueryModel"
- resultType="com.uvaluation.project.data.basis.domain.UVBasePrice">
+ parameterType="com.ruoyi.project.data.basis.domain.UVBasePriceQueryModel"
+ resultType="com.ruoyi.project.data.basis.domain.UVBasePrice">
<!-- <bind name="skip" value=" (pageIndex - 1) * pageSize "></bind>-->
SELECT ITEM_AIRAID as communityId
,ITEM_PROJECTTYPE as communityType
diff --git a/ruoyi/src/main/resources/mybatis/data/UltimateOfficeBasePriceMapper.xml b/ruoyi/src/main/resources/mybatis/data/UltimateOfficeBasePriceMapper.xml
index b3085a6ef..c772dfd44 100644
--- a/ruoyi/src/main/resources/mybatis/data/UltimateOfficeBasePriceMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/UltimateOfficeBasePriceMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.price.mapper.UltimateOfficeBasePriceMapper">
+<mapper namespace="com.ruoyi.project.data.price.mapper.UltimateOfficeBasePriceMapper">
- <resultMap type="com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice"
+ <resultMap type="com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice"
id="OfficeBasePriceUltimateResult">
<result property="id" column="id"/>
<result property="yearMonth" column="yearMonth"/>
@@ -76,7 +76,7 @@
FROM ODS_OFFICE_BUILDING_PRICE_INFO_${yearMonth} a
</sql>
- <select id="getCount" parameterType="com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice" resultType="int">
+ <select id="getCount" parameterType="com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice" resultType="int">
select count(1) FROM ODS_OFFICE_BUILDING_PRICE_INFO_${yearMonth} a
<where>
<if test="communityId != null">
@@ -101,7 +101,7 @@
</where>
</select>
- <select id="getList" parameterType="com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice"
+ <select id="getList" parameterType="com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice"
resultMap="OfficeBasePriceUltimateResult">
<include refid="getById"/>
<where>
@@ -138,7 +138,7 @@
</select>
<!-- 更新基价 -->
- <update id="updateBasePrice" parameterType="com.uvaluation.project.data.price.domain.OfficeBasePriceModifyModel">
+ <update id="updateBasePrice" parameterType="com.ruoyi.project.data.price.domain.OfficeBasePriceModifyModel">
update ODS_OFFICE_BUILDING_PRICE_INFO_${yearMonth} set Status=0 where id=#{id};
</update>
<insert id="batchInsertArtificialOfficeBase">
@@ -150,7 +150,7 @@
</foreach>
</insert>
<!-- 更新基价 -->
- <insert id="updateBasePriceCopyNew" parameterType="com.uvaluation.project.data.price.domain.OfficeBasePriceModifyModel">
+ <insert id="updateBasePriceCopyNew" parameterType="com.ruoyi.project.data.price.domain.OfficeBasePriceModifyModel">
insert into ODS_OFFICE_BUILDING_PRICE_INFO_${yearMonth}(BuildingID
,UnifiedID
,ProjectID
@@ -185,14 +185,14 @@
</insert>
<!-- 获取表名 -->
- <select id="getYearMonthList" resultType="com.uvaluation.project.common.VueSelectModel">
+ <select id="getYearMonthList" resultType="com.ruoyi.project.common.VueSelectModel">
SELECT right(name,6) as value, right(name,6) as label
FROM sys.tables
where name like 'ODS_OFFICE_BUILDING_PRICE_INFO_%' and name not like '%_bak'
order by cast(right(name,6) as int) desc
</select>
<!-- -->
- <select id="getByBuildingId" resultType="com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice">
+ <select id="getByBuildingId" resultType="com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice">
select ID
,BuildingID_P as buildingId
,ProjectID_P as communityId
@@ -210,7 +210,7 @@
where BuildingID_P=#{buildingId} AND status= 1
</select>
<!-- 查询价格 -->
- <select id="getByRouteId" resultType="com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice">
+ <select id="getByRouteId" resultType="com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice">
SELECT ID
,BuildingID_P as buildingId
,ProjectID_P as communityId
@@ -229,7 +229,7 @@
</select>
<!-- 插入人工修正办公基价 -->
<insert id="insertArtificialOfficeBasePrice"
- parameterType="com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice">
+ parameterType="com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice">
insert into
dbo.DWA_PROJECTBASEPRICE_OFFICE_MANU_${yearMonth}(ID,BuildingID,ProjectID,County,"Loop",Block,ProjectAddr,ProjectName,Year,AvgArea,TotalFloorSum,UpperFloorSum,OfficeClass,Grade,MainPrice_1,MainPriceRent_1,MainPrice,MainPriceRent,ModifyDate)
values(#{id},#{buildingId},#{communityId},#{countyName},#{loopName},#{blockName},#{communityAddress},#{communityName},#{year},#{avgArea},#{totalFloorSum},#{upperFloorSum},#{officeClass},#{officeLevel},#{mainPrice_1},#{mainPriceRent_1},#{mainPrice},#{mainPriceRent},getdate())
diff --git a/ruoyi/src/main/resources/mybatis/data/UltimateResidenceRentBasePriceMapper.xml b/ruoyi/src/main/resources/mybatis/data/UltimateResidenceRentBasePriceMapper.xml
index 09cedabd1..b4015d0e1 100644
--- a/ruoyi/src/main/resources/mybatis/data/UltimateResidenceRentBasePriceMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/UltimateResidenceRentBasePriceMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.price.mapper.UltimateResidenceRentPriceMapper">
+<mapper namespace="com.ruoyi.project.data.price.mapper.UltimateResidenceRentPriceMapper">
- <resultMap type="com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice"
+ <resultMap type="com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice"
id="MappingResult">
<result property="id" column="id"/>
<result property="communityId" column="projectID"/>
@@ -75,7 +75,7 @@
ON A.ProjectID = B.projectid
</sql>
- <select id="selectPageCount" parameterType="com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice" resultType="int">
+ <select id="selectPageCount" parameterType="com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice" resultType="int">
select count(1) from ODS_PROJECT_RENT_PRICE_INFO_${yearMonth} a LEFT JOIN
obpm_LianCheng_Data.dbo.V_RESIDENCE_COMMUNITY B
ON A.ProjectID = B.projectid
@@ -90,7 +90,7 @@
</where>
</select>
- <select id="selectPageList" parameterType="com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice"
+ <select id="selectPageList" parameterType="com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice"
resultMap="MappingResult">
<include refid="selectAllColumn"/>
<where>
@@ -105,7 +105,7 @@
order by a.ProjectID ASC, a.status DESC OFFSET #{pageIndex} rows fetch next #{pageSize} rows only;
</select>
- <select id="yearMonthList" resultType="com.uvaluation.project.common.VueSelectModel">
+ <select id="yearMonthList" resultType="com.ruoyi.project.common.VueSelectModel">
SELECT right(name,6) as value, right(name,6) as label
FROM sys.tables
where name like 'ODS_PROJECT_RENT_PRICE_INFO_%' and name not like '%_bak'
diff --git a/ruoyi/src/main/resources/mybatis/data/UltimateResidenceSalePriceMapper.xml b/ruoyi/src/main/resources/mybatis/data/UltimateResidenceSalePriceMapper.xml
index bf44a5ff9..ab87c1f26 100644
--- a/ruoyi/src/main/resources/mybatis/data/UltimateResidenceSalePriceMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/data/UltimateResidenceSalePriceMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.data.price.mapper.UltimateResidenceSalePriceMapper">
+<mapper namespace="com.ruoyi.project.data.price.mapper.UltimateResidenceSalePriceMapper">
- <resultMap type="com.uvaluation.project.data.price.domain.UltimateResidenceSaleBasePrice"
+ <resultMap type="com.ruoyi.project.data.price.domain.UltimateResidenceSaleBasePrice"
id="MainMappingResult">
<result property="id" column="id"/>
<result property="yearMonth" column="yearMonth"/>
@@ -43,7 +43,7 @@
</sql>
<!-- 分页总数 -->
<select id="selectPageCount"
- parameterType="com.uvaluation.project.data.price.domain.UltimateResidenceSaleBasePrice" resultType="int">
+ parameterType="com.ruoyi.project.data.price.domain.UltimateResidenceSaleBasePrice" resultType="int">
select count(1) from dbo.ODS_PROJECT_PRICE_INFO_${yearMonth}
<where>
<if test="communityId != null">
@@ -56,7 +56,7 @@
</select>
<!-- 分页列表 -->
<select id="selectPageList"
- parameterType="com.uvaluation.project.data.price.domain.UltimateResidenceSaleBasePrice"
+ parameterType="com.ruoyi.project.data.price.domain.UltimateResidenceSaleBasePrice"
resultMap="MainMappingResult">
<include refid="selectAllField"/>
<where>
@@ -71,7 +71,7 @@
</select>
<!-- 获取表名 -->
- <select id="yearMonthList" resultType="com.uvaluation.project.common.VueSelectModel">
+ <select id="yearMonthList" resultType="com.ruoyi.project.common.VueSelectModel">
SELECT right(name,6) as value, right(name,6) as label
FROM sys.tables
where name like 'ODS_PROJECT_PRICE_INFO_%' and name not like '%_bak'
diff --git a/ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml b/ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml
index d4b846647..eace3f62c 100644
--- a/ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.monitor.mapper.SysLogininforMapper">
+<mapper namespace="com.ruoyi.project.monitor.mapper.SysLogininforMapper">
<resultMap type="SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id" />
diff --git a/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml b/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
index 85545f732..53cb94f86 100644
--- a/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.monitor.mapper.SysOperLogMapper">
+<mapper namespace="com.ruoyi.project.monitor.mapper.SysOperLogMapper">
<resultMap type="SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysConfigMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysConfigMapper.xml
index eb595ba24..30ae39f0e 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysConfigMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysConfigMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysConfigMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysConfigMapper">
<resultMap type="SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
index a16929f88..a07d8a0dc 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysDeptMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysDeptMapper">
<resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
index eae80f11f..0b341a7f9 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysDictDataMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysDictDataMapper">
<resultMap type="SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDictTypeMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDictTypeMapper.xml
index 77d3dd33a..3b6c5c666 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDictTypeMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDictTypeMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysDictTypeMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysDictTypeMapper">
<resultMap type="SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysJobLogMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysJobLogMapper.xml
index d043fdeb1..bf8157543 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysJobLogMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysJobLogMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.monitor.mapper.SysJobLogMapper">
+<mapper namespace="com.ruoyi.project.monitor.mapper.SysJobLogMapper">
<resultMap type="SysJobLog" id="SysJobLogResult">
<id property="jobLogId" column="job_log_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysJobMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysJobMapper.xml
index 38584c1ca..47f61c964 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysJobMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysJobMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.monitor.mapper.SysJobMapper">
+<mapper namespace="com.ruoyi.project.monitor.mapper.SysJobMapper">
<resultMap type="SysJob" id="SysJobResult">
<id property="jobId" column="job_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
index f963b7739..8bdb8168f 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysMenuMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysMenuMapper">
<resultMap type="SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml
index 22a6abcb3..a0c9b2035 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysNoticeMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysNoticeMapper">
<resultMap type="SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml
index 5165432d4..d2a20ada1 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysPostMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysPostMapper">
<resultMap type="SysPost" id="SysPostResult">
<id property="postId" column="post_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysRoleDeptMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysRoleDeptMapper.xml
index d10c0d6b6..23d2cb5e2 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysRoleDeptMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysRoleDeptMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysRoleDeptMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysRoleDeptMapper">
<resultMap type="SysRoleDept" id="SysRoleDeptResult">
<result property="roleId" column="role_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
index 497b6ee4e..954d070a1 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysRoleMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMapper">
<resultMap type="SysRole" id="SysRoleResult">
<id property="roleId" column="role_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysRoleMenuMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysRoleMenuMapper.xml
index c473aa9db..0e2e3d8cf 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysRoleMenuMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysRoleMenuMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysRoleMenuMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMenuMapper">
<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
index 18a57a7c3..4ee6d8fd3 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysUserMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult">
<id property="userId" column="user_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserPostMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserPostMapper.xml
index 826e5d263..d048078be 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysUserPostMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysUserPostMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysUserPostMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysUserPostMapper">
<resultMap type="SysUserPost" id="SysUserPostResult">
<result property="userId" column="user_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserRoleMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserRoleMapper.xml
index 733c52175..d7324eb95 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysUserRoleMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysUserRoleMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.SysUserRoleMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" />
diff --git a/ruoyi/src/main/resources/mybatis/system/UploadFileMapper.xml b/ruoyi/src/main/resources/mybatis/system/UploadFileMapper.xml
index 05f2d927b..5b0fa60dc 100644
--- a/ruoyi/src/main/resources/mybatis/system/UploadFileMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/UploadFileMapper.xml
@@ -2,13 +2,13 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.system.mapper.UploadFileMapper">
+<mapper namespace="com.ruoyi.project.system.mapper.UploadFileMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" />
<result property="roleId" column="role_id" />
</resultMap>
- <insert id="insert" parameterType="com.uvaluation.project.system.domain.UploadFile">
+ <insert id="insert" parameterType="com.ruoyi.project.system.domain.UploadFile">
insert into sys_file(fk, save_file_name, file_name, module_name, create_by, create_time)
value (#{fk},#{saveFileName},#{fileName},#{moduleName},#{createBy},now());
</insert>
@@ -17,7 +17,7 @@
delete from sys_file where id=#{id};
</delete>
- <select id="getByFk" parameterType="com.uvaluation.project.system.domain.UploadFile">
+ <select id="getByFk" parameterType="com.ruoyi.project.system.domain.UploadFile">
select fk, save_file_name as saveFileName, file_name as fileName, module_name as moduleName, create_by as
createBy, create_time as createTime
from sys_file where fk=#{fk}
diff --git a/ruoyi/src/main/resources/mybatis/tool/GenTableColumnMapper.xml b/ruoyi/src/main/resources/mybatis/tool/GenTableColumnMapper.xml
index 440b051e2..77d9e7da6 100644
--- a/ruoyi/src/main/resources/mybatis/tool/GenTableColumnMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/tool/GenTableColumnMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.tool.gen.mapper.GenTableColumnMapper">
+<mapper namespace="com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper">
<resultMap type="GenTableColumn" id="GenTableColumnResult">
<id property="columnId" column="column_id" />
diff --git a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
index c89cadf11..16d9e75a2 100644
--- a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.uvaluation.project.tool.gen.mapper.GenTableMapper">
+<mapper namespace="com.ruoyi.project.tool.gen.mapper.GenTableMapper">
<resultMap type="GenTable" id="GenTableResult">
<id property="tableId" column="table_id" />
diff --git a/ruoyi/src/main/resources/vm/java/controller.java.vm b/ruoyi/src/main/resources/vm/java/controller.java.vm
index bc079ba6c..3cd1be1d9 100644
--- a/ruoyi/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi/src/main/resources/vm/java/controller.java.vm
@@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.uvaluation.framework.aspectj.lang.annotation.Log;
-import com.uvaluation.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service;
-import com.uvaluation.framework.web.controller.BaseController;
-import com.uvaluation.framework.web.domain.AjaxResult;
-import com.uvaluation.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
#if($table.crud)
-import com.uvaluation.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.web.page.TableDataInfo;
#elseif($table.tree)
#end
diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm
index 664c7d370..e212108a0 100644
--- a/ruoyi/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi/src/main/resources/vm/java/domain.java.vm
@@ -3,7 +3,7 @@ package ${packageName}.domain;
#foreach ($import in $importList)
import ${import};
#end
-import com.uvaluation.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
#if($table.crud)
#elseif($table.tree)
#end
diff --git a/ruoyi/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi/src/main/resources/vm/java/serviceImpl.java.vm
index bc8b6eaba..9f8c53f1c 100644
--- a/ruoyi/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi/src/main/resources/vm/java/serviceImpl.java.vm
@@ -3,7 +3,7 @@ package ${packageName}.service.impl;
import java.util.List;
#foreach ($column in $columns)
#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
-import com.uvaluation.common.utils.DateUtils;
+import com.ruoyi.common.utils.DateUtils;
#break
#end
#end
diff --git a/ruoyi/src/test/java/com/uvaluation/GenerateTableTests.java b/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java
similarity index 85%
rename from ruoyi/src/test/java/com/uvaluation/GenerateTableTests.java
rename to ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java
index 33022468d..8cc783086 100644
--- a/ruoyi/src/test/java/com/uvaluation/GenerateTableTests.java
+++ b/ruoyi/src/test/java/com/ruoyi/GenerateTableTests.java
@@ -1,8 +1,8 @@
-package com.uvaluation;
+package com.ruoyi;
-import com.uvaluation.project.data.cases.domain.OriginalResidenceRentClosingCase;
-import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
+import com.ruoyi.project.data.cases.domain.OriginalResidenceRentClosingCase;
+import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
import org.junit.Test;
import java.lang.reflect.Field;
@@ -18,9 +18,9 @@ public class GenerateTableTests {
Class<?> targetClass = ComputeResidenceSaleBasePrice.class;
Stream.of(targetClass.getDeclaredFields()).forEach(x -> {
- if (x.isAnnotationPresent(com.uvaluation.framework.aspectj.lang.annotation.Excel.class)) {
- com.uvaluation.framework.aspectj.lang.annotation.Excel excel =
- x.getAnnotation(com.uvaluation.framework.aspectj.lang.annotation.Excel.class);
+ if (x.isAnnotationPresent(com.ruoyi.framework.aspectj.lang.annotation.Excel.class)) {
+ com.ruoyi.framework.aspectj.lang.annotation.Excel excel =
+ x.getAnnotation(com.ruoyi.framework.aspectj.lang.annotation.Excel.class);
System.out.println(String.format("<el-table-column label=\"%s\" align=\"center\" " +
"prop=\"%s\" />", excel.name(), x.getName()));
}
@@ -31,7 +31,7 @@ public class GenerateTableTests {
public void generateUserTableType() {
Class<?> targetClass = ComputeResidenceSaleBasePrice.class;
Stream.of(targetClass.getDeclaredFields()).forEach(x -> {
- if (x.isAnnotationPresent(com.uvaluation.framework.aspectj.lang.annotation.Excel.class)) {
+ if (x.isAnnotationPresent(com.ruoyi.framework.aspectj.lang.annotation.Excel.class)) {
if ("java.lang.String".equals(x.getType().getName()))
System.out.println(String.format("sourceDataTable.addColumnMetadata(\"%s\", java.sql.Types" +
".NVARCHAR);", x.getName()));
@@ -52,7 +52,7 @@ public class GenerateTableTests {
public void generateUserTableScript() {
Class<?> targetClass = ComputeResidenceSaleBasePrice.class;
Stream.of(targetClass.getDeclaredFields()).forEach(x -> {
- if (x.isAnnotationPresent(com.uvaluation.framework.aspectj.lang.annotation.Excel.class)) {
+ if (x.isAnnotationPresent(com.ruoyi.framework.aspectj.lang.annotation.Excel.class)) {
System.out.println(x.getName() + ",");
// System.out.println(x.getName() + " nvarchar(200) null ,");
// if ("java.lang.String".equals(x.getType().getName()))
diff --git a/ruoyi/src/test/java/com/uvaluation/compute/MapperXmlGeneratorTests.java b/ruoyi/src/test/java/com/ruoyi/compute/MapperXmlGeneratorTests.java
similarity index 94%
rename from ruoyi/src/test/java/com/uvaluation/compute/MapperXmlGeneratorTests.java
rename to ruoyi/src/test/java/com/ruoyi/compute/MapperXmlGeneratorTests.java
index 8709c915e..130478945 100644
--- a/ruoyi/src/test/java/com/uvaluation/compute/MapperXmlGeneratorTests.java
+++ b/ruoyi/src/test/java/com/ruoyi/compute/MapperXmlGeneratorTests.java
@@ -1,7 +1,7 @@
-package com.uvaluation.compute;
+package com.ruoyi.compute;
-import com.uvaluation.project.data.cases.domain.OriginalOfficeCase;
-import com.uvaluation.project.data.price.domain.UltimateResidenceRentBasePrice;
+import com.ruoyi.project.data.cases.domain.OriginalOfficeCase;
+import com.ruoyi.project.data.price.domain.UltimateResidenceRentBasePrice;
import org.junit.Assert;
import org.junit.Test;
diff --git a/ruoyi/src/test/java/com/uvaluation/compute/OfficeBasePriceTests.java b/ruoyi/src/test/java/com/ruoyi/compute/OfficeBasePriceTests.java
similarity index 81%
rename from ruoyi/src/test/java/com/uvaluation/compute/OfficeBasePriceTests.java
rename to ruoyi/src/test/java/com/ruoyi/compute/OfficeBasePriceTests.java
index eb3a19324..870cb8c98 100644
--- a/ruoyi/src/test/java/com/uvaluation/compute/OfficeBasePriceTests.java
+++ b/ruoyi/src/test/java/com/ruoyi/compute/OfficeBasePriceTests.java
@@ -1,7 +1,7 @@
-package com.uvaluation.compute;
+package com.ruoyi.compute;
-import com.uvaluation.RuoYiApplication;
-import com.uvaluation.project.data.cases.service.IOriginalOfficeCaseService;
+import com.ruoyi.RuoYiApplication;
+import com.ruoyi.project.data.cases.service.IOriginalOfficeCaseService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/test/java/com/uvaluation/compute/ResidenceRentBasePriceTests.java b/ruoyi/src/test/java/com/ruoyi/compute/ResidenceRentBasePriceTests.java
similarity index 80%
rename from ruoyi/src/test/java/com/uvaluation/compute/ResidenceRentBasePriceTests.java
rename to ruoyi/src/test/java/com/ruoyi/compute/ResidenceRentBasePriceTests.java
index 23d67e43d..1269bc15b 100644
--- a/ruoyi/src/test/java/com/uvaluation/compute/ResidenceRentBasePriceTests.java
+++ b/ruoyi/src/test/java/com/ruoyi/compute/ResidenceRentBasePriceTests.java
@@ -1,8 +1,8 @@
-package com.uvaluation.compute;
+package com.ruoyi.compute;
-import com.uvaluation.RuoYiApplication;
-import com.uvaluation.project.data.cases.service.IOriginalResidenceRentClosingCaseService;
-import com.uvaluation.project.data.cases.service.IOriginalResidenceRentOpeningCaseService;
+import com.ruoyi.RuoYiApplication;
+import com.ruoyi.project.data.cases.service.IOriginalResidenceRentClosingCaseService;
+import com.ruoyi.project.data.cases.service.IOriginalResidenceRentOpeningCaseService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/test/java/com/uvaluation/compute/ResidenceSaleBasePriceTests.java b/ruoyi/src/test/java/com/ruoyi/compute/ResidenceSaleBasePriceTests.java
similarity index 79%
rename from ruoyi/src/test/java/com/uvaluation/compute/ResidenceSaleBasePriceTests.java
rename to ruoyi/src/test/java/com/ruoyi/compute/ResidenceSaleBasePriceTests.java
index 45021a5b5..93688ea73 100644
--- a/ruoyi/src/test/java/com/uvaluation/compute/ResidenceSaleBasePriceTests.java
+++ b/ruoyi/src/test/java/com/ruoyi/compute/ResidenceSaleBasePriceTests.java
@@ -1,10 +1,10 @@
-package com.uvaluation.compute;
+package com.ruoyi.compute;
-import com.uvaluation.RuoYiApplication;
-import com.uvaluation.project.data.cases.service.IOriginalResidenceSaleClosingCaseService;
-import com.uvaluation.project.data.cases.service.IOriginalResidenceSaleOpeningCaseService;
-import com.uvaluation.project.data.price.domain.ComputeResidenceSaleBasePrice;
-import com.uvaluation.project.data.price.service.IArtificialResidenceSalePriceService;
+import com.ruoyi.RuoYiApplication;
+import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleClosingCaseService;
+import com.ruoyi.project.data.cases.service.IOriginalResidenceSaleOpeningCaseService;
+import com.ruoyi.project.data.price.domain.ComputeResidenceSaleBasePrice;
+import com.ruoyi.project.data.price.service.IArtificialResidenceSalePriceService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi/src/test/java/com/uvaluation/longtime/SqlTests.java b/ruoyi/src/test/java/com/ruoyi/longtime/SqlTests.java
similarity index 94%
rename from ruoyi/src/test/java/com/uvaluation/longtime/SqlTests.java
rename to ruoyi/src/test/java/com/ruoyi/longtime/SqlTests.java
index 9ce3ae110..1326f2ed2 100644
--- a/ruoyi/src/test/java/com/uvaluation/longtime/SqlTests.java
+++ b/ruoyi/src/test/java/com/ruoyi/longtime/SqlTests.java
@@ -1,8 +1,8 @@
-package com.uvaluation.longtime;
+package com.ruoyi.longtime;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.uvaluation.RuoYiApplication;
-import com.uvaluation.project.data.price.domain.UltimateOfficeBasePrice;
+import com.ruoyi.RuoYiApplication;
+import com.ruoyi.project.data.price.domain.UltimateOfficeBasePrice;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;