From 0de4a88a2adf8966f7fb02a5e46952cb942aa3b8 Mon Sep 17 00:00:00 2001 From: lbw <460544652@qq.com> Date: Tue, 3 Aug 2021 09:47:35 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=BB=98=E8=AE=A4element?= =?UTF-8?q?=20=E5=8E=9F=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PigxWebResponseExceptionTranslator.java | 19 ++++++---- .../pig4cloud/pigx/codegen/util/GenUtils.java | 37 +++++++------------ 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java index c72816ab1..c279f338a 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java @@ -17,14 +17,7 @@ package com.pig4cloud.pigx.common.security.component; -import java.util.Locale; - -import com.pig4cloud.pigx.common.security.exception.ForbiddenException; -import com.pig4cloud.pigx.common.security.exception.InvalidException; -import com.pig4cloud.pigx.common.security.exception.MethodNotAllowedException; -import com.pig4cloud.pigx.common.security.exception.PigxAuth2Exception; -import com.pig4cloud.pigx.common.security.exception.ServerErrorException; -import com.pig4cloud.pigx.common.security.exception.UnauthorizedException; +import com.pig4cloud.pigx.common.security.exception.*; import com.pig4cloud.pigx.common.security.util.PigxSecurityMessageSourceUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -34,11 +27,14 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.oauth2.common.DefaultThrowableAnalyzer; import org.springframework.security.oauth2.common.exceptions.ClientAuthenticationException; import org.springframework.security.oauth2.common.exceptions.InvalidGrantException; +import org.springframework.security.oauth2.common.exceptions.InvalidTokenException; import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; import org.springframework.security.oauth2.provider.error.WebResponseExceptionTranslator; import org.springframework.security.web.util.ThrowableAnalyzer; import org.springframework.web.HttpRequestMethodNotSupportedException; +import java.util.Locale; + /** * @author lengleng * @date 2020-06-20 OAutH Server 异常处理,重写oauth 默认实现 @@ -86,6 +82,13 @@ public class PigxWebResponseExceptionTranslator implements WebResponseExceptionT return handleOAuth2Exception((OAuth2Exception) ase); } + // 处理不合法的令牌错误 401 返回 + ase = (InvalidTokenException) throwableAnalyzer.getFirstThrowableOfType(InvalidTokenException.class, + causeChain); + if (ase != null) { + return handleOAuth2Exception(new UnauthorizedException(ase.getMessage(), ase)); + } + return handleOAuth2Exception(new ServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase(), e)); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java index 324a14825..16caf4f8a 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java @@ -17,29 +17,12 @@ package com.pig4cloud.pigx.codegen.util; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.pig4cloud.pigx.codegen.entity.ColumnEntity; -import com.pig4cloud.pigx.codegen.entity.GenConfig; -import com.pig4cloud.pigx.codegen.entity.GenDatasourceConf; -import com.pig4cloud.pigx.codegen.entity.GenFormConf; -import com.pig4cloud.pigx.codegen.entity.TableEntity; +import com.pig4cloud.pigx.codegen.entity.*; import com.pig4cloud.pigx.codegen.mapper.GenDatasourceConfMapper; import com.pig4cloud.pigx.codegen.mapper.GeneratorMapper; import com.pig4cloud.pigx.common.core.constant.CommonConstants; @@ -60,6 +43,14 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.springframework.context.ApplicationContext; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + /** * 代码生成器 工具类 * @@ -112,14 +103,14 @@ public class GenUtils { templates.add("template/menu.sql.vm"); templates.add("template/avue/api.js.vm"); - if (StyleTypeEnum.ELEMENT.getStyle().equals(config.getStyle())) { - templates.add("template/element/index.vue.vm"); - templates.add("template/element/form.vue.vm"); - } - else { + if (StyleTypeEnum.AVUE.getStyle().equals(config.getStyle())) { templates.add("template/avue/index.vue.vm"); templates.add("template/avue/crud.js.vm"); } + else { + templates.add("template/element/index.vue.vm"); + templates.add("template/element/form.vue.vm"); + } return templates; }