From e29b48ecb8b4dce38d0437cb562a3b5f7efd1eb0 Mon Sep 17 00:00:00 2001 From: matevip <7333791@qq.com> Date: Tue, 6 Oct 2020 09:09:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B0=81=E8=A3=85retrofit=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mate/core/auth/aspect/PreAuthAspect.java | 4 -- mate-core/mate-starter-dependencies/pom.xml | 7 +++ mate-core/mate-starter-retrofit/README.md | 10 ++++ mate-core/mate-starter-retrofit/pom.xml | 27 +++++++++ .../mate/core/retrofit/annotation/Sign.java | 58 +++++++++++++++++++ .../config/RetrofitConfiguration.java | 23 ++++++++ .../retrofit/interceptor/SignInterceptor.java | 33 +++++++++++ .../main/resources/META-INF/spring.factories | 4 ++ .../src/main/resources/mate-retrofit.yml | 21 +++++++ mate-core/pom.xml | 1 + 10 files changed, 184 insertions(+), 4 deletions(-) create mode 100644 mate-core/mate-starter-retrofit/README.md create mode 100644 mate-core/mate-starter-retrofit/pom.xml create mode 100644 mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/annotation/Sign.java create mode 100644 mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/config/RetrofitConfiguration.java create mode 100644 mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/interceptor/SignInterceptor.java create mode 100644 mate-core/mate-starter-retrofit/src/main/resources/META-INF/spring.factories create mode 100644 mate-core/mate-starter-retrofit/src/main/resources/mate-retrofit.yml diff --git a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/PreAuthAspect.java b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/PreAuthAspect.java index 9039bcb8..98c66180 100644 --- a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/PreAuthAspect.java +++ b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/PreAuthAspect.java @@ -98,9 +98,5 @@ public boolean hasPerm(String permission) { private boolean hasPermissions(Collection authorities, String permission) { return authorities.stream().filter(StringUtils::hasText) .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(permission, x)); -// return PatternMatchUtils.simpleMatch(permission, authorities); } - - - } diff --git a/mate-core/mate-starter-dependencies/pom.xml b/mate-core/mate-starter-dependencies/pom.xml index 736599d3..ea127c96 100644 --- a/mate-core/mate-starter-dependencies/pom.xml +++ b/mate-core/mate-starter-dependencies/pom.xml @@ -76,6 +76,8 @@ 1.5.5 3.0.3 + + 2.1.8 @@ -483,6 +485,11 @@ jasypt-spring-boot-starter ${jasypt.version} + + com.github.lianjiatech + retrofit-spring-boot-starter + ${retrofit.version} + diff --git a/mate-core/mate-starter-retrofit/README.md b/mate-core/mate-starter-retrofit/README.md new file mode 100644 index 00000000..9eed024f --- /dev/null +++ b/mate-core/mate-starter-retrofit/README.md @@ -0,0 +1,10 @@ +## mate-starter-retrofit + +封装了链家出品的基于springboot上应用的retrofit-spring-boot-starter + +## 框架开发背景 +spring-boot项目中存在大量的http请求调用，然而当时调用都是通过HttpUtils或者RestTemplate实现的，说实话很麻烦，并且不利于统一管理。 因此当时就想通过Java接口的形式来统一搞定这件事。 由于不想引入spring-cloud相关依赖，当时就没有直接用feign，另外更重要的一点就是也想做的更加轻量，因此最终才写了这个框架 + +## 官方教程 + +https://github.com/LianjiaTech/retrofit-spring-boot-starter/blob/master/README_CN.md \ No newline at end of file diff --git a/mate-core/mate-starter-retrofit/pom.xml b/mate-core/mate-starter-retrofit/pom.xml new file mode 100644 index 00000000..246438e0 --- /dev/null +++ b/mate-core/mate-starter-retrofit/pom.xml @@ -0,0 +1,27 @@ + + + + mate-core + vip.mate + 1.2.8-SNAPSHOT + + 4.0.0 + + mate-starter-retrofit + + + + vip.mate + mate-starter-common + provided + + + com.github.lianjiatech + retrofit-spring-boot-starter + + + + + \ No newline at end of file diff --git a/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/annotation/Sign.java b/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/annotation/Sign.java new file mode 100644 index 00000000..7ebaa3d9 --- /dev/null +++ b/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/annotation/Sign.java @@ -0,0 +1,58 @@ +package vip.mate.core.retrofit.annotation; + +import com.github.lianjiatech.retrofit.spring.boot.annotation.InterceptMark; +import com.github.lianjiatech.retrofit.spring.boot.interceptor.BasePathMatchInterceptor; +import vip.mate.core.retrofit.interceptor.SignInterceptor; + +import java.lang.annotation.*; + +/** + * 签名注解 + * + * @author pangu + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +@Documented +@InterceptMark +public @interface Sign { + + /** + * secret key + * Support the configuration in the form of placeholder. + * + * @return + */ + String accessKeyId(); + + /** + * secret key + * Support the configuration in the form of placeholder. + * + * @return + */ + String accessKeySecret(); + + /** + * Interceptor matching path. + * + * @return + */ + String[] include() default {"/**"}; + + /** + * Interceptor excludes matching and intercepting by specified path. + * + * @return + */ + String[] exclude() default {}; + + /** + * The interceptor class which handles the annotation. + * Get the corresponding bean from the spring container firstly.If not, use + * reflection to create one! + * + * @return + */ + Class handler() default SignInterceptor.class; +} diff --git a/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/config/RetrofitConfiguration.java b/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/config/RetrofitConfiguration.java new file mode 100644 index 00000000..f3c587ae --- /dev/null +++ b/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/config/RetrofitConfiguration.java @@ -0,0 +1,23 @@ +package vip.mate.core.retrofit.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import vip.mate.core.common.factory.YamlPropertySourceFactory; +import vip.mate.core.retrofit.interceptor.SignInterceptor; + +/** + * Retrofit配置类 + * + * @author pangu + */ +@Configuration +@PropertySource(factory = YamlPropertySourceFactory.class, value = "classpath:mate-retrofit.yml") +public class RetrofitConfiguration { + + @Bean + public SignInterceptor signInterceptor() { + return new SignInterceptor(); + } + +} diff --git a/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/interceptor/SignInterceptor.java b/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/interceptor/SignInterceptor.java new file mode 100644 index 00000000..b4bb0d5b --- /dev/null +++ b/mate-core/mate-starter-retrofit/src/main/java/vip/mate/core/retrofit/interceptor/SignInterceptor.java @@ -0,0 +1,33 @@ +package vip.mate.core.retrofit.interceptor; + +import com.github.lianjiatech.retrofit.spring.boot.interceptor.BasePathMatchInterceptor; +import lombok.Setter; +import okhttp3.Request; +import okhttp3.Response; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +/** + * 签名拦截器 + * + * @author pangu + */ +@Setter +@Component +public class SignInterceptor extends BasePathMatchInterceptor { + + private String accessKeyId; + + private String accessKeySecret; + + @Override + public Response doIntercept(Chain chain) throws IOException { + Request request = chain.request(); + Request newReq = request.newBuilder() + .addHeader("accessKeyId", accessKeyId) + .addHeader("accessKeySecret", accessKeySecret) + .build(); + return chain.proceed(newReq); + } +} diff --git a/mate-core/mate-starter-retrofit/src/main/resources/META-INF/spring.factories b/mate-core/mate-starter-retrofit/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..74b6675c --- /dev/null +++ b/mate-core/mate-starter-retrofit/src/main/resources/META-INF/spring.factories @@ -0,0 +1,4 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + vip.mate.core.retrofit.config.RetrofitConfiguration + + diff --git a/mate-core/mate-starter-retrofit/src/main/resources/mate-retrofit.yml b/mate-core/mate-starter-retrofit/src/main/resources/mate-retrofit.yml new file mode 100644 index 00000000..a10fc3cb --- /dev/null +++ b/mate-core/mate-starter-retrofit/src/main/resources/mate-retrofit.yml @@ -0,0 +1,21 @@ +retrofit: + # Enable BodyCallAdapter + enable-body-call-adapter: true + # Enable ResponseCallAdapter + enable-response-call-adapter: true + # Enable log printing + enable-log: true + # Connection pool configuration + pool: + test1: + max-idle-connections: 3 + keep-alive-second: 100 + test2: + max-idle-connections: 5 + keep-alive-second: 50 + # Disable java.lang.Void return type + disable-void-return-type: false + # Log print interceptor + logging-interceptor: com.github.lianjiatech.retrofit.spring.boot.interceptor.DefaultLoggingInterceptor + # Retry Interceptor + retry-interceptor: com.github.lianjiatech.retrofit.spring.boot.retry.DefaultRetryInterceptor \ No newline at end of file diff --git a/mate-core/pom.xml b/mate-core/pom.xml index e0048479..2401c113 100644 --- a/mate-core/pom.xml +++ b/mate-core/pom.xml @@ -38,6 +38,7 @@ mate-starter-job mate-starter-mail mate-starter-strategy + mate-starter-retrofit From 09b1c0fbd3bc16573aa0840a1ebf9a5534cfd15e Mon Sep 17 00:00:00 2001 From: matevip <7333791@qq.com> Date: Wed, 7 Oct 2020 11:02:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E4=B8=80=E4=BA=9B=E8=AD=A6=E5=91=8A=EF=BC=8C?= =?UTF-8?q?=E5=A6=82validator=E5=92=8Cundertow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mate-core/mate-starter-cloud/pom.xml | 4 ++ .../src/main/resources/logback-spring.xml | 1 + .../core/redis/config/RedisConfiguration.java | 58 ++++++++++--------- .../config/UndertowHttp2Configuration.java | 38 ++++++++++++ .../UndertowServerFactoryCustomizer.java | 23 ++++++++ .../main/resources/META-INF/spring.factories | 3 +- mate-support/mate-admin/pom.xml | 16 ++--- 7 files changed, 106 insertions(+), 37 deletions(-) create mode 100644 mate-core/mate-starter-web/src/main/java/vip/mate/core/web/config/UndertowHttp2Configuration.java create mode 100644 mate-core/mate-starter-web/src/main/java/vip/mate/core/web/server/UndertowServerFactoryCustomizer.java diff --git a/mate-core/mate-starter-cloud/pom.xml b/mate-core/mate-starter-cloud/pom.xml index 1a0a859b..10c29f06 100644 --- a/mate-core/mate-starter-cloud/pom.xml +++ b/mate-core/mate-starter-cloud/pom.xml @@ -54,6 +54,10 @@ javax.servlet-api provided + + com.fasterxml.jackson.module + jackson-module-kotlin + diff --git a/mate-core/mate-starter-log/src/main/resources/logback-spring.xml b/mate-core/mate-starter-log/src/main/resources/logback-spring.xml index 57c8863c..94db682c 100644 --- a/mate-core/mate-starter-log/src/main/resources/logback-spring.xml +++ b/mate-core/mate-starter-log/src/main/resources/logback-spring.xml @@ -113,6 +113,7 @@ + diff --git a/mate-core/mate-starter-redis/src/main/java/vip/mate/core/redis/config/RedisConfiguration.java b/mate-core/mate-starter-redis/src/main/java/vip/mate/core/redis/config/RedisConfiguration.java index c619ef78..6815d7a1 100644 --- a/mate-core/mate-starter-redis/src/main/java/vip/mate/core/redis/config/RedisConfiguration.java +++ b/mate-core/mate-starter-redis/src/main/java/vip/mate/core/redis/config/RedisConfiguration.java @@ -18,41 +18,43 @@ /** * Redis基础配置类 + * + * @author pangu */ @Configuration @EnableConfigurationProperties(MateRedisProperties.class) @ConditionalOnProperty(value = MateRedisProperties.PREFIX + ".enabled", havingValue = "true", matchIfMissing = true) public class RedisConfiguration { - @SuppressWarnings("all") - @Bean(name = "redisTemplate") - @ConditionalOnClass(RedisOperations.class) - public org.springframework.data.redis.core.RedisTemplate redisTemplate(RedisConnectionFactory factory) { - org.springframework.data.redis.core.RedisTemplate template = new org.springframework.data.redis.core.RedisTemplate(); - template.setConnectionFactory(factory); + @SuppressWarnings("all") + @Bean(name = "redisTemplate") + @ConditionalOnClass(RedisOperations.class) + public org.springframework.data.redis.core.RedisTemplate redisTemplate(RedisConnectionFactory factory) { + org.springframework.data.redis.core.RedisTemplate template = new org.springframework.data.redis.core.RedisTemplate(); + template.setConnectionFactory(factory); - Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class); - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.activateDefaultTyping(om.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL); - jackson2JsonRedisSerializer.setObjectMapper(om); + Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.activateDefaultTyping(om.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL); + jackson2JsonRedisSerializer.setObjectMapper(om); - StringRedisSerializer stringRedisSerializer = new StringRedisSerializer(); - // key采用String的序列化方式 - template.setKeySerializer(stringRedisSerializer); - // hash的key也采用String的序列化方式 - template.setHashKeySerializer(stringRedisSerializer); - // value序列化方式采用jackson - template.setValueSerializer(jackson2JsonRedisSerializer); - // hash的value序列化方式采用jackson - template.setHashValueSerializer(jackson2JsonRedisSerializer); - template.afterPropertiesSet(); - return template; - } + StringRedisSerializer stringRedisSerializer = new StringRedisSerializer(); + // key采用String的序列化方式 + template.setKeySerializer(stringRedisSerializer); + // hash的key也采用String的序列化方式 + template.setHashKeySerializer(stringRedisSerializer); + // value序列化方式采用jackson + template.setValueSerializer(jackson2JsonRedisSerializer); + // hash的value序列化方式采用jackson + template.setHashValueSerializer(jackson2JsonRedisSerializer); + template.afterPropertiesSet(); + return template; + } - @Bean - @ConditionalOnBean(name = "redisTemplate") - public RedisService redisService() { - return new RedisService(); - } + @Bean + @ConditionalOnBean(name = "redisTemplate") + public RedisService redisService() { + return new RedisService(); + } } diff --git a/mate-core/mate-starter-web/src/main/java/vip/mate/core/web/config/UndertowHttp2Configuration.java b/mate-core/mate-starter-web/src/main/java/vip/mate/core/web/config/UndertowHttp2Configuration.java new file mode 100644 index 00000000..dbdc3bbe --- /dev/null +++ b/mate-core/mate-starter-web/src/main/java/vip/mate/core/web/config/UndertowHttp2Configuration.java @@ -0,0 +1,38 @@ +package vip.mate.core.web.config; + +import io.undertow.Undertow; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration; +import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import vip.mate.core.web.server.UndertowServerFactoryCustomizer; + +import static io.undertow.UndertowOptions.ENABLE_HTTP2; + +/** + * Undertow http2 h2c 配置，对 servlet 开启 + * + * @author pangu + */ +@Configuration(proxyBeanMethods = false) +@ConditionalOnClass(Undertow.class) +@AutoConfigureBefore(ServletWebServerFactoryAutoConfiguration.class) +public class UndertowHttp2Configuration { + + @Bean + public WebServerFactoryCustomizer undertowHttp2WebServerFactoryCustomizer() { + return factory -> factory.addBuilderCustomizers(builder -> builder.setServerOption(ENABLE_HTTP2, true)); + } + + /** + * 实例化UndertowServerFactoryCustomizer，解决undertow启动提示warn的问题 + * @return UndertowServerFactoryCustomizer + */ + @Bean + public UndertowServerFactoryCustomizer undertowServerFactoryCustomizer() { + return new UndertowServerFactoryCustomizer(); + } +} diff --git a/mate-core/mate-starter-web/src/main/java/vip/mate/core/web/server/UndertowServerFactoryCustomizer.java b/mate-core/mate-starter-web/src/main/java/vip/mate/core/web/server/UndertowServerFactoryCustomizer.java new file mode 100644 index 00000000..3db5bee0 --- /dev/null +++ b/mate-core/mate-starter-web/src/main/java/vip/mate/core/web/server/UndertowServerFactoryCustomizer.java @@ -0,0 +1,23 @@ +package vip.mate.core.web.server; + +import io.undertow.server.DefaultByteBufferPool; +import io.undertow.websockets.jsr.WebSocketDeploymentInfo; +import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; + +/** + * 解决undertow警告Buffer pool was not set on WebSocketDeploymentInfo + * + * @author pangu + */ +public class UndertowServerFactoryCustomizer implements WebServerFactoryCustomizer { + + @Override + public void customize(UndertowServletWebServerFactory factory) { + factory.addDeploymentInfoCustomizers(deploymentInfo -> { + WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo(); + webSocketDeploymentInfo.setBuffers(new DefaultByteBufferPool(false, 1024)); + deploymentInfo.addServletContextAttribute("io.undertow.websockets.jsr.WebSocketDeploymentInfo", webSocketDeploymentInfo); + }); + } +} diff --git a/mate-core/mate-starter-web/src/main/resources/META-INF/spring.factories b/mate-core/mate-starter-web/src/main/resources/META-INF/spring.factories index f2238d8c..dc62157e 100644 --- a/mate-core/mate-starter-web/src/main/resources/META-INF/spring.factories +++ b/mate-core/mate-starter-web/src/main/resources/META-INF/spring.factories @@ -2,6 +2,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ vip.mate.core.web.config.ExceptionConfiguration,\ vip.mate.core.web.config.DateConverterConfiguration,\ vip.mate.core.web.config.SwaggerConfiguration,\ - vip.mate.core.web.config.WebConfiguration + vip.mate.core.web.config.WebConfiguration,\ + vip.mate.core.web.config.UndertowHttp2Configuration diff --git a/mate-support/mate-admin/pom.xml b/mate-support/mate-admin/pom.xml index 17842709..778568de 100644 --- a/mate-support/mate-admin/pom.xml +++ b/mate-support/mate-admin/pom.xml @@ -42,14 +42,14 @@ org.springframework.cloud spring-cloud-starter-security - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.module - jackson-module-kotlin - + + + + + + + + From c5ae9df6166ec7fcd43d9e759b8af90ab77cecc3 Mon Sep 17 00:00:00 2001 From: matevip <7333791@qq.com> Date: Wed, 7 Oct 2020 17:57:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BC=83=E7=94=A8@EnableToken=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=EF=BC=8C=E5=90=AF=E7=94=A8@PreAuth=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/auth/annotation/EnableToken.java | 1 + .../mate/core/auth/annotation/PreAuth.java | 2 +- .../mate/core/auth/aspect/PreAuthAspect.java | 18 +++++++++-------- .../mate/core/auth/aspect/TokenAspect.java | 1 + .../src/main/resources/logback-spring.xml | 1 + .../controller/SysAttachmentController.java | 9 +++------ .../controller/SysConfigController.java | 12 +++++------ .../controller/SysBlacklistController.java | 13 ++++++------ .../controller/SysClientController.java | 14 ++++++------- .../controller/SysDepartController.java | 14 ++++++------- .../system/controller/SysDictController.java | 17 ++++++++-------- .../system/controller/SysLogController.java | 1 + .../system/controller/SysMenuController.java | 20 +++++++++---------- .../system/controller/SysRoleController.java | 20 +++++++++---------- .../system/controller/SysUserController.java | 18 ++++++++--------- .../code/controller/SysCodeController.java | 6 +++--- .../controller/SysDataSourceController.java | 14 ++++++------- .../resources/templates/controller.java.vm | 10 +++++----- 18 files changed, 94 insertions(+), 97 deletions(-) diff --git a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/annotation/EnableToken.java b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/annotation/EnableToken.java index b3f1a692..fe7b3a47 100644 --- a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/annotation/EnableToken.java +++ b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/annotation/EnableToken.java @@ -7,6 +7,7 @@ * * @author pangu */ +@Deprecated @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/annotation/PreAuth.java b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/annotation/PreAuth.java index 26f027d1..f6ff0a3c 100644 --- a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/annotation/PreAuth.java +++ b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/annotation/PreAuth.java @@ -24,5 +24,5 @@ * 验证用户是否授权 * @return String */ - public String hasPerm() default ""; + String hasPerm() default ""; } diff --git a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/PreAuthAspect.java b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/PreAuthAspect.java index 98c66180..6c0ed43d 100644 --- a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/PreAuthAspect.java +++ b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/PreAuthAspect.java @@ -55,13 +55,11 @@ public Object around(ProceedingJoinPoint point) throws Throwable { return point.proceed(); } - if (!StringUtils.isEmpty(preAuth.hasPerm())) { - if (hasPerm(preAuth.hasPerm())) { - return point.proceed(); - } + if (hasPerm(preAuth.hasPerm())) { + return point.proceed(); + } else { throw new TokenException("权限验证不通过"); } - return point.proceed(); } @@ -78,10 +76,14 @@ public boolean hasPerm(String permission) { return false; } + if (!StringUtils.isEmpty(userInfo) && StringUtils.isEmpty(permission)) { + return true; + } + // 如果用户是超级管理员，则直接跳过权限验证 -// if (userInfo.getAccount().equalsIgnoreCase(Oauth2Constant.SUPER_ADMIN)) { -// return true; -// } + if (userInfo.getAccount().equalsIgnoreCase(Oauth2Constant.SUPER_ADMIN)) { + return true; + } Map data = (Map) redisService.get(Oauth2Constant.MATE_PERMISSION_PREFIX + userInfo.getAccount() + StringPool.DOT + userInfo.getRoleId()); List authorities = (List) data.get("permissions"); diff --git a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/TokenAspect.java b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/TokenAspect.java index 1ae55fc6..1fa8336c 100644 --- a/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/TokenAspect.java +++ b/mate-core/mate-starter-auth/src/main/java/vip/mate/core/auth/aspect/TokenAspect.java @@ -15,6 +15,7 @@ * * @author xuzhanfu */ +@Deprecated @Slf4j @Aspect @Component diff --git a/mate-gateway/src/main/resources/logback-spring.xml b/mate-gateway/src/main/resources/logback-spring.xml index 57c8863c..94db682c 100644 --- a/mate-gateway/src/main/resources/logback-spring.xml +++ b/mate-gateway/src/main/resources/logback-spring.xml @@ -113,6 +113,7 @@ + diff --git a/mate-platform/mate-component/src/main/java/vip/mate/component/controller/SysAttachmentController.java b/mate-platform/mate-component/src/main/java/vip/mate/component/controller/SysAttachmentController.java index f4255ae2..fe4a4b5e 100755 --- a/mate-platform/mate-component/src/main/java/vip/mate/component/controller/SysAttachmentController.java +++ b/mate-platform/mate-component/src/main/java/vip/mate/component/controller/SysAttachmentController.java @@ -8,10 +8,9 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; - import org.springframework.web.multipart.MultipartFile; import vip.mate.component.service.ISysAttachmentService; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.database.entity.Search; import vip.mate.core.log.annotation.Log; @@ -20,8 +19,6 @@ import java.util.Collection; import java.util.Iterator; -import java.util.List; -import java.util.Map; /** *

@@ -45,7 +42,7 @@ public class SysAttachmentController extends BaseController { * @param search　关键词 * @return Result */ - @EnableToken + @PreAuth @Log(value = "附件分页", exception = "附件分页请求异常") @GetMapping("/page") @ApiOperation(value = "附件分页", notes = "附件分页，根据query查询") @@ -77,7 +74,7 @@ public Result upload(@RequestParam("file") MultipartFile file) { * @param ids id多个采用逗号分隔 * @return */ - @EnableToken + @PreAuth @Log(value = "删除文件", exception = "删除文件请求异常") @ApiOperation(value = "删除文件", notes = "删除文件") @ApiImplicitParams({ diff --git a/mate-platform/mate-component/src/main/java/vip/mate/component/controller/SysConfigController.java b/mate-platform/mate-component/src/main/java/vip/mate/component/controller/SysConfigController.java index 975bc23a..35b6370e 100644 --- a/mate-platform/mate-component/src/main/java/vip/mate/component/controller/SysConfigController.java +++ b/mate-platform/mate-component/src/main/java/vip/mate/component/controller/SysConfigController.java @@ -1,13 +1,11 @@ package vip.mate.component.controller; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; - import vip.mate.component.service.ISysConfigService; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.log.annotation.Log; import vip.mate.core.oss.props.OssProperties; @@ -36,7 +34,7 @@ public class SysConfigController extends BaseController { * @param code　代码 * @return Result */ - @EnableToken + @PreAuth @Log(value = "查询OSS配置", exception = "查询OSS配置异常") @GetMapping("/get-config-by-code") @ApiOperation(value = "查询OSS配置", notes = "查询OSS配置") @@ -48,7 +46,7 @@ public Result getConfigByCode(@RequestParam String code) { * 默认配置 * @return Result */ - @EnableToken + @PreAuth @Log(value = "默认配置", exception = "默认配置异常") @ApiOperation(value = "默认配置", notes = "默认配置") @GetMapping("/default-oss") @@ -61,7 +59,7 @@ public Result defaultOss() { * @param code code * @return Result */ - @EnableToken + @PreAuth @Log(value = "保存默认配置", exception = "保存默认配置异常") @ApiOperation(value = "保存默认配置", notes = "保存默认配置") @PostMapping("/save-default-oss") @@ -75,7 +73,7 @@ public Result saveDefaultOss(@RequestParam String code) { * @param code * @return */ - @EnableToken + @PreAuth @Log(value = "保存OSS配置", exception = "保存OSS配置异常") @ApiOperation(value = "保存OSS配置", notes = "保存OSS配置") @PostMapping("/save-config-oss") diff --git a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysBlacklistController.java b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysBlacklistController.java index 439b9972..fee4459c 100644 --- a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysBlacklistController.java +++ b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysBlacklistController.java @@ -10,8 +10,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; - -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.database.entity.Search; import vip.mate.core.log.annotation.Log; @@ -49,7 +48,7 @@ public class SysBlacklistController extends BaseController { * @param search　关键词 * @return Result */ - @EnableToken + @PreAuth @Log(value = "黑名单分页", exception = "黑名单分页请求异常") @GetMapping("/page") @ApiOperation(value = "黑名单分页", notes = "黑名单分页") @@ -69,7 +68,7 @@ public Result page(Page page, Search search) { * @param sysBlacklist SysBlacklist对象 * @return Result */ - @EnableToken + @PreAuth @Log(value = "黑名单设置", exception = "黑名单设置请求异常") @PostMapping("/set") @ApiOperation(value = "黑名单设置", notes = "黑名单设置,支持新增或修改") @@ -98,7 +97,7 @@ public Result set(@Valid @RequestBody SysBlacklist sysBlacklist) { * @param id　id * @return Result */ - @EnableToken + @PreAuth @Log(value = "黑名单信息", exception = "黑名单信息请求异常") @GetMapping("/get") @ApiOperation(value = "黑名单信息", notes = "黑名单信息,根据ID查询") @@ -114,7 +113,7 @@ public Result info(@RequestParam String id) { * @param ids　多个id采用逗号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "黑名单删除", exception = "黑名单删除请求异常") @PostMapping("/del") @ApiOperation(value = "黑名单删除", notes = "黑名单删除") @@ -144,7 +143,7 @@ public Result del(@RequestParam String ids) { * @param status　状态：启用、禁用 * @return Result */ - @EnableToken + @PreAuth @Log(value = "黑名单状态", exception = "黑名单状态请求异常") @PostMapping("/set-status") @ApiOperation(value = "黑名单状态", notes = "黑名单状态,状态包括：启用、禁用") diff --git a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysClientController.java b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysClientController.java index 3559ccf5..17ec14e2 100644 --- a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysClientController.java +++ b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysClientController.java @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.database.entity.Search; import vip.mate.core.file.util.ExcelUtil; @@ -46,7 +46,7 @@ public class SysClientController extends BaseController { * @param search 　关键词 * @return Result */ - @EnableToken + @PreAuth @Log(value = "客户端分页", exception = "客户端分页请求异常") @GetMapping("/page") @ApiOperation(value = "客户端分页", notes = "客户端分页") @@ -67,7 +67,7 @@ public Result page(Page page, Search search) { * @param sysClient SysClient对象 * @return Result */ - @EnableToken + @PreAuth @Log(value = "客户端设置", exception = "客户端设置请求异常") @PostMapping("/set") @ApiOperation(value = "客户端设置", notes = "客户端设置,支持新增或修改") @@ -81,7 +81,7 @@ public Result set(@Valid @RequestBody SysClient sysClient) { * @param id id * @return Result */ - @EnableToken + @PreAuth @Log(value = "客户端信息", exception = "客户端信息请求异常") @GetMapping("/get") @ApiOperation(value = "客户端信息", notes = "客户端信息,根据ID查询") @@ -98,7 +98,7 @@ public Result get(@RequestParam String id) { * @param ids 多个id采用逗号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "客户端删除", exception = "客户端删除请求异常") @PostMapping("/del") @ApiOperation(value = "客户端删除", notes = "客户端删除") @@ -119,7 +119,7 @@ public Result del(@RequestParam String ids) { * @param status 　状态包括启用和禁用 * @return Result */ - @EnableToken + @PreAuth @Log(value = "客户端状态", exception = "客户端状态请求异常") @PostMapping("/set-status") @ApiOperation(value = "客户端状态", notes = "客户端状态：启用、禁用") @@ -134,7 +134,7 @@ public Result setStatus(@RequestParam String ids, @RequestParam String status /** * 客户端导出 */ - @EnableToken + @PreAuth @Log(value = "客户端导出", exception = "客户端导出请求异常") @PostMapping("/export") @ApiOperation(value = "客户端导出", notes = "客户端导出") diff --git a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysDepartController.java b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysDepartController.java index 489f7e9f..86f70939 100644 --- a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysDepartController.java +++ b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysDepartController.java @@ -8,7 +8,7 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.file.util.ExcelUtil; import vip.mate.core.log.annotation.Log; @@ -47,7 +47,7 @@ public class SysDepartController extends BaseController { * @param search 　根据关键字搜索 * @return Result */ - @EnableToken + @PreAuth @Log(value = "部门列表", exception = "部门列表请求异常") @GetMapping("/list") @ApiOperation(value = "部门列表", notes = "部门列表，根据search查询") @@ -65,7 +65,7 @@ public Result list(@ApiIgnore @RequestParam Map search) { * * @return Result */ - @EnableToken + @PreAuth @Log(value = "部门树", exception = "部门树请求异常") @GetMapping("/tree") @ApiOperation(value = "部门树", notes = "部门树") @@ -79,7 +79,7 @@ public Result tree() { * @param sysDepart 　SysDepart对象 * @return Result */ - @EnableToken + @PreAuth @PostMapping("/set") @Log(value = "部门设置", exception = "部门设置异常") @ApiOperation(value = "部门设置", notes = "部门设置,支持新增或修改") @@ -93,7 +93,7 @@ public Result set(@Valid @RequestBody SysDepart sysDepart) { * @param id id * @return Result */ - @EnableToken + @PreAuth @GetMapping("/get") @Log(value = "部门信息", exception = "部门信息息请求异常") @ApiOperation(value = "部门信息", notes = "部门信息,根据ID查询") @@ -112,7 +112,7 @@ public Result get(@RequestParam String id) { * @param ids 　多个id采用逗号分隔 * @return Result */ - @EnableToken + @PreAuth @PostMapping("/del") @Log(value = "部门删除", exception = "部门删除请求异常") @ApiOperation(value = "部门删除", notes = "部门删除") @@ -126,7 +126,7 @@ public Result del(@RequestParam String ids) { /** * 部门导出 */ - @EnableToken + @PreAuth @PostMapping("/export") @Log(value = "部门导出", exception = "部门导出请求异常") @ApiOperation(value = "部门导出", notes = "部门导出") diff --git a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysDictController.java b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysDictController.java index 5c59ae18..d1603635 100644 --- a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysDictController.java +++ b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysDictController.java @@ -10,13 +10,12 @@ import lombok.AllArgsConstructor; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.database.entity.Search; import vip.mate.core.log.annotation.Log; import vip.mate.core.web.controller.BaseController; import vip.mate.core.web.util.CollectionUtil; -import vip.mate.system.entity.SysClient; import vip.mate.system.entity.SysDict; import vip.mate.system.service.ISysDictService; @@ -45,7 +44,7 @@ public class SysDictController extends BaseController { * @param code 　code * @return Result */ - @EnableToken + @PreAuth @Log(value = "字典列表code查询", exception = "字典列表请求异常") @GetMapping("/list-code") @ApiOperation(value = "字典列表code查询", notes = "字典列表code查询") @@ -60,7 +59,7 @@ public Result listCode(String code) { * @param dictKey key * @return Result */ - @EnableToken + @PreAuth @Log(value = "字典列表key查询", exception = "字典列表key查询请求异常") @GetMapping("/get-dict-value") @ApiOperation(value = "字典列表key查询", notes = "字典列表key查询") @@ -76,7 +75,7 @@ public Result getDictValue(String code, String dictKey) { * @param search 　搜索关键词 * @return Result */ - @EnableToken + @PreAuth @Log(value = "字典分页", exception = "字典分页请求异常") @GetMapping("/page") @ApiOperation(value = "字典分页", notes = "字典分页") @@ -97,7 +96,7 @@ public Result page(Page page, Search search) { * @param code 字典码 * @return Result> */ - @EnableToken + @PreAuth @Log(value = "字典项列表", exception = "字典项列表异常") @GetMapping("list-value") @ApiOperation(value = "字典项列表", notes = "字典项列表") @@ -114,7 +113,7 @@ public Result listValue(@RequestParam String code) { * @param sysDict SysDict对象 * @return Result */ - @EnableToken + @PreAuth @Log(value = "字典设置", exception = "字典设置请求异常") @PostMapping("/set") @ApiOperation(value = "字典设置", notes = "字典设置,支持新增或修改") @@ -128,7 +127,7 @@ public Result set(@Valid @RequestBody SysDict sysDict) { * @param id id * @return Result */ - @EnableToken + @PreAuth @Log(value = "字典信息", exception = "字典信息请求异常") @GetMapping("/get") @ApiOperation(value = "字典信息", notes = "根据ID查询") @@ -145,7 +144,7 @@ public Result get(@RequestParam String id) { * @param ids 多个id采用逗号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "字典删除", exception = "字典删除请求异常") @PostMapping("/del") @ApiOperation(value = "字典删除", notes = "字典删除") diff --git a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysLogController.java b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysLogController.java index 6be81a7e..612aa2b7 100644 --- a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysLogController.java +++ b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysLogController.java @@ -39,6 +39,7 @@ public class SysLogController extends BaseController { * @param search　搜索关键词 * @return Result */ + @PreAuth @Log(value = "日志列表", exception = "日志列表请求异常") @GetMapping("/page") @ApiOperation(value = "日志列表", notes = "日志列表") diff --git a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysMenuController.java b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysMenuController.java index 70cf9c73..99a58b38 100644 --- a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysMenuController.java +++ b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysMenuController.java @@ -11,16 +11,16 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.common.constant.MateConstant; import vip.mate.core.common.entity.LoginUser; +import vip.mate.core.file.util.ExcelUtil; import vip.mate.core.log.annotation.Log; import vip.mate.core.web.annotation.EnableUser; import vip.mate.core.web.controller.BaseController; import vip.mate.core.web.tree.ForestNodeMerger; import vip.mate.core.web.util.CollectionUtil; -import vip.mate.core.file.util.ExcelUtil; import vip.mate.system.dto.SysMenuDTO; import vip.mate.system.entity.SysMenu; import vip.mate.system.poi.SysMenuPOI; @@ -55,7 +55,7 @@ public class SysMenuController extends BaseController { * * @return Result */ - @EnableToken + @PreAuth @Log(value = "菜单树", exception = "菜单树请求异常") @GetMapping("/tree") @ApiOperation(value = "菜单树", notes = "根据roleId查询菜单树") @@ -72,7 +72,7 @@ public Result tree(@ApiIgnore @EnableUser LoginUser user) { * @param search 搜索关键词 * @return Result */ - @EnableToken + @PreAuth @Log(value = "菜单列表", exception = "菜单列表请求异常") @GetMapping("/list") @ApiOperation(value = "菜单列表", notes = "菜单列表，根据关键词查询") @@ -90,7 +90,7 @@ public Result list(@ApiIgnore @RequestParam Map search) { * * @return Result */ - @EnableToken + @PreAuth @Log(value = "菜单分级列表", exception = "菜单分级列表请求异常") @GetMapping("/grade") @ApiOperation(value = "菜单分级列表", notes = "菜单分级列表") @@ -113,7 +113,7 @@ public Result grade() { * @param sysMenu 菜单 * @return Result */ - @EnableToken + @PreAuth @Log(value = "菜单设置", exception = "菜单设置请求异常") @PostMapping("/set") @ApiOperation(value = "菜单设置", notes = "菜单设置,支持新增或修改") @@ -127,7 +127,7 @@ public Result set(@Valid @RequestBody SysMenu sysMenu) { * @param id id * @return Result */ - @EnableToken + @PreAuth @Log(value = "菜单信息", exception = "菜单信息请求异常") @GetMapping("/get") @ApiOperation(value = "菜单信息", notes = "根据ID查询") @@ -146,7 +146,7 @@ public Result get(@RequestParam String id) { * @param ids 多个Id，用,号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "菜单删除", exception = "菜单删除请求异常") @PostMapping("/del") @ApiOperation(value = "菜单删除", notes = "菜单删除") @@ -164,7 +164,7 @@ public Result del(@RequestParam String ids) { * @param status 状态：启用、禁用 * @return Result */ - @EnableToken + @PreAuth @Log(value = "菜单状态", exception = "菜单状态请求异常") @PostMapping("/set-status") @ApiOperation(value = "菜单状态", notes = "状态包括：启用、禁用") @@ -179,7 +179,7 @@ public Result setStatus(@RequestParam String ids, @RequestParam String status /** * 菜单导出 */ - @EnableToken + @PreAuth @Log(value = "菜单导出", exception = "菜单导出请求异常") @PostMapping("/export") @ApiOperation(value = "菜单导出", notes = "菜单导出") diff --git a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysRoleController.java b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysRoleController.java index 7fb1cb25..5391d859 100644 --- a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysRoleController.java +++ b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysRoleController.java @@ -9,12 +9,12 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; +import vip.mate.core.file.util.ExcelUtil; import vip.mate.core.log.annotation.Log; import vip.mate.core.web.controller.BaseController; import vip.mate.core.web.util.CollectionUtil; -import vip.mate.core.file.util.ExcelUtil; import vip.mate.system.entity.SysRole; import vip.mate.system.entity.SysRolePermission; import vip.mate.system.poi.SysRolePOI; @@ -51,7 +51,7 @@ public class SysRoleController extends BaseController { * @param query 　关键词查询 * @return Result */ - @EnableToken + @PreAuth @Log(value = "角色列表", exception = "角色列表请求异常") @GetMapping("/list") @ApiOperation(value = "角色列表", notes = "角色列表，根据query查询") @@ -70,7 +70,7 @@ public Result list(@RequestParam Map query) { * @param sysRole SysRole对象 * @return Result */ - @EnableToken + @PreAuth @Log(value = "角色设置", exception = "角色设置请求异常") @PostMapping("/set") @ApiOperation(value = "角色设置", notes = "角色设置,支持新增或修改") @@ -84,7 +84,7 @@ public Result set(@Valid @RequestBody SysRole sysRole) { * @param id id * @return Result */ - @EnableToken + @PreAuth @Log(value = "角色信息", exception = "角色信息请求异常") @GetMapping("/get") @ApiOperation(value = "角色信息", notes = "根据ID查询") @@ -103,7 +103,7 @@ public Result get(@RequestParam String id) { * @param ids 多个id使用逗号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "角色删除", exception = "角色删除请求异常") @PostMapping("/delete") @ApiOperation(value = "角色删除", notes = "角色删除，支持批量操作") @@ -120,7 +120,7 @@ public Result delete(@RequestParam String ids) { * @param id id * @return Result */ - @EnableToken + @PreAuth @Log(value = "角色权限列表", exception = "角色权限列表请求异常") @GetMapping("/get-permission") @ApiOperation(value = "角色权限列表", notes = "角色权限列表") @@ -135,7 +135,7 @@ public Result getPermission(@RequestParam String id) { * @param ids 多个id使用逗号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "角色权限设置", exception = "角色权限设置") @PostMapping("/set-permission") @ApiOperation(value = "角色权限设置", notes = "角色权限设置") @@ -164,7 +164,7 @@ public Result savePermission(@RequestParam String roleId, @RequestParam Strin * * @return Result */ - @EnableToken + @PreAuth @Log(value = "角色树", exception = "角色树请求异常") @GetMapping("/tree") @ApiOperation(value = "角色树", notes = "角色树") @@ -175,7 +175,7 @@ public Result tree() { /** * 角色导出 */ - @EnableToken + @PreAuth @Log(value = "导出角色", exception = "导出角色") @PostMapping("/export") @ApiOperation(value = "导出角色", notes = "导出角色") diff --git a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysUserController.java b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysUserController.java index 20b550c3..371d53d2 100644 --- a/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysUserController.java +++ b/mate-platform/mate-system/src/main/java/vip/mate/system/controller/SysUserController.java @@ -10,14 +10,14 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.cloud.util.CryptoUtil; import vip.mate.core.common.api.Result; import vip.mate.core.database.entity.Search; +import vip.mate.core.file.util.ExcelUtil; import vip.mate.core.log.annotation.Log; import vip.mate.core.web.controller.BaseController; import vip.mate.core.web.util.CollectionUtil; -import vip.mate.core.file.util.ExcelUtil; import vip.mate.system.entity.SysUser; import vip.mate.system.poi.SysUserPOI; import vip.mate.system.service.ISysUserService; @@ -52,7 +52,7 @@ public class SysUserController extends BaseController { * @param search 　搜索关键词 * @return Result */ - @EnableToken + @PreAuth @Log(value = "用户列表", exception = "用户列表请求异常") @GetMapping("/page") @ApiOperation(value = "用户列表", notes = "分页查询") @@ -75,7 +75,7 @@ public Result page(Page page, Search search) { * @param sysUser 用户信息 * @return Result */ - @EnableToken + @PreAuth @Log(value = "用户设置", exception = "设置用户请求异常") @PostMapping("/set") @ApiOperation(value = "设置用户", notes = "新增或修改用户") @@ -94,7 +94,7 @@ public Result set(@Valid @RequestBody SysUser sysUser) { * @param id Id信息 * @return Result */ - @EnableToken + @PreAuth @Log(value = "用户信息", exception = "用户信息请求异常") @GetMapping("/get") @ApiOperation(value = "用户信息", notes = "根据ID查询") @@ -111,7 +111,7 @@ public Result get(@RequestParam String id) { * @param ids id字符串，根据,号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "用户删除", exception = "用户删除请求异常") @PostMapping("/del") @ApiOperation(value = "用户删除", notes = "用户删除") @@ -129,7 +129,7 @@ public Result del(@RequestParam String ids) { * @param status 状态标识，启用或禁用 * @return Result */ - @EnableToken + @PreAuth @Log(value = "用户状态", exception = "用户状态请求异常") @PostMapping("/set-status") @ApiOperation(value = "用户状态", notes = "状态包括：启用、禁用") @@ -148,7 +148,7 @@ public Result setStatus(@RequestParam String ids, @RequestParam String status * @param password 密码 * @return Result */ - @EnableToken + @PreAuth @Log(value = "用户密码设置", exception = "用户密码设置请求异常") @PostMapping("/set-password") @ApiOperation(value = "用户密码设置", notes = "用户密码设置") @@ -170,7 +170,7 @@ public Result setPassword(@RequestParam String id, @RequestParam String passw /** * 用户信息导出 */ - @EnableToken + @PreAuth @Log(value = "用户导出", exception = "导出用户请求异常") @PostMapping("/export") @ApiOperation(value = "导出用户", notes = "导出用户") diff --git a/mate-support/mate-code/src/main/java/vip/mate/code/controller/SysCodeController.java b/mate-support/mate-code/src/main/java/vip/mate/code/controller/SysCodeController.java index 0aadd7d1..9fbdc829 100644 --- a/mate-support/mate-code/src/main/java/vip/mate/code/controller/SysCodeController.java +++ b/mate-support/mate-code/src/main/java/vip/mate/code/controller/SysCodeController.java @@ -33,7 +33,7 @@ import vip.mate.code.service.ISysDataSourceService; import vip.mate.code.util.GeneratorUtil; import vip.mate.code.util.ZipUtil; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.log.annotation.Log; import vip.mate.core.web.util.FileUtil; @@ -63,7 +63,7 @@ public class SysCodeController { * @param dataSourceId 数据源Id * @return Result */ - @EnableToken + @PreAuth @Log(value = "数据库表信息", exception = "数据库表信息请求异常") @ApiOperation(value = "数据库表信息", notes = "数据库表信息") @PostMapping("/table-list") @@ -94,7 +94,7 @@ public Result> tableList(@RequestParam String dataSourceId) { * @param datasourceId　数据源名 * @param tableName　表名 */ - @EnableToken + @PreAuth @Log(value = "代码生成", exception = "代码生成请求异常") @ApiOperation(value = "代码生成", notes = "代码生成") @PostMapping("/generator-code") diff --git a/mate-support/mate-code/src/main/java/vip/mate/code/controller/SysDataSourceController.java b/mate-support/mate-code/src/main/java/vip/mate/code/controller/SysDataSourceController.java index 620de24f..bc4b47d9 100644 --- a/mate-support/mate-code/src/main/java/vip/mate/code/controller/SysDataSourceController.java +++ b/mate-support/mate-code/src/main/java/vip/mate/code/controller/SysDataSourceController.java @@ -9,15 +9,13 @@ import org.springframework.web.bind.annotation.*; import vip.mate.code.entity.SysDataSource; import vip.mate.code.service.ISysDataSourceService; -import vip.mate.code.vo.SysDataSourceVO; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.log.annotation.Log; import vip.mate.core.web.controller.BaseController; import vip.mate.core.web.util.CollectionUtil; import javax.validation.Valid; -import java.util.List; import java.util.Map; /** @@ -41,7 +39,7 @@ public class SysDataSourceController extends BaseController { * @param query　关键词 * @return Result */ - @EnableToken + @PreAuth @Log(value = "数据源分页", exception = "数据源分页请求异常") @GetMapping("/page") @ApiOperation(value = "数据源分页", notes = "数据源分页") @@ -61,7 +59,7 @@ public Result page(@RequestParam Map query) { * @param id id * @return Result */ - @EnableToken + @PreAuth @Log(value = "数据源信息", exception = "数据源信息请求异常") @GetMapping("/get") @ApiOperation(value = "数据源信息", notes = "数据源信息,根据ID查询") @@ -77,7 +75,7 @@ public Result get(@RequestParam String id) { * @param sysDataSource　SysDataSource对象 * @return Result */ - @EnableToken + @PreAuth @Log(value = "数据源设置", exception = "数据源设置请求异常") @PostMapping("/set") @ApiOperation(value = "数据源设置", notes = "数据源设置,支持新增或修改") @@ -90,7 +88,7 @@ public Result set(@Valid @RequestBody SysDataSource sysDataSource) { * @param ids　多个id采用逗号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "数据源删除", exception = "数据源删除请求异常") @PostMapping("/del") @ApiOperation(value = "数据源删除", notes = "数据源删除") @@ -105,7 +103,7 @@ public Result del(@RequestParam String ids) { * 数据源项列表 * @return Result */ - @EnableToken + @PreAuth @Log(value = "数据源项列表", exception = "数据源项列表请求异常") @GetMapping("/option-list") @ApiOperation(value = "数据源项列表", notes = "数据源项列表") diff --git a/mate-support/mate-code/src/main/resources/templates/controller.java.vm b/mate-support/mate-code/src/main/resources/templates/controller.java.vm index ff5e6b7f..2868d389 100644 --- a/mate-support/mate-code/src/main/resources/templates/controller.java.vm +++ b/mate-support/mate-code/src/main/resources/templates/controller.java.vm @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; -import vip.mate.core.auth.annotation.EnableToken; +import vip.mate.core.auth.annotation.PreAuth; import vip.mate.core.common.api.Result; import vip.mate.core.database.entity.Search; import vip.mate.core.log.annotation.Log; @@ -76,7 +76,7 @@ public class ${table.controllerName} { * @param search 　搜索关键词 * @return Result */ - @EnableToken + @PreAuth @Log(value = "$!{table.comment}列表", exception = "$!{table.comment}列表请求异常") @GetMapping("/page") @ApiOperation(value = "$!{table.comment}列表", notes = "分页查询") @@ -97,7 +97,7 @@ public class ${table.controllerName} { * @param id Id * @return Result */ - @EnableToken + @PreAuth @Log(value = "$!{table.comment}信息", exception = "$!{table.comment}信息请求异常") @GetMapping("/get") @ApiOperation(value = "$!{table.comment}信息", notes = "根据ID查询") @@ -114,7 +114,7 @@ public class ${table.controllerName} { * @param $!{table.entityPath} $!{entity} 对象 * @return Result */ - @EnableToken + @PreAuth @Log(value = "$!{table.comment}设置", exception = "$!{table.comment}设置请求异常") @PostMapping("/set") @ApiOperation(value = "$!{table.comment}设置", notes = "$!{table.comment}设置,支持新增或修改") @@ -128,7 +128,7 @@ public class ${table.controllerName} { * @param ids id字符串，根据,号分隔 * @return Result */ - @EnableToken + @PreAuth @Log(value = "$!{table.comment}删除", exception = "$!{table.comment}删除请求异常") @PostMapping("/del") @ApiOperation(value = "$!{table.comment}删除", notes = "$!{table.comment}删除") From f8c74427680a157a4ca0489f449541d0775c19b3 Mon Sep 17 00:00:00 2001 From: matevip <7333791@qq.com> Date: Wed, 7 Oct 2020 18:12:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7druid=E8=87=B31.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mate-core/mate-starter-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mate-core/mate-starter-dependencies/pom.xml b/mate-core/mate-starter-dependencies/pom.xml index ea127c96..551ed751 100644 --- a/mate-core/mate-starter-dependencies/pom.xml +++ b/mate-core/mate-starter-dependencies/pom.xml @@ -35,7 +35,7 @@ 8.0.17 12.2.0.1 42.2.6 - 1.1.24 + 1.2.1 3.4.0 1.7 From e587210409ddc81cad935a36549ff8b358a0f90a Mon Sep 17 00:00:00 2001 From: matevip <7333791@qq.com> Date: Wed, 7 Oct 2020 18:20:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=91=E5=B8=831.2.8=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mate-core/mate-starter-auth/pom.xml | 2 +- mate-core/mate-starter-cloud/pom.xml | 2 +- mate-core/mate-starter-common/pom.xml | 2 +- .../main/java/vip/mate/core/common/constant/MateConstant.java | 2 +- mate-core/mate-starter-database/pom.xml | 2 +- mate-core/mate-starter-dependencies/pom.xml | 4 ++-- mate-core/mate-starter-dozer/pom.xml | 2 +- mate-core/mate-starter-dubbo/pom.xml | 2 +- mate-core/mate-starter-elasticsearch/pom.xml | 2 +- mate-core/mate-starter-feign/pom.xml | 2 +- mate-core/mate-starter-file/pom.xml | 2 +- mate-core/mate-starter-gray/pom.xml | 2 +- mate-core/mate-starter-jetcache/pom.xml | 2 +- mate-core/mate-starter-job/pom.xml | 2 +- mate-core/mate-starter-kafka/pom.xml | 2 +- mate-core/mate-starter-log/pom.xml | 2 +- mate-core/mate-starter-mail/pom.xml | 2 +- mate-core/mate-starter-oss/pom.xml | 2 +- mate-core/mate-starter-prometheus/pom.xml | 2 +- mate-core/mate-starter-redis/pom.xml | 2 +- mate-core/mate-starter-retrofit/pom.xml | 2 +- mate-core/mate-starter-rocketmq/pom.xml | 2 +- mate-core/mate-starter-rule/pom.xml | 2 +- mate-core/mate-starter-seata/pom.xml | 2 +- mate-core/mate-starter-security/pom.xml | 2 +- mate-core/mate-starter-sentinel/pom.xml | 2 +- mate-core/mate-starter-sharding/pom.xml | 2 +- mate-core/mate-starter-sms/pom.xml | 2 +- mate-core/mate-starter-strategy/pom.xml | 2 +- mate-core/mate-starter-web/pom.xml | 2 +- mate-core/pom.xml | 4 ++-- mate-gateway/pom.xml | 2 +- mate-mq/mate-log-producer/pom.xml | 2 +- mate-mq/mate-message-consumer/pom.xml | 2 +- mate-mq/mate-message-producer/pom.xml | 2 +- mate-mq/pom.xml | 2 +- mate-platform/mate-component-api/pom.xml | 2 +- mate-platform/mate-component/pom.xml | 2 +- mate-platform/mate-system-api/pom.xml | 2 +- mate-platform/mate-system/pom.xml | 2 +- mate-platform/pom.xml | 2 +- mate-support/mate-admin/pom.xml | 2 +- mate-support/mate-code/pom.xml | 2 +- mate-support/mate-job-admin/pom.xml | 2 +- mate-support/mate-job/pom.xml | 2 +- mate-support/pom.xml | 2 +- mate-uaa/pom.xml | 2 +- pom.xml | 4 ++-- 48 files changed, 51 insertions(+), 51 deletions(-) diff --git a/mate-core/mate-starter-auth/pom.xml b/mate-core/mate-starter-auth/pom.xml index c6428122..cd2c66cb 100644 --- a/mate-core/mate-starter-auth/pom.xml +++ b/mate-core/mate-starter-auth/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-cloud/pom.xml b/mate-core/mate-starter-cloud/pom.xml index 10c29f06..113f0b7d 100644 --- a/mate-core/mate-starter-cloud/pom.xml +++ b/mate-core/mate-starter-cloud/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-common/pom.xml b/mate-core/mate-starter-common/pom.xml index 4c7daeeb..a503df7c 100644 --- a/mate-core/mate-starter-common/pom.xml +++ b/mate-core/mate-starter-common/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-common/src/main/java/vip/mate/core/common/constant/MateConstant.java b/mate-core/mate-starter-common/src/main/java/vip/mate/core/common/constant/MateConstant.java index a206f3c3..1ea922be 100644 --- a/mate-core/mate-starter-common/src/main/java/vip/mate/core/common/constant/MateConstant.java +++ b/mate-core/mate-starter-common/src/main/java/vip/mate/core/common/constant/MateConstant.java @@ -8,7 +8,7 @@ public class MateConstant { /** * 应用版本号 */ - public static final String MATE_APP_VERSION = "1.2.8-SNAPSHOT"; + public static final String MATE_APP_VERSION = "1.2.8"; /** * Spring 应用名 prop key diff --git a/mate-core/mate-starter-database/pom.xml b/mate-core/mate-starter-database/pom.xml index 0af457b5..fe534303 100644 --- a/mate-core/mate-starter-database/pom.xml +++ b/mate-core/mate-starter-database/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-dependencies/pom.xml b/mate-core/mate-starter-dependencies/pom.xml index 551ed751..724e5d39 100644 --- a/mate-core/mate-starter-dependencies/pom.xml +++ b/mate-core/mate-starter-dependencies/pom.xml @@ -12,12 +12,12 @@ vip.mate mate-starter-dependencies - 1.2.8-SNAPSHOT + 1.2.8 pom MateCloud统一版本依赖 - 1.2.8-SNAPSHOT + 1.2.8 UTF-8 2.3.4.RELEASE diff --git a/mate-core/mate-starter-dozer/pom.xml b/mate-core/mate-starter-dozer/pom.xml index 62b1c5ef..6770458c 100644 --- a/mate-core/mate-starter-dozer/pom.xml +++ b/mate-core/mate-starter-dozer/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-dubbo/pom.xml b/mate-core/mate-starter-dubbo/pom.xml index e6877da6..9029112c 100644 --- a/mate-core/mate-starter-dubbo/pom.xml +++ b/mate-core/mate-starter-dubbo/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-elasticsearch/pom.xml b/mate-core/mate-starter-elasticsearch/pom.xml index 466e961d..bf3e3fe7 100644 --- a/mate-core/mate-starter-elasticsearch/pom.xml +++ b/mate-core/mate-starter-elasticsearch/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-feign/pom.xml b/mate-core/mate-starter-feign/pom.xml index 400c549a..0a85f4a9 100644 --- a/mate-core/mate-starter-feign/pom.xml +++ b/mate-core/mate-starter-feign/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-file/pom.xml b/mate-core/mate-starter-file/pom.xml index 0d526b9c..e884e4ca 100644 --- a/mate-core/mate-starter-file/pom.xml +++ b/mate-core/mate-starter-file/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-gray/pom.xml b/mate-core/mate-starter-gray/pom.xml index 84134fc2..1e2ed667 100644 --- a/mate-core/mate-starter-gray/pom.xml +++ b/mate-core/mate-starter-gray/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-jetcache/pom.xml b/mate-core/mate-starter-jetcache/pom.xml index 45fef5af..5047e1c5 100644 --- a/mate-core/mate-starter-jetcache/pom.xml +++ b/mate-core/mate-starter-jetcache/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-job/pom.xml b/mate-core/mate-starter-job/pom.xml index ca306ae8..179b6969 100644 --- a/mate-core/mate-starter-job/pom.xml +++ b/mate-core/mate-starter-job/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 jar diff --git a/mate-core/mate-starter-kafka/pom.xml b/mate-core/mate-starter-kafka/pom.xml index d0df3564..9bfb191f 100644 --- a/mate-core/mate-starter-kafka/pom.xml +++ b/mate-core/mate-starter-kafka/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-log/pom.xml b/mate-core/mate-starter-log/pom.xml index c767773c..3f924bee 100644 --- a/mate-core/mate-starter-log/pom.xml +++ b/mate-core/mate-starter-log/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-mail/pom.xml b/mate-core/mate-starter-mail/pom.xml index 6fdcecf2..05f0cf29 100644 --- a/mate-core/mate-starter-mail/pom.xml +++ b/mate-core/mate-starter-mail/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-oss/pom.xml b/mate-core/mate-starter-oss/pom.xml index 40a98741..fbe403c1 100644 --- a/mate-core/mate-starter-oss/pom.xml +++ b/mate-core/mate-starter-oss/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-prometheus/pom.xml b/mate-core/mate-starter-prometheus/pom.xml index 1f5858cd..e24426d0 100644 --- a/mate-core/mate-starter-prometheus/pom.xml +++ b/mate-core/mate-starter-prometheus/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-redis/pom.xml b/mate-core/mate-starter-redis/pom.xml index 0dfd6b5e..6b1a6f55 100644 --- a/mate-core/mate-starter-redis/pom.xml +++ b/mate-core/mate-starter-redis/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-retrofit/pom.xml b/mate-core/mate-starter-retrofit/pom.xml index 246438e0..b107fd0d 100644 --- a/mate-core/mate-starter-retrofit/pom.xml +++ b/mate-core/mate-starter-retrofit/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-rocketmq/pom.xml b/mate-core/mate-starter-rocketmq/pom.xml index 2aba2c9d..f9768e17 100644 --- a/mate-core/mate-starter-rocketmq/pom.xml +++ b/mate-core/mate-starter-rocketmq/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-rule/pom.xml b/mate-core/mate-starter-rule/pom.xml index fe2a4f52..00cc79ce 100644 --- a/mate-core/mate-starter-rule/pom.xml +++ b/mate-core/mate-starter-rule/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-seata/pom.xml b/mate-core/mate-starter-seata/pom.xml index f4a5301c..2ecf340c 100644 --- a/mate-core/mate-starter-seata/pom.xml +++ b/mate-core/mate-starter-seata/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-security/pom.xml b/mate-core/mate-starter-security/pom.xml index c0759390..798835dc 100644 --- a/mate-core/mate-starter-security/pom.xml +++ b/mate-core/mate-starter-security/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-sentinel/pom.xml b/mate-core/mate-starter-sentinel/pom.xml index 7848046b..120b0b7c 100644 --- a/mate-core/mate-starter-sentinel/pom.xml +++ b/mate-core/mate-starter-sentinel/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-sharding/pom.xml b/mate-core/mate-starter-sharding/pom.xml index e0c43d75..6e19ebaa 100644 --- a/mate-core/mate-starter-sharding/pom.xml +++ b/mate-core/mate-starter-sharding/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-sms/pom.xml b/mate-core/mate-starter-sms/pom.xml index beaf2112..74c49fb5 100644 --- a/mate-core/mate-starter-sms/pom.xml +++ b/mate-core/mate-starter-sms/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-strategy/pom.xml b/mate-core/mate-starter-strategy/pom.xml index e9740c2c..3e7ef171 100644 --- a/mate-core/mate-starter-strategy/pom.xml +++ b/mate-core/mate-starter-strategy/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/mate-starter-web/pom.xml b/mate-core/mate-starter-web/pom.xml index 46141dc2..d8c21fda 100644 --- a/mate-core/mate-starter-web/pom.xml +++ b/mate-core/mate-starter-web/pom.xml @@ -5,7 +5,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-core/pom.xml b/mate-core/pom.xml index 2401c113..3afbba96 100644 --- a/mate-core/pom.xml +++ b/mate-core/pom.xml @@ -6,7 +6,7 @@ mate-core vip.mate - 1.2.8-SNAPSHOT + 1.2.8 pom @@ -42,7 +42,7 @@ - 1.2.8-SNAPSHOT + 1.2.8 2.9.2 1.5.21 1.9.4 diff --git a/mate-gateway/pom.xml b/mate-gateway/pom.xml index 234e5679..2b040f39 100644 --- a/mate-gateway/pom.xml +++ b/mate-gateway/pom.xml @@ -5,7 +5,7 @@ matecloud vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-mq/mate-log-producer/pom.xml b/mate-mq/mate-log-producer/pom.xml index 260e3615..6c490217 100644 --- a/mate-mq/mate-log-producer/pom.xml +++ b/mate-mq/mate-log-producer/pom.xml @@ -5,7 +5,7 @@ mate-mq vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-mq/mate-message-consumer/pom.xml b/mate-mq/mate-message-consumer/pom.xml index c0f645ee..2b0e9d89 100644 --- a/mate-mq/mate-message-consumer/pom.xml +++ b/mate-mq/mate-message-consumer/pom.xml @@ -5,7 +5,7 @@ mate-mq vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-mq/mate-message-producer/pom.xml b/mate-mq/mate-message-producer/pom.xml index 2f318930..7fb5eb0b 100644 --- a/mate-mq/mate-message-producer/pom.xml +++ b/mate-mq/mate-message-producer/pom.xml @@ -5,7 +5,7 @@ mate-mq vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-mq/pom.xml b/mate-mq/pom.xml index 6c58e9df..7ab69718 100644 --- a/mate-mq/pom.xml +++ b/mate-mq/pom.xml @@ -5,7 +5,7 @@ matecloud vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-platform/mate-component-api/pom.xml b/mate-platform/mate-component-api/pom.xml index a987c832..c45a1106 100644 --- a/mate-platform/mate-component-api/pom.xml +++ b/mate-platform/mate-component-api/pom.xml @@ -5,7 +5,7 @@ mate-platform vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-platform/mate-component/pom.xml b/mate-platform/mate-component/pom.xml index 2451ef05..b5d7c533 100644 --- a/mate-platform/mate-component/pom.xml +++ b/mate-platform/mate-component/pom.xml @@ -5,7 +5,7 @@ mate-platform vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-platform/mate-system-api/pom.xml b/mate-platform/mate-system-api/pom.xml index f6da0e53..a79a92a1 100644 --- a/mate-platform/mate-system-api/pom.xml +++ b/mate-platform/mate-system-api/pom.xml @@ -5,7 +5,7 @@ mate-platform vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-platform/mate-system/pom.xml b/mate-platform/mate-system/pom.xml index b4616ef1..09a04077 100644 --- a/mate-platform/mate-system/pom.xml +++ b/mate-platform/mate-system/pom.xml @@ -5,7 +5,7 @@ mate-platform vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-platform/pom.xml b/mate-platform/pom.xml index 3d4d0e83..8dfe8396 100644 --- a/mate-platform/pom.xml +++ b/mate-platform/pom.xml @@ -5,7 +5,7 @@ matecloud vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-support/mate-admin/pom.xml b/mate-support/mate-admin/pom.xml index 778568de..c1be8da1 100644 --- a/mate-support/mate-admin/pom.xml +++ b/mate-support/mate-admin/pom.xml @@ -5,7 +5,7 @@ mate-support vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-support/mate-code/pom.xml b/mate-support/mate-code/pom.xml index e929f22d..b325cd7d 100644 --- a/mate-support/mate-code/pom.xml +++ b/mate-support/mate-code/pom.xml @@ -5,7 +5,7 @@ mate-support vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-support/mate-job-admin/pom.xml b/mate-support/mate-job-admin/pom.xml index 2118a7c8..79ffe4d7 100644 --- a/mate-support/mate-job-admin/pom.xml +++ b/mate-support/mate-job-admin/pom.xml @@ -5,7 +5,7 @@ mate-support vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-support/mate-job/pom.xml b/mate-support/mate-job/pom.xml index 3dedceaa..aaae0fc0 100644 --- a/mate-support/mate-job/pom.xml +++ b/mate-support/mate-job/pom.xml @@ -5,7 +5,7 @@ mate-support vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-support/pom.xml b/mate-support/pom.xml index 3618bbaa..7a886403 100644 --- a/mate-support/pom.xml +++ b/mate-support/pom.xml @@ -5,7 +5,7 @@ matecloud vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/mate-uaa/pom.xml b/mate-uaa/pom.xml index 7020b79b..ea755786 100644 --- a/mate-uaa/pom.xml +++ b/mate-uaa/pom.xml @@ -5,7 +5,7 @@ matecloud vip.mate - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 diff --git a/pom.xml b/pom.xml index a20c94ed..4e134a43 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ vip.mate matecloud pom - 1.2.8-SNAPSHOT + 1.2.8 matecloud Mate Cloud - 基于Spring Cloud Alibaba实现的微服务架构 @@ -23,7 +23,7 @@ - 1.2.8-SNAPSHOT + 1.2.8 1.8 3.8.1 UTF-8