From 82e5ed6939b99fa7096e1f2cdd6cb230bbb5f4c6 Mon Sep 17 00:00:00 2001 From: JackWU Date: Mon, 22 Mar 2021 11:45:18 +0800 Subject: [PATCH 1/7] ignore Clients has configged by db. --- .../pigx/gateway/config/GatewayConfigProperties.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GatewayConfigProperties.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GatewayConfigProperties.java index 5139199a8..68863e32c 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GatewayConfigProperties.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GatewayConfigProperties.java @@ -5,8 +5,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Component; -import java.util.List; - /** * @author lengleng * @date 2020/10/2 @@ -23,10 +21,4 @@ public class GatewayConfigProperties { * 网关解密登录前端密码 秘钥 {@link com.pig4cloud.pigx.gateway.filter.PasswordDecoderFilter} */ public String encodeKey; - - /** - * 网关不需要校验验证码的客户端 {@link com.pig4cloud.pigx.gateway.filter.ValidateCodeGatewayFilter} - */ - public List ignoreClients; - } From 08a463a8c6e037f0144958fcde40a289cd434462 Mon Sep 17 00:00:00 2001 From: TAO WU <704479351@qq.com> Date: Thu, 25 Mar 2021 11:39:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?style(=E4=BC=98=E5=8C=96=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB=E6=B3=A8=E8=A7=A3):=20=E6=B5=81=E7=A8=8B=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9E=9A=E4=B8=BE=E7=B1=BB=E6=8F=8F=E8=BF=B0=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit a992f46f05643adf1294073ea97e2a7e0d401000) --- .../core/constant/enums/ProcessStatusEnum.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ProcessStatusEnum.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ProcessStatusEnum.java index a14b2daa1..36d0eca34 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ProcessStatusEnum.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/ProcessStatusEnum.java @@ -29,23 +29,18 @@ import lombok.Getter; public enum ProcessStatusEnum { /** - * 图片资源 + * 激活 */ - ACTIVE("active", "图片资源"), + ACTIVE("active"), /** - * xml资源 + * 暂停 */ - SUSPEND("suspend", "xml资源"); + SUSPEND("suspend"); /** - * 类型 + * 状态 */ private final String status; - /** - * 描述 - */ - private final String description; - } From d9a0f9e8fe64b89b6c90bc86601a4ae44d3fe27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B5=B7=E6=B6=9B?= Date: Thu, 15 Apr 2021 16:49:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3postgresql=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5char=E7=B1=BB=E5=9E=8B=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E4=B8=BAunknowType=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-visual/pigx-codegen/src/main/resources/generator.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/pigx-visual/pigx-codegen/src/main/resources/generator.properties b/pigx-visual/pigx-codegen/src/main/resources/generator.properties index 7a76a6e2a..0d6701107 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/generator.properties +++ b/pigx-visual/pigx-codegen/src/main/resources/generator.properties @@ -35,6 +35,7 @@ timestamp=LocalDateTime int2=Integer int4=Integer int8=Long +bpchar=String #ORACLE \u7279\u6B8A\u7C7B\u578B\u8F6C\u6362\u89C4\u5219 INT=Integer From 9542bab4068b0c483f536d923d01a5202be40635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B5=B7=E6=B6=9B?= Date: Mon, 19 Apr 2021 13:58:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8mssql=E3=80=81mysql=E3=80=81pgsql=20like=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E5=A4=9A=E5=BC=A0=E8=A1=A8=E9=97=AE=E9=A2=98=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/GeneratorMssqlMapper.xml | 2 +- .../src/main/resources/mapper/GeneratorMySqlMapper.xml | 2 +- .../src/main/resources/mapper/GeneratorPgMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMssqlMapper.xml b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMssqlMapper.xml index 4ea9b31a5..39d338f39 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMssqlMapper.xml +++ b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMssqlMapper.xml @@ -16,7 +16,7 @@ ) T - and T.tableName like concat('%', #{tableName}, '%') + and T.tableName = #{tableName} ORDER BY T.tableName diff --git a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml index aaf0a711e..53aa2bf2c 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml +++ b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml @@ -17,7 +17,7 @@ SELECT DATABASE ()) - and table_name like concat('%', #{tableName}, '%') + and table_name = #{tableName} order by create_time desc diff --git a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorPgMapper.xml b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorPgMapper.xml index 4b62ca251..91fb2d4fe 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorPgMapper.xml +++ b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorPgMapper.xml @@ -15,7 +15,7 @@ AND relname NOT LIKE'sql_%' AND relchecks = 0 - and pc.relname like concat('%', #{tableName}, '%') + and pc.relname = #{tableName} ORDER BY relname From 0c5ac9027ceabfaac3bfb736f199c2012186a7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B5=B7=E6=B6=9B?= Date: Tue, 20 Apr 2021 11:26:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9xxl-job-admin=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=94=A8=E6=88=B7=E5=90=8D=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=92=8C=E7=BB=9F=E4=B8=80=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx-xxl-job-admin/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml index 9d44f3988..59c6e7d8b 100644 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml +++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml @@ -16,8 +16,8 @@ spring: datasource: url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true driver-class-name: com.mysql.cj.jdbc.Driver - username: ${MYSQL-PWD:root} - password: ${MYSQL-PWD:root} + username: ${MYSQL_USER:root} + password: ${MYSQL_PWD:root} mvc: static-path-pattern: /static/** freemarker: From 94d5ec961b7d16c0045a2b6a6171f6a3ed07144f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B5=B7=E6=B6=9B?= Date: Fri, 28 May 2021 18:16:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix=EF=BC=9A=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8pgsql=E6=95=B0=E6=8D=AE=E5=BA=93float4?= =?UTF-8?q?=E3=80=81float8=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx-codegen/src/main/resources/generator.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pigx-visual/pigx-codegen/src/main/resources/generator.properties b/pigx-visual/pigx-codegen/src/main/resources/generator.properties index 0d6701107..63e7bdd95 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/generator.properties +++ b/pigx-visual/pigx-codegen/src/main/resources/generator.properties @@ -36,6 +36,8 @@ int2=Integer int4=Integer int8=Long bpchar=String +float4=Float +float8=Float #ORACLE \u7279\u6B8A\u7C7B\u578B\u8F6C\u6362\u89C4\u5219 INT=Integer From 266cd52deafd3e914a330419cd80785051d00691 Mon Sep 17 00:00:00 2001 From: 892108994 <892108994@qq.com> Date: Thu, 24 Jun 2021 12:15:55 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'pigx-common/pigx-comm?= =?UTF-8?q?on-core/src/main/java/com/pig4cloud/pigx/common/core/util/Class?= =?UTF-8?q?Utils.java'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去除多余的分号 --- .../java/com/pig4cloud/pigx/common/core/util/ClassUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java index 83e1cc5dd..5ab1ec631 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java @@ -84,7 +84,7 @@ public class ClassUtils extends org.springframework.util.ClassUtils { specificMethod = BridgeMethodResolver.findBridgedMethod(specificMethod); // 先找方法，再找方法上的类 A annotation = AnnotatedElementUtils.findMergedAnnotation(specificMethod, annotationType); - ; + if (null != annotation) { return annotation; }