Merge branch 'dev'

ssssssss-team · May 10, 2023 · b316c7f · b316c7f
2 parents 20e31ae + d05b7da
commit b316c7f
Show file tree

Hide file tree

Showing 42 changed files with 161 additions and 110 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ magic-api 是一个基于Java的接口快速开发框架，编写接口将通过
 <dependency>
 	<groupId>org.ssssssss</groupId>
     <artifactId>magic-api-spring-boot-starter</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
 </dependency>
 ```
 ## 修改application.properties

diff --git a/magic-api-plugins/magic-api-plugin-cluster/pom.xml b/magic-api-plugins/magic-api-plugin-cluster/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-cluster</artifactId>
     <packaging>jar</packaging>

diff --git a/...plugin-cluster/src/main/java/org/ssssssss/magicapi/cluster/MagicClusterConfiguration.java b/...plugin-cluster/src/main/java/org/ssssssss/magicapi/cluster/MagicClusterConfiguration.java
@@ -2,15 +2,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.listener.ChannelTopic;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.ssssssss.magicapi.core.config.MagicAPIProperties;
@@ -19,9 +15,10 @@
 import org.ssssssss.magicapi.core.model.Plugin;
 import org.ssssssss.magicapi.core.service.MagicAPIService;
 import org.ssssssss.magicapi.core.service.MagicNotifyService;
+import org.ssssssss.magicapi.redis.RedisModule;
 import org.ssssssss.magicapi.utils.JsonUtils;
 
-import java.util.Objects;
+import java.util.Arrays;
 
 
 @EnableConfigurationProperties(ClusterConfig.class)
@@ -32,14 +29,11 @@ public class MagicClusterConfiguration implements MagicPluginConfiguration {
 
 	private final MagicAPIProperties properties;
 
-	private final StringRedisTemplate stringRedisTemplate;
-
 	private final Logger logger = LoggerFactory.getLogger(MagicClusterConfiguration.class);
 
-	public MagicClusterConfiguration(MagicAPIProperties properties, ClusterConfig config, ObjectProvider<StringRedisTemplate> stringRedisTemplateProvider) {
+	public MagicClusterConfiguration(MagicAPIProperties properties, ClusterConfig config) {
 		this.properties = properties;
 		this.config = config;
-		this.stringRedisTemplate = stringRedisTemplateProvider.getIfAvailable();
 	}
 
 	@Override
@@ -52,8 +46,8 @@ public Plugin plugin() {
 	 */
 	@Bean
 	@ConditionalOnMissingBean
-	public MagicNotifyService magicNotifyService() {
-		return magicNotify -> stringRedisTemplate.convertAndSend(config.getChannel(), Objects.requireNonNull(JsonUtils.toJsonString(magicNotify)));
+	public MagicNotifyService magicNotifyService(RedisModule redisModule) {
+		return magicNotify -> redisModule.execute("publish", Arrays.asList(config.getChannel(), JsonUtils.toJsonString(magicNotify)));
 	}
 
 	/**

diff --git a/magic-api-plugins/magic-api-plugin-component/pom.xml b/magic-api-plugins/magic-api-plugin-component/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-component</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api-plugins/magic-api-plugin-elasticsearch/pom.xml b/magic-api-plugins/magic-api-plugin-elasticsearch/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-elasticsearch</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api-plugins/magic-api-plugin-git/pom.xml b/magic-api-plugins/magic-api-plugin-git/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-git</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api-plugins/magic-api-plugin-mongo/pom.xml b/magic-api-plugins/magic-api-plugin-mongo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-mongo</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api-plugins/magic-api-plugin-redis/pom.xml b/magic-api-plugins/magic-api-plugin-redis/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-redis</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api-plugins/magic-api-plugin-springdoc/pom.xml b/magic-api-plugins/magic-api-plugin-springdoc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-springdoc</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api-plugins/magic-api-plugin-swagger/pom.xml b/magic-api-plugins/magic-api-plugin-swagger/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-swagger</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api-plugins/magic-api-plugin-task/pom.xml b/magic-api-plugins/magic-api-plugin-task/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-plugins</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugin-task</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api-plugins/magic-api-plugin-task/src/console/package.json b/magic-api-plugins/magic-api-plugin-task/src/console/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "magic-test",
+  "name": "magic-task",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

diff --git a/magic-api-plugins/pom.xml b/magic-api-plugins/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-plugins</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <packaging>pom</packaging>
     <name>magic-api-plugins</name>
     <description>auto generate http api</description>

diff --git a/magic-api-servlet/magic-api-servlet-jakarta/pom.xml b/magic-api-servlet/magic-api-servlet-jakarta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-servlet</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-servlet-jakarta</artifactId>
     <packaging>jar</packaging>

diff --git a/...rvlet-jakarta/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaCookie.java b/...rvlet-jakarta/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaCookie.java
@@ -21,7 +21,8 @@ public String getValue() {
 		return cookie.getValue();
 	}
 
-	public Cookie getOriginCookie(){
-		return cookie;
+	@Override
+	public <T> T getCookie() {
+		return (T) cookie;
 	}
 }
diff --git a/...a/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpServletRequest.java b/...a/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpServletRequest.java
@@ -116,6 +116,11 @@ public Principal getUserPrincipal() {
 		return request.getUserPrincipal();
 	}
 
+	@Override
+	public <T> T getRequest() {
+		return (T) request;
+	}
+
 
 	public static class ArgumentsResolver implements HandlerMethodArgumentResolver {
 

diff --git a/.../src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpServletResponse.java b/.../src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpServletResponse.java
@@ -39,8 +39,17 @@ public void sendRedirect(String location) throws IOException {
 
 	@Override
 	public void addCookie(MagicCookie cookie) {
-		MagicJakartaCookie javaEECookie = (MagicJakartaCookie) cookie;
-		response.addCookie(javaEECookie.getOriginCookie());
+		response.addCookie(cookie.getCookie());
+	}
+
+	@Override
+	public void setContentType(String contentType) {
+		response.setContentType(contentType);
+	}
+
+	@Override
+	public void setCharacterEncoding(String characterEncoding) {
+		response.setCharacterEncoding(characterEncoding);
 	}
 
 	@Override
@@ -53,6 +62,11 @@ public Collection<String> getHeaderNames() {
 		return response.getHeaderNames();
 	}
 
+	@Override
+	public <T> T getResponse() {
+		return (T) response;
+	}
+
 	public static class ArgumentsResolver implements HandlerMethodArgumentResolver {
 
 		@Override

diff --git a/...-jakarta/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpSession.java b/...-jakarta/src/main/java/org/ssssssss/magicapi/servlet/jakarta/MagicJakartaHttpSession.java
@@ -6,7 +6,7 @@
 
 public class MagicJakartaHttpSession implements MagicHttpSession {
 
-	private HttpSession session;
+	private final HttpSession session;
 
 	public MagicJakartaHttpSession(HttpSession session) {
 		this.session = session;
@@ -21,4 +21,9 @@ public Object getAttribute(String key) {
 	public void setAttribute(String key, Object value) {
 		session.setAttribute(key, value);
 	}
+
+	@Override
+	public <T> T getSession() {
+		return (T) session;
+	}
 }
diff --git a/magic-api-servlet/magic-api-servlet-javaee/pom.xml b/magic-api-servlet/magic-api-servlet-javaee/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-servlet</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-servlet-javaee</artifactId>
     <packaging>jar</packaging>

diff --git a/...-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEECookie.java b/...-servlet-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEECookie.java
@@ -22,7 +22,8 @@ public String getValue() {
 		return cookie.getValue();
 	}
 
-	public Cookie getOriginCookie() {
-		return cookie;
+	@Override
+	public <T> T getCookie() {
+		return (T) cookie;
 	}
 }
diff --git a/...aee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletRequest.java b/...aee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletRequest.java
@@ -116,6 +116,11 @@ public Principal getUserPrincipal() {
 		return request.getUserPrincipal();
 	}
 
+	@Override
+	public <T> T getRequest() {
+		return (T) request;
+	}
+
 	public static class ArgumentsResolver implements HandlerMethodArgumentResolver {
 
 		@Override

diff --git a/...ee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletResponse.java b/...ee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpServletResponse.java
@@ -39,8 +39,17 @@ public void sendRedirect(String location) throws IOException {
 
 	@Override
 	public void addCookie(MagicCookie cookie) {
-		MagicJavaEECookie javaEECookie = (MagicJavaEECookie) cookie;
-		response.addCookie(javaEECookie.getOriginCookie());
+		response.addCookie(cookie.getCookie());
+	}
+
+	@Override
+	public void setContentType(String contentType) {
+		response.setContentType(contentType);
+	}
+
+	@Override
+	public void setCharacterEncoding(String characterEncoding) {
+		response.setCharacterEncoding(characterEncoding);
 	}
 
 	@Override
@@ -53,6 +62,11 @@ public Collection<String> getHeaderNames() {
 		return response.getHeaderNames();
 	}
 
+	@Override
+	public <T> T getResponse() {
+		return (T) response;
+	}
+
 
 	public static class ArgumentsResolver implements HandlerMethodArgumentResolver {
 

diff --git a/...let-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpSession.java b/...let-javaee/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEHttpSession.java
@@ -6,7 +6,7 @@
 
 public class MagicJavaEEHttpSession implements MagicHttpSession {
 
-	private HttpSession session;
+	private final HttpSession session;
 
 	public MagicJavaEEHttpSession(HttpSession session) {
 		this.session = session;
@@ -21,4 +21,9 @@ public Object getAttribute(String key) {
 	public void setAttribute(String key, Object value) {
 		session.setAttribute(key, value);
 	}
+
+	@Override
+	public <T> T getSession() {
+		return (T) session;
+	}
 }
diff --git a/...e/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEServletConfiguration.java b/...e/src/main/java/org/ssssssss/magicapi/servlet/javaee/MagicJavaEEServletConfiguration.java
@@ -48,8 +48,8 @@ public void addInterceptors(InterceptorRegistry registry) {
 
 	@Override
 	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
-		resolvers.add(new MagicJavaEEHttpServletRequest.ArgumentsResolver());
-		resolvers.add(new MagicJavaEEHttpServletResponse.ArgumentsResolver());
+		resolvers.add(0, new MagicJavaEEHttpServletRequest.ArgumentsResolver());
+		resolvers.add(0, new MagicJavaEEHttpServletResponse.ArgumentsResolver());
 	}
 
 	@Bean

diff --git a/magic-api-servlet/pom.xml b/magic-api-servlet/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-servlet</artifactId>
     <packaging>pom</packaging>

diff --git a/magic-api-spring-boot-starter/pom.xml b/magic-api-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api-spring-boot-starter</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api/pom.xml b/magic-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ssssssss</groupId>
         <artifactId>magic-api-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
     <artifactId>magic-api</artifactId>
     <packaging>jar</packaging>

diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicCookie.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicCookie.java
@@ -5,4 +5,6 @@ public interface MagicCookie {
 	String getName();
 
 	String getValue();
+
+	<T> T getCookie();
 }
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicHttpServletRequest.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicHttpServletRequest.java
@@ -41,6 +41,8 @@ public interface MagicHttpServletRequest {
 	MultipartRequest resolveMultipart();
 
 	Principal getUserPrincipal();
+
+	<T> T getRequest();
 }
 
 
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicHttpServletResponse.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/servlet/MagicHttpServletResponse.java
@@ -14,7 +14,13 @@ public interface MagicHttpServletResponse {
 
 	public void addCookie(MagicCookie cookie);
 
+	public void setContentType(String contentType);
+
+	public void setCharacterEncoding(String characterEncoding);
+
 	public OutputStream getOutputStream() throws IOException;
 
 	public Collection<String> getHeaderNames();
+
+	public <T> T getResponse();
 }