diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java index 34e5b1354..fc72e40e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java @@ -58,7 +58,7 @@ public class HouseController extends BaseController { /** * 下载人才认定申请表 */ - @Log(title = "下载人才认定申请表", businessType = BusinessType.OTHER) + @Log(title = "申请并下载申请表", businessType = BusinessType.OTHER) @PostMapping("/download") @RateLimiter(count = 1, time = 10) public R downloadWord(@Validated(DownloadGroup.class) @RequestBody BuyHousesBo buyHousesBo){ diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 4433ad268..9ffc1e60d 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: false + enabled: true url: http://localhost:9090/admin instance: 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 # username: root # 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 -# username: gxrc -# 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 - username: root - password: 123456 + 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 + 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 +# username: root +# password: 123456 # 从库数据源 slave: lazy: true diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 08101482c..8b7eed346 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -4,17 +4,17 @@ spring.servlet.multipart.location: /ruoyi/server/temp --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: false + enabled: true url: http://localhost:9090/admin instance: service-host-type: IP - username: ruoyi - password: 123456 + username: gaoxin + password: 1234Qwer@ --- # xxl-job 配置 xxl.job: # 执行器开关 - enabled: false + enabled: true # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。 admin-addresses: http://localhost:9100/xxl-job-admin # 执行器通讯TOKEN：非空时启用 diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java index abb436f51..44be8d51c 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java @@ -4,24 +4,12 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.resource.ClassPathResource; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.NumberUtil; 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.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.HttpUtil; -import cn.hutool.http.useragent.UserAgent; -import cn.hutool.http.useragent.UserAgentUtil; -import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.alibaba.excel.EasyExcel; 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.ruoyi.common.config.RuoYiConfig; 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.utils.*; 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.WorkUtils; import org.apache.commons.text.CaseUtils; -import org.bouncycastle.crypto.engines.SM2Engine; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; -import sun.misc.BASE64Encoder; - 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.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; -import java.math.BigDecimal; import java.net.HttpURLConnection; import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; import java.security.KeyPair; -import java.security.NoSuchAlgorithmException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java index 05fa9be91..af1220650 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java @@ -39,10 +39,10 @@ public class RepeatableFilter implements Filter { && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE) ) { requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); } - if (!isSafe((HttpServletRequest) request,(HttpServletResponse) response)) { + /* if (!isSafe((HttpServletRequest) request,(HttpServletResponse) response)) { ((HttpServletResponse) response).setStatus(403); return; - } + }*/ if (null == requestWrapper) { chain.doFilter(request, response); } else { @@ -86,7 +86,7 @@ public class RepeatableFilter implements Filter { } } - //防盗链设置 + /*//防盗链设置 String configValue = sysConfigService.getConfigValue("sys:preventing:hotlinking"); List strings = Arrays.asList(configValue.split(",")); if (ObjectUtil.isEmpty(configValue)) { @@ -108,8 +108,8 @@ public class RepeatableFilter implements Filter { if (referer.contains(white)) { return true; } - } - return false; + }*/ + return true; } /** diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml index a66dada79..81d7fb892 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml @@ -13,8 +13,8 @@ logging: spring: security: user: - name: ruoyi - password: 123456 + name: gaoxin + password: 1234Qwer@ boot: admin: ui: diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml index d4193d0be..25c51c54b 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml +++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml @@ -14,9 +14,9 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource 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 - username: root - password: root + 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: gxrc + password: 45Uuq5!aADGD hikari: auto-commit: true connection-test-query: SELECT 1 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java index d00eae34d..3123e63cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java @@ -110,7 +110,6 @@ public class SysLoginService { LoginUser loginUser = buildLoginSysUser(user); // 生成token LoginHelper.loginByDevice(loginUser, DeviceType.APP); - recordLogininfor(user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")); recordLoginInfo(user.getUserId(), user.getUserName()); return StpUtil.getTokenValue(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java index 77c622b3e..1bede32cc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java @@ -431,6 +431,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService { hashMap.put("cardId",buyHousesBo.getCardId()); hashMap.put("education",buyHousesBo.getEducation()); hashMap.put("type",buyHousesBo.getType()); + hashMap.put("sex",buyHousesBo.getSex()); String fileName = UUID.randomUUID().toString(); String templatePath = fileUpload + "Houses_template.docx"; String word = ExportWordUtil.createWord(templatePath, doc, fileName, hashMap); @@ -449,7 +450,9 @@ public class BuyHousesServiceImpl implements IBuyHousesService { ArrayList list = new ArrayList<>(); //查询购房信息 Long userId = LoginHelper.getUserId(); - List buyHouses = baseMapper.selectList(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getUserId, userId)); + List buyHouses = baseMapper.selectList(new LambdaQueryWrapper<>(BuyHouses.class) + .eq(BuyHouses::getUserId, userId) + .isNull(BuyHouses::getApiKey)); if (buyHouses.size()>0) { buyHouses.stream().forEach(e -> { DeclareListDTO declareListDTO = new DeclareListDTO(); @@ -475,7 +478,8 @@ public class BuyHousesServiceImpl implements IBuyHousesService { public R getInfo(BuyHouses buyHouses) { 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)){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(MaterialProof::getHouseId, buyHousesVo.getId()) @@ -523,7 +527,8 @@ public class BuyHousesServiceImpl implements IBuyHousesService { if (rInfo.getCode()!=200){ 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)){ hashMap.put("status",buyHouses.getProcessStatus()); hashMap.put("processKey",buyHouses.getProcessKey()); @@ -585,7 +590,8 @@ public class BuyHousesServiceImpl implements IBuyHousesService { @Override public R checkStatus() { Long userId = LoginHelper.getUserId(); - List buyHousesList = baseMapper.selectList(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getUserId, userId)); + List buyHousesList = baseMapper.selectList(new LambdaQueryWrapper<>(BuyHouses.class) + .eq(BuyHouses::getUserId, userId)); if (buyHousesList.size()>0){ return R.ok(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java index b5cca66d2..6d182fe7e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java @@ -123,11 +123,14 @@ public class HousesReviewServiceImpl implements IHousesReviewService { if (ObjectUtil.isNotNull(bo.getIds()) && bo.getIds().length>0){ 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()) .or().like(HousesReview::getCard,bo.getName()) - .or().like(HousesReview::getProjectName,bo.getName())); - lqw.orderByDesc(HousesReview::getUpdateTime); + .or().like(HousesReview::getProjectName,bo.getName()));*/ + + 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.eq(StringUtils.isNotBlank(bo.getQualification()), HousesReview::getQualification, bo.getQualification()); 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.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.eq(StringUtils.isNotBlank(bo.getQualification()), HousesReview::getQualification, bo.getQualification()); lqw.eq(StringUtils.isNotBlank(bo.getAuditTime()), HousesReview::getAuditTime, bo.getAuditTime()); @@ -472,6 +475,7 @@ public class HousesReviewServiceImpl implements IHousesReviewService { public TableDataInfo managerQueryPageList(HousesReviewBo bo, PageQuery pageQuery) { bo.setProcessStatus(Constants.SUCCEED); LambdaQueryWrapper lqw = buildQueryWrapper3(bo); + lqw.orderByDesc(HousesReview::getUpdateTime); Page result = baseMapper.selectPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -496,6 +500,7 @@ public class HousesReviewServiceImpl implements IHousesReviewService { public void export(HousesReviewEvent event) throws IOException { HousesReviewBo bo = BeanUtil.toBean(event, HousesReviewBo.class); LambdaQueryWrapper lqw = buildQueryWrapper3(bo); + lqw.orderByDesc(HousesReview::getUpdateTime); List housesReviews = baseMapper.selectVoList(lqw); String title = "人才认定申请表"; String separator = File.separator;