Merge remote-tracking branch 'origin/master'

jiangping

2025-07-01 fc341ea66b1affaadec30cb0e0b690855c30b304

Merge remote-tracking branch 'origin/master'

 official_website.iml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
  <component name="FacetManager">
    <facet type="azure" name="Azure">
      <configuration>
        <option name="dotAzurePath" value="D:\DouMee\javaCodeGit\dmttwebsit\server\.azure" />
      </configuration>
    </facet>
  </component>
</module>

 server/src/main/java/com/doumee/api/business/CarouselController.java

@@ -1,8 +1,11 @@
package com.doumee.api.business;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
@@ -17,6 +20,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;

import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

@@ -115,4 +121,5 @@
        return ApiResponse.success(null);
    }


}

 server/src/main/java/com/doumee/api/web/WebApiController.java

@@ -2,6 +2,7 @@

import com.doumee.config.annotation.EncryptionReq;
import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
@@ -48,6 +49,7 @@
    @ApiOperation("咨询信息 - åˆ†é¡µæŸ¥è¯¢")
    @PostMapping("/informationPage")
    public ApiResponse<PageData<Information>> findPage (@RequestBody PageWrap<Information> pageWrap) {
        pageWrap.getModel().setStatus(Constants.ZERO);
        return ApiResponse.success(informationService.findPage(pageWrap));
    }

@@ -58,6 +60,7 @@
        return ApiResponse.success(informationService.findById(id));
    }


    @ApiOperation("获取foot配置")
    @GetMapping("/getFoodDataVO")
    public ApiResponse<FootDataVO> getFoodDataVO() {

 server/src/main/java/com/doumee/config/shiro/ShiroConfig.java

@@ -92,7 +92,7 @@
        // - æ”¾è¡Œswagger
        map.put("/doc.html", "anon");
        map.put("/webjars/**", "anon");
        map.put("/web/**", "anon");
        map.put("/web/api/**", "anon");
        map.put("/swagger-resources/**", "anon");
        map.put("/v2/api-docs/**", "anon");
        // - å…¶ä»–接口统一拦截

 server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java

@@ -72,7 +72,7 @@

    @Override
    public void deleteById(Integer id) {
        carouselMapper.update(new UpdateWrapper<Carousel>().lambda().set(Carousel::getIsdeleted,Constants.ZERO).eq(Carousel::getId,id));
        carouselMapper.update(new UpdateWrapper<Carousel>().lambda().set(Carousel::getIsdeleted,Constants.ONE).eq(Carousel::getId,id));
    }

    @Override
@@ -176,7 +176,15 @@
        wrapper.lambda().eq(Carousel::getIsdeleted,Constants.ZERO)
                .eq(Carousel::getStatus,Constants.ZERO)
                .orderByDesc(Carousel::getSortnum);
        return carouselMapper.selectList(wrapper);
        List<Carousel> carouselList =
         carouselMapper.selectList(wrapper);
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carouselList)){
            String fileDir = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode();
            for (Carousel carousel:carouselList) {
                this.imgFullPath(fileDir,carousel);
            }
        }
        return carouselList;
    }
  
    @Override
@@ -188,8 +196,8 @@
                .eq(pageWrap.getModel().getId() != null, Carousel::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getRemark() != null, Carousel::getRemark, pageWrap.getModel().getRemark())
                .like(pageWrap.getModel().getTitle() != null, Carousel::getTitle, pageWrap.getModel().getTitle())
                .like(pageWrap.getModel().getDetail() != null, Carousel::getDetail, pageWrap.getModel().getDetail())
                .eq(pageWrap.getModel().getType() != null, Carousel::getType, pageWrap.getModel().getType())
                .like(pageWrap.getModel().getDetail() != null, Carousel::getDetail, pageWrap.getModel().getDetail())
                .eq(pageWrap.getModel().getJumpType() != null, Carousel::getJumpType, pageWrap.getModel().getJumpType())
                .like(pageWrap.getModel().getContent() != null, Carousel::getContent, pageWrap.getModel().getContent())
                .eq(pageWrap.getModel().getSortnum() != null, Carousel::getSortnum, pageWrap.getModel().getSortnum())

 server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java

@@ -62,7 +62,7 @@

    @Override
    public void deleteById(Integer id) {
        informationMapper.update(new UpdateWrapper<Information>().lambda().set(Information::getIsdeleted,Constants.ZERO).eq(Information::getId,id));
        informationMapper.update(new UpdateWrapper<Information>().lambda().set(Information::getIsdeleted,Constants.ONE).eq(Information::getId,id));
    }

    @Override
@@ -139,12 +139,14 @@
        queryWrapper.lambda()
                .eq(Information::getIsdeleted,Constants.ZERO)
                .eq(pageWrap.getModel().getId() != null, Information::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getStatus() != null, Information::getStatus, pageWrap.getModel().getStatus())
                .eq(pageWrap.getModel().getRemark() != null, Information::getRemark, pageWrap.getModel().getRemark())
                .like(pageWrap.getModel().getTitle() != null, Information::getTitle, pageWrap.getModel().getTitle())
                .like(pageWrap.getModel().getDetail() != null, Information::getDetail, pageWrap.getModel().getDetail())
                .like(pageWrap.getModel().getContent() != null, Information::getContent, pageWrap.getModel().getContent())
                .ge(pageWrap.getModel().getReleaseDate() != null, Information::getReleaseDate, Utils.Date.getStart(pageWrap.getModel().getReleaseDate()))
                .le(pageWrap.getModel().getReleaseDate() != null, Information::getReleaseDate, Utils.Date.getEnd(pageWrap.getModel().getReleaseDate()))
                .orderByDesc(Information::getSortnum)
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {

 server/src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://112.26.66.25:3306/official_website?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Doumee@168&QWERT
    url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/dmtt_run?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: test
    password: doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:

 server/src/main/resources/application-pro.yml

@@ -5,9 +5,9 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/official_website?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: doumee
    password: rtjgfEr@&0c0m
    url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/dmtt_run?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: test
    password: doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:

 server/src/main/resources/application-test.yml

@@ -5,9 +5,9 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://112.26.66.25:3306/official_website?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Doumee@168&QWERT
    url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/dmtt_run?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: test
    password: doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis: