1.6.36

hanxiao34 · Apr 2, 2022 · c262508 · c262508
1 parent 319957d
commit c262508
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md
@@ -3,6 +3,7 @@
 * 插件 solon.extend.sessionstate.jwt 呼略 ServiceConfigurationError 抛出
 * CloudJobHandler
 * CloudEventHandler
+* HttpUtils 增加短处理和长处理的切换支持
 
 #### 1.6.35
 * 添加 SocketContext::SessionState 接口支持

diff --git a/...r/solon/cloud/model/JobHandlerHolder.java → ...rg/noear/solon/cloud/model/JobHolder.java b/...r/solon/cloud/model/JobHandlerHolder.java → ...rg/noear/solon/cloud/model/JobHolder.java
@@ -9,13 +9,13 @@
  * @author noear
  * @since 1.4
  */
-public class JobHandlerHolder implements Handler {
+public class JobHolder implements Handler {
     private final String name;
     private final String cron7x;
     private final String description;
     private final Handler handler;
 
-    public JobHandlerHolder(String name, String cron7x, String description, Handler handler) {
+    public JobHolder(String name, String cron7x, String description, Handler handler) {
         this.name = name;
         this.cron7x = cron7x;
         this.description = description;

diff --git a/...-plugin/src/main/java/org/noear/solon/cloud/extend/water/integration/http/HandlerJob.java b/...-plugin/src/main/java/org/noear/solon/cloud/extend/water/integration/http/HandlerJob.java
@@ -4,7 +4,7 @@
 import org.noear.solon.cloud.CloudClient;
 import org.noear.solon.cloud.extend.water.WaterProps;
 import org.noear.solon.cloud.extend.water.service.CloudJobServiceWaterImp;
-import org.noear.solon.cloud.model.JobHandlerHolder;
+import org.noear.solon.cloud.model.JobHolder;
 import org.noear.solon.core.event.EventBus;
 import org.noear.solon.core.handle.Context;
 import org.noear.solon.core.handle.Handler;
@@ -36,7 +36,7 @@ public void handle(Context ctx) throws Throwable {
     }
 
     private void handleDo(Context ctx, String name) {
-        JobHandlerHolder handlerHolder = CloudJobServiceWaterImp.instance.get(name);
+        JobHolder handlerHolder = CloudJobServiceWaterImp.instance.get(name);
 
         if (handlerHolder == null) {
             ctx.status(400);

diff --git a/...gin/src/main/java/org/noear/solon/cloud/extend/water/service/CloudJobServiceWaterImp.java b/...gin/src/main/java/org/noear/solon/cloud/extend/water/service/CloudJobServiceWaterImp.java
@@ -1,7 +1,7 @@
 package org.noear.solon.cloud.extend.water.service;
 
 import org.noear.solon.Solon;
-import org.noear.solon.cloud.model.JobHandlerHolder;
+import org.noear.solon.cloud.model.JobHolder;
 import org.noear.solon.cloud.service.CloudJobService;
 import org.noear.solon.core.handle.Handler;
 import org.noear.solon.core.util.PrintUtil;
@@ -24,9 +24,9 @@
 public class CloudJobServiceWaterImp implements CloudJobService {
     public static final CloudJobServiceWaterImp instance = new CloudJobServiceWaterImp();
 
-    public Map<String, JobHandlerHolder> jobMap = new LinkedHashMap<>();
+    public Map<String, JobHolder> jobMap = new LinkedHashMap<>();
 
-    public JobHandlerHolder get(String name) {
+    public JobHolder get(String name) {
         return jobMap.get(name);
     }
 
@@ -49,7 +49,7 @@ public void push() {
 
     @Override
     public boolean register(String name, String cron7x, String description, Handler handler) {
-        JobHandlerHolder handlerHolder = new JobHandlerHolder(name, cron7x, description, handler);
+        JobHolder handlerHolder = new JobHolder(name, cron7x, description, handler);
 
         jobMap.put(name, handlerHolder);
         TagsMDC.tag0("CloudJob");

diff --git a/...plugin/src/main/java/org/noear/solon/cloud/extend/xxljob/service/CloudJobServiceImpl.java b/...plugin/src/main/java/org/noear/solon/cloud/extend/xxljob/service/CloudJobServiceImpl.java
@@ -1,7 +1,7 @@
 package org.noear.solon.cloud.extend.xxljob.service;
 
 import com.xxl.job.core.executor.XxlJobExecutor;
-import org.noear.solon.cloud.model.JobHandlerHolder;
+import org.noear.solon.cloud.model.JobHolder;
 import org.noear.solon.cloud.service.CloudJobService;
 import org.noear.solon.core.handle.Handler;
 
@@ -14,7 +14,7 @@ public class CloudJobServiceImpl implements CloudJobService {
 
     @Override
     public boolean register(String name, String cron7x, String description, Handler handler) {
-        JobHandlerHolder handlerHolder = new JobHandlerHolder(name, cron7x, description, handler);
+        JobHolder handlerHolder = new JobHolder(name, cron7x, description, handler);
 
         XxlJobExecutor.registJobHandler(name, new CloudJobHanderProxy(handlerHolder));
         return true;

diff --git a/solon-parent/pom.xml b/solon-parent/pom.xml
@@ -23,7 +23,7 @@
         <snack3.ver>3.2.16</snack3.ver>
         <weed3.ver>3.4.19</weed3.ver>
         <water.ver>2.5.9</water.ver>
-        <luffy.ver>1.1.14</luffy.ver>
+        <luffy.ver>1.1.15</luffy.ver>
         <redisx.ver>1.3.6</redisx.ver>
 
         <fastjson.ver>1.2.75</fastjson.ver>