From 5f20fb4b224bc71fe8647ced19ea77c09a270405 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 30 Jun 2024 19:13:03 +0000
Subject: [PATCH 1/7] Update springdoc.version to v2.6.0
---
pig-common/pig-common-bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
index c6f81a97..4b9c8a94 100644
--- a/pig-common/pig-common-bom/pom.xml
+++ b/pig-common/pig-common-bom/pom.xml
@@ -22,7 +22,7 @@
17
9.0.0
1.2.83_noneautotype
- 2.5.0
+ 2.6.0
2.2.22
3.5.7
8.4.0
From 08c4a6fe24eca3e289379792df4a5231106e76c0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 11:09:59 +0000
Subject: [PATCH 2/7] Update dependency com.mysql:mysql-connector-j to v9
---
pig-common/pig-common-bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
index c6f81a97..04956a79 100644
--- a/pig-common/pig-common-bom/pom.xml
+++ b/pig-common/pig-common-bom/pom.xml
@@ -25,7 +25,7 @@
2.5.0
2.2.22
3.5.7
- 8.4.0
+ 9.0.0
4.3.1
1.7.0
3.2.1
From a932cb250cf54cd356c7b6fd9cef62945e0e2843 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:24:03 +0000
Subject: [PATCH 3/7] Update dependency
io.github.git-commit-id:git-commit-id-maven-plugin to v9.0.1
---
pig-common/pig-common-bom/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
index c6f81a97..acf4a070 100644
--- a/pig-common/pig-common-bom/pom.xml
+++ b/pig-common/pig-common-bom/pom.xml
@@ -20,7 +20,7 @@
UTF-8
17
17
- 9.0.0
+ 9.0.1
1.2.83_noneautotype
2.5.0
2.2.22
diff --git a/pom.xml b/pom.xml
index c7a5b90b..fcf1cb3a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
pig4cloud
username
password
- 9.0.0
+ 9.0.1
0.0.41
1.6.0
3.13.0
From d0d84c1f2702ad6c5aef7af985ceddfd6dd9e21d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:28:07 +0000
Subject: [PATCH 4/7] Update dependency cn.hutool:hutool-bom to v5.8.29
---
pig-common/pig-common-bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
index c7fd076c..835d2298 100644
--- a/pig-common/pig-common-bom/pom.xml
+++ b/pig-common/pig-common-bom/pom.xml
@@ -33,7 +33,7 @@
3.0.0
2.3.5
5.4.1
- 5.8.28
+ 5.8.29
1.8.4
0.0.41
1.6.0
From 78cb635e57c104e968039d43b7808aa01796ba65 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 08:12:39 +0000
Subject: [PATCH 5/7] Update dependency org.jsoup:jsoup to v1.18.1
---
pig-common/pig-common-xss/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pig-common/pig-common-xss/pom.xml b/pig-common/pig-common-xss/pom.xml
index 38a5686a..5983b3f6 100755
--- a/pig-common/pig-common-xss/pom.xml
+++ b/pig-common/pig-common-xss/pom.xml
@@ -14,7 +14,7 @@
pigx xss 安全过滤插件 基于 JSOUP
- 1.17.2
+ 1.18.1
From f1931711fdf13ef679e4ab4a23ff8b408eae82cc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 22:01:20 +0000
Subject: [PATCH 6/7] Update dependency
org.springframework.cloud:spring-cloud-dependencies to v2023.0.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fcf1cb3a..162de51a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
3.8.0
3.3.1
- 2023.0.2
+ 2023.0.3
2023.0.1.0
UTF-8
17
From 7245c4654b6a00197e9ba5db53dab6319b27f19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Thu, 11 Jul 2024 13:06:55 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=94=90=20=E7=94=A8=E6=88=B7=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=B1=8F=E8=94=BD=E6=95=8F=E6=84=9F?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitee/ISSUE_TEMPLATE/issue.yml | 13 ++++++++-----
.../java/com/pig4cloud/pig/admin/api/vo/UserVO.java | 5 +++--
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitee/ISSUE_TEMPLATE/issue.yml b/.gitee/ISSUE_TEMPLATE/issue.yml
index 19d12098..bfc777ac 100644
--- a/.gitee/ISSUE_TEMPLATE/issue.yml
+++ b/.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
diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java
index a42f357a..e67d72db 100644
--- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java
+++ b/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;
/**