Merge branch 'refs/heads/jdk17-dev' into jdk17

.gitee/ISSUE_TEMPLATE/issue.yml

@@ -1,25 +1,28 @@
 name: 问题咨询
-description: "请尽可能详细的描述问题，提供足够的上下文"
+description: "请尽可能详细的描述问题，提供足够的上下文，一分钟的描述不需要期望别人花半小时帮你排查"
 body:
  - type: dropdown
  id: version
  attributes:
  label: PIG版本
  options:
+ - "不处理PIGX或其他魔改版本"
  - "3.8"
  - "3.7"
  validations:
  required: true
  - type: checkboxes
+ validations:
+ required: true
  attributes:
- label: 是否修改了包名
+ label: 架构
  options:
- - label: 是
-  required: false
+ - label: 微服务架构
+ - label: 单体架构
  - type: textarea
  id: desired-solution
  attributes:
  label: 问题描述
- description: 详细问题，提供相应截图和日志
+ description: 详细问题，提供相应截图和日志，一分钟的描述不需要期望别人花半小时帮你排查
  validations:
  required: true

pig-common/pig-common-bom/pom.xml

@@ -20,20 +20,20 @@
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <maven.compiler.source>17</maven.compiler.source>
  <maven.compiler.target>17</maven.compiler.target>
- <git.commit.plugin>9.0.0</git.commit.plugin>
+ <git.commit.plugin>9.0.1</git.commit.plugin>
  <fastjson.version>1.2.83_noneautotype</fastjson.version>
- <springdoc.version>2.5.0</springdoc.version>
+ <springdoc.version>2.6.0</springdoc.version>
  <swagger.core.version>2.2.22</swagger.core.version>
  <mybatis-plus.version>3.5.7</mybatis-plus.version>
- <mysql.version>8.4.0</mysql.version>
+ <mysql.version>9.0.0</mysql.version>
  <dynamic-ds.version>4.3.1</dynamic-ds.version>
  <seata.version>1.7.0</seata.version>
  <excel.version>3.2.1</excel.version>
  <asm.version>7.1</asm.version>
  <sms.version>3.0.0</sms.version>
  <jaxb.version>2.3.5</jaxb.version>
  <shardingsphere.version>5.4.1</shardingsphere.version>
- <hutool.version>5.8.28</hutool.version>
+ <hutool.version>5.8.29</hutool.version>
  <sentinel.version>1.8.4</sentinel.version>
  <spring.checkstyle.plugin>0.0.41</spring.checkstyle.plugin>
  <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>

pig-common/pig-common-xss/pom.xml

@@ -14,7 +14,7 @@
 
  <description>pigx xss 安全过滤插件 基于 JSOUP</description>
  <properties>
- <jsoup.version>1.17.2</jsoup.version>
+ <jsoup.version>1.18.1</jsoup.version>
  </properties>
 
  <dependencies>

pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java

@@ -19,6 +19,7 @@
 
 package com.pig4cloud.pig.admin.api.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.pig4cloud.pig.admin.api.entity.SysPost;
 import com.pig4cloud.pig.admin.api.entity.SysRole;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -53,13 +54,13 @@ public class UserVO implements Serializable {
  /**
  * 密码
  */
- @Schema(description = "密码")
+ @JsonIgnore
  private String password;
 
  /**
  * 随机盐
  */
- @Schema(description = "随机盐")
+ @JsonIgnore
  private String salt;
 
  /**

pom.xml

@@ -30,7 +30,7 @@
  <!-- 项目版本号 -->
  <revision>3.8.0</revision>
  <spring-boot.version>3.3.1</spring-boot.version>
- <spring-cloud.version>2023.0.2</spring-cloud.version>
+ <spring-cloud.version>2023.0.3</spring-cloud.version>
  <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <maven.compiler.source>17</maven.compiler.source>
@@ -54,7 +54,7 @@
  <docker.namespace>pig4cloud</docker.namespace>
  <docker.username>username</docker.username>
  <docker.password>password</docker.password>
- <git.commit.plugin>9.0.0</git.commit.plugin>
+ <git.commit.plugin>9.0.1</git.commit.plugin>
  <spring.checkstyle.plugin>0.0.41</spring.checkstyle.plugin>
  <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
  <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>