Merge branch 'dsc' into 'develop'

bug提交

See merge request 8timerv2/8timerapiv200!37

pom.xml

@@ -319,6 +319,14 @@
 			<version>1.1.0</version>
 		</dependency>
 
+		<!-- 支付宝Easy支付SDK -->
+		<!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-easysdk -->
+		<dependency>
+		    <groupId>com.alipay.sdk</groupId>
+		    <artifactId>alipay-easysdk</artifactId>
+		    <version>1.1.3</version>
+		</dependency>
+
 		<!--springboot-quartz -->
 		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/cn/timer/api/controller/qyzx/QyzxController.java

@@ -10,7 +10,6 @@ import javax.servlet.http.HttpSession;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
@@ -30,9 +28,6 @@ import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaU
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.timer.api.bean.qyzx.QyzxAttaFpgl;
-import cn.timer.api.bean.qyzx.QyzxAttaFpzl;
 import cn.timer.api.bean.qyzx.QyzxAttaFwjsb;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
@@ -62,10 +57,9 @@ import cn.timer.api.dto.qyzx.AdminListDto;
 import cn.timer.api.dto.qyzx.AttaFpglQueryDto;
 import cn.timer.api.dto.qyzx.EntauthDto;
 import cn.timer.api.dto.qyzx.LogBuyDto;
-import cn.timer.api.dto.qyzx.QyzxAttaFpzlQueryDto;
-import cn.timer.api.utils.OSSUtil;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.ResultUtil;
+import cn.timer.api.utils.aliyun.OSSUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/resources/application-dev.yml

@@ -89,7 +89,7 @@ spring:
 ######### Spring boot应用健康监控
 management:
    server:
-     port: 9090 # 如果设置端口号为-1，则隐藏监控短点
+     port: 11677 # 如果设置端口号为-1，则隐藏监控短点
    endpoints:
      web:
         exposure: