opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 02:08:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
LJL 2023-09-08 15:29:22 +08:00
parent e4391c28fa
commit b8406b0f01
10 changed files with 41 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java
View File

@ -58,7 +58,7 @@ public class HouseController extends BaseController {
/** /**
* 下载人才认定申请表 * 下载人才认定申请表
*/ */
@Log(title = "下载人才认定申请表", businessType = BusinessType.OTHER) @Log(title = "申请并下载申请表", businessType = BusinessType.OTHER)
@PostMapping("/download") @PostMapping("/download")
@RateLimiter(count = 1, time = 10) @RateLimiter(count = 1, time = 10)
public R downloadWord(@Validated(DownloadGroup.class) @RequestBody BuyHousesBo buyHousesBo){ public R downloadWord(@Validated(DownloadGroup.class) @RequestBody BuyHousesBo buyHousesBo){

14
ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -1,7 +1,7 @@
--- # 监控中心配置 --- # 监控中心配置
spring.boot.admin.client: spring.boot.admin.client:
# 增加客户端开关 # 增加客户端开关
enabled: false enabled: true
url: http://localhost:9090/admin url: http://localhost:9090/admin
instance: instance:
service-host-type: IP service-host-type: IP
@ -52,12 +52,12 @@ spring:
# url: jdbc:mysql://182.150.40.133:3309/ry-vue-house?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&useAffectedRows=true # url: jdbc:mysql://182.150.40.133:3309/ry-vue-house?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&useAffectedRows=true
# username: root # username: root
# password: 1234Qwer@ # password: 1234Qwer@
# url: jdbc:mysql://182.138.107.22:3409/ry-vue-house?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true url: jdbc:mysql://182.138.107.22:3409/ry-vue-house?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
# username: gxrc username: gxrc
# password: 45Uuq5!aADGD password: 45Uuq5!aADGD
url: jdbc:mysql://localhost:3306/ry-vue-house?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true # url: jdbc:mysql://localhost:3306/ry-vue-house?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root # username: root
password: 123456 # password: 123456
# 从库数据源 # 从库数据源
slave: slave:
lazy: true lazy: true

8
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -4,17 +4,17 @@ spring.servlet.multipart.location: /ruoyi/server/temp
--- # 监控中心配置 --- # 监控中心配置
spring.boot.admin.client: spring.boot.admin.client:
# 增加客户端开关 # 增加客户端开关
enabled: false enabled: true
url: http://localhost:9090/admin url: http://localhost:9090/admin
instance: instance:
service-host-type: IP service-host-type: IP
username: ruoyi username: gaoxin
password: 123456 password: 1234Qwer@
--- # xxl-job 配置 --- # xxl-job 配置
xxl.job: xxl.job:
# 执行器开关 # 执行器开关
enabled: false enabled: true
# 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。 # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
admin-addresses: http://localhost:9100/xxl-job-admin admin-addresses: http://localhost:9100/xxl-job-admin
# 执行器通讯TOKEN：非空时启用 # 执行器通讯TOKEN：非空时启用

26
ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java
View File

@ -4,24 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.resource.ClassPathResource; import cn.hutool.core.io.resource.ClassPathResource;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.Mode;
import cn.hutool.crypto.Padding;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.SmUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.SM2;
import cn.hutool.crypto.digest.MD5;
import cn.hutool.crypto.symmetric.AES;
import cn.hutool.crypto.symmetric.SM4;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.ListUtils;
@ -31,8 +19,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.GaoXinCardInfo;
import com.ruoyi.common.helper.DataBaseHelper; import com.ruoyi.common.helper.DataBaseHelper;
import com.ruoyi.common.utils.*; import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
@ -60,32 +46,20 @@ import com.ruoyi.work.service.impl.ProcessServiceImpl;
import com.ruoyi.work.utils.WorkComplyUtils; import com.ruoyi.work.utils.WorkComplyUtils;
import com.ruoyi.work.utils.WorkUtils; import com.ruoyi.work.utils.WorkUtils;
import org.apache.commons.text.CaseUtils; import org.apache.commons.text.CaseUtils;
import org.bouncycastle.crypto.engines.SM2Engine;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import sun.misc.BASE64Encoder;
import javax.crypto.*; import javax.crypto.*;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.KeyPair; import java.security.KeyPair;
import java.security.NoSuchAlgorithmException;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;

10
ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
View File

@ -39,10 +39,10 @@ public class RepeatableFilter implements Filter {
&& StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE) ) { && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE) ) {
requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
} }
if (!isSafe((HttpServletRequest) request,(HttpServletResponse) response)) { /* if (!isSafe((HttpServletRequest) request,(HttpServletResponse) response)) {
((HttpServletResponse) response).setStatus(403); ((HttpServletResponse) response).setStatus(403);
return; return;
} }*/
if (null == requestWrapper) { if (null == requestWrapper) {
chain.doFilter(request, response); chain.doFilter(request, response);
} else { } else {
@ -86,7 +86,7 @@ public class RepeatableFilter implements Filter {
} }
} }
//防盗链设置 /*//防盗链设置
String configValue = sysConfigService.getConfigValue("sys:preventing:hotlinking"); String configValue = sysConfigService.getConfigValue("sys:preventing:hotlinking");
List<String> strings = Arrays.asList(configValue.split(",")); List<String> strings = Arrays.asList(configValue.split(","));
if (ObjectUtil.isEmpty(configValue)) { if (ObjectUtil.isEmpty(configValue)) {
@ -108,8 +108,8 @@ public class RepeatableFilter implements Filter {
if (referer.contains(white)) { if (referer.contains(white)) {
return true; return true;
} }
} }*/
return false; return true;
} }
/** /**

4
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
View File

@ -13,8 +13,8 @@ logging:
spring: spring:
security: security:
user: user:
name: ruoyi name: gaoxin
password: 123456 password: 1234Qwer@
boot: boot:
admin: admin:
ui: ui:

6
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
View File

@ -14,9 +14,9 @@ spring:
datasource: datasource:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai url: jdbc:mysql://172.12.9.1:3409/ry-vue-house?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root username: gxrc
password: root password: 45Uuq5!aADGD
hikari: hikari:
auto-commit: true auto-commit: true
connection-test-query: SELECT 1 connection-test-query: SELECT 1

1
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
View File

@ -110,7 +110,6 @@ public class SysLoginService {
LoginUser loginUser = buildLoginSysUser(user); LoginUser loginUser = buildLoginSysUser(user);
// 生成token // 生成token
LoginHelper.loginByDevice(loginUser, DeviceType.APP); LoginHelper.loginByDevice(loginUser, DeviceType.APP);
recordLogininfor(user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); recordLogininfor(user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
recordLoginInfo(user.getUserId(), user.getUserName()); recordLoginInfo(user.getUserId(), user.getUserName());
return StpUtil.getTokenValue(); return StpUtil.getTokenValue();

14
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java
View File

@ -431,6 +431,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
hashMap.put("cardId",buyHousesBo.getCardId()); hashMap.put("cardId",buyHousesBo.getCardId());
hashMap.put("education",buyHousesBo.getEducation()); hashMap.put("education",buyHousesBo.getEducation());
hashMap.put("type",buyHousesBo.getType()); hashMap.put("type",buyHousesBo.getType());
hashMap.put("sex",buyHousesBo.getSex());
String fileName = UUID.randomUUID().toString(); String fileName = UUID.randomUUID().toString();
String templatePath = fileUpload + "Houses_template.docx"; String templatePath = fileUpload + "Houses_template.docx";
String word = ExportWordUtil.createWord(templatePath, doc, fileName, hashMap); String word = ExportWordUtil.createWord(templatePath, doc, fileName, hashMap);
@ -449,7 +450,9 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
ArrayList<DeclareListDTO> list = new ArrayList<>(); ArrayList<DeclareListDTO> list = new ArrayList<>();
//查询购房信息 //查询购房信息
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
List<BuyHouses> buyHouses = baseMapper.selectList(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getUserId, userId)); List<BuyHouses> buyHouses = baseMapper.selectList(new LambdaQueryWrapper<>(BuyHouses.class)
.eq(BuyHouses::getUserId, userId)
.isNull(BuyHouses::getApiKey));
if (buyHouses.size()>0) { if (buyHouses.size()>0) {
buyHouses.stream().forEach(e -> { buyHouses.stream().forEach(e -> {
DeclareListDTO declareListDTO = new DeclareListDTO(); DeclareListDTO declareListDTO = new DeclareListDTO();
@ -475,7 +478,8 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
public R<?> getInfo(BuyHouses buyHouses) { public R<?> getInfo(BuyHouses buyHouses) {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
//先判断本地数据库是否有值 //先判断本地数据库是否有值
BuyHousesVo buyHousesVo = baseMapper.selectVoOne(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getUserId,userId)); BuyHousesVo buyHousesVo = baseMapper.selectVoOne(new LambdaQueryWrapper<>(BuyHouses.class)
.eq(BuyHouses::getUserId,userId));
if (ObjectUtil.isNotNull(buyHousesVo)){ if (ObjectUtil.isNotNull(buyHousesVo)){
LambdaQueryWrapper<MaterialProof> wrapper = new LambdaQueryWrapper<MaterialProof>() LambdaQueryWrapper<MaterialProof> wrapper = new LambdaQueryWrapper<MaterialProof>()
.eq(MaterialProof::getHouseId, buyHousesVo.getId()) .eq(MaterialProof::getHouseId, buyHousesVo.getId())
@ -523,7 +527,8 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
if (rInfo.getCode()!=200){ if (rInfo.getCode()!=200){
return R.fail(rInfo.getMsg()); return R.fail(rInfo.getMsg());
} }
BuyHouses buyHouses = baseMapper.selectOne(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getCardId, cardId)); BuyHouses buyHouses = baseMapper.selectOne(new LambdaQueryWrapper<>(BuyHouses.class)
.eq(BuyHouses::getCardId, cardId));
if (ObjectUtil.isNotNull(buyHouses)){ if (ObjectUtil.isNotNull(buyHouses)){
hashMap.put("status",buyHouses.getProcessStatus()); hashMap.put("status",buyHouses.getProcessStatus());
hashMap.put("processKey",buyHouses.getProcessKey()); hashMap.put("processKey",buyHouses.getProcessKey());
@ -585,7 +590,8 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
@Override @Override
public R checkStatus() { public R checkStatus() {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
List<BuyHouses> buyHousesList = baseMapper.selectList(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getUserId, userId)); List<BuyHouses> buyHousesList = baseMapper.selectList(new LambdaQueryWrapper<>(BuyHouses.class)
.eq(BuyHouses::getUserId, userId));
if (buyHousesList.size()>0){ if (buyHousesList.size()>0){
return R.ok(); return R.ok();
} }

13
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java
View File

@ -123,11 +123,14 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
if (ObjectUtil.isNotNull(bo.getIds()) && bo.getIds().length>0){ if (ObjectUtil.isNotNull(bo.getIds()) && bo.getIds().length>0){
lqw.in(HousesReview::getId,bo.getIds()); lqw.in(HousesReview::getId,bo.getIds());
} }
lqw.and(StringUtils.isNotBlank(bo.getName()),t -> /* lqw.and(StringUtils.isNotBlank(bo.getName()),t ->
t.like(HousesReview::getName,bo.getName()) t.like(HousesReview::getName,bo.getName())
.or().like(HousesReview::getCard,bo.getName()) .or().like(HousesReview::getCard,bo.getName())
.or().like(HousesReview::getProjectName,bo.getName())); .or().like(HousesReview::getProjectName,bo.getName()));*/
lqw.orderByDesc(HousesReview::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getCard()), HousesReview::getCard, bo.getCard());
lqw.like(StringUtils.isNotBlank(bo.getName()), HousesReview::getName, bo.getName());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), HousesReview::getProjectName, bo.getProjectName());
lqw.like(StringUtils.isNotBlank(bo.getCardType()), HousesReview::getCardType, bo.getCardType()); lqw.like(StringUtils.isNotBlank(bo.getCardType()), HousesReview::getCardType, bo.getCardType());
lqw.eq(StringUtils.isNotBlank(bo.getQualification()), HousesReview::getQualification, bo.getQualification()); lqw.eq(StringUtils.isNotBlank(bo.getQualification()), HousesReview::getQualification, bo.getQualification());
lqw.eq(StringUtils.isNotBlank(bo.getAuditTime()), HousesReview::getAuditTime, bo.getAuditTime()); lqw.eq(StringUtils.isNotBlank(bo.getAuditTime()), HousesReview::getAuditTime, bo.getAuditTime());
@ -192,7 +195,7 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
lqw.in(HousesReview::getId,bo.getIds()); lqw.in(HousesReview::getId,bo.getIds());
} }
lqw.eq(StringUtils.isNotBlank(bo.getCardType()), HousesReview::getCardType, bo.getCardType()); lqw.eq(StringUtils.isNotBlank(bo.getCardType()), HousesReview::getCardType, bo.getCardType());
lqw.eq(StringUtils.isNotBlank(bo.getCard()), HousesReview::getCard, bo.getCard()); lqw.like(StringUtils.isNotBlank(bo.getCard()), HousesReview::getCard, bo.getCard());
lqw.like(StringUtils.isNotBlank(bo.getName()), HousesReview::getName, bo.getName()); lqw.like(StringUtils.isNotBlank(bo.getName()), HousesReview::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getQualification()), HousesReview::getQualification, bo.getQualification()); lqw.eq(StringUtils.isNotBlank(bo.getQualification()), HousesReview::getQualification, bo.getQualification());
lqw.eq(StringUtils.isNotBlank(bo.getAuditTime()), HousesReview::getAuditTime, bo.getAuditTime()); lqw.eq(StringUtils.isNotBlank(bo.getAuditTime()), HousesReview::getAuditTime, bo.getAuditTime());
@ -472,6 +475,7 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
public TableDataInfo<HousesReview> managerQueryPageList(HousesReviewBo bo, PageQuery pageQuery) { public TableDataInfo<HousesReview> managerQueryPageList(HousesReviewBo bo, PageQuery pageQuery) {
bo.setProcessStatus(Constants.SUCCEED); bo.setProcessStatus(Constants.SUCCEED);
LambdaQueryWrapper<HousesReview> lqw = buildQueryWrapper3(bo); LambdaQueryWrapper<HousesReview> lqw = buildQueryWrapper3(bo);
lqw.orderByDesc(HousesReview::getUpdateTime);
Page<HousesReview> result = baseMapper.selectPage(pageQuery.build(), lqw); Page<HousesReview> result = baseMapper.selectPage(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@ -496,6 +500,7 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
public void export(HousesReviewEvent event) throws IOException { public void export(HousesReviewEvent event) throws IOException {
HousesReviewBo bo = BeanUtil.toBean(event, HousesReviewBo.class); HousesReviewBo bo = BeanUtil.toBean(event, HousesReviewBo.class);
LambdaQueryWrapper<HousesReview> lqw = buildQueryWrapper3(bo); LambdaQueryWrapper<HousesReview> lqw = buildQueryWrapper3(bo);
lqw.orderByDesc(HousesReview::getUpdateTime);
List<HousesReviewVo> housesReviews = baseMapper.selectVoList(lqw); List<HousesReviewVo> housesReviews = baseMapper.selectVoList(lqw);
String title = "人才认定申请表"; String title = "人才认定申请表";
String separator = File.separator; String separator = File.separator;