支持nginx后部署executor

wanhua-executor-plugins/wanhua-frameless-stationv3-collector-plugin/src/main/resources/xxl-job-executor.properties

@@ -1,5 +1,5 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.201.1.101:18080/internal/etl/xxl-job-admin
+xxl.job.admin.addresses=https://10.201.1.101:8082/internal/etl/xxl-job-admin
 
 ### xxl-job, access token
 xxl.job.accessToken=default_token
@@ -7,7 +7,7 @@ xxl.job.accessToken=default_token
 ### xxl-job executor appname
 xxl.job.executor.appname=gsmsv3-collect
 ### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
+xxl.job.executor.address=https://10.201.1.101:8082
 ### xxl-job executor server-info
 xxl.job.executor.ip=
 xxl.job.executor.port=19998

xxl-job-admin/src/main/resources/templates/common/common.macro.ftl

@@ -59,7 +59,7 @@
     <script src="${request.contextPath}/static/js/common.1.js"></script>
     <script>
 		<#--var base_url = '${request.contextPath}';-->
-		var base_url = 'https://10.201.1.101:8082/internal/etl/xxl-job-admin/';
+		var base_url = 'https://10.201.1.101:8082/internal/etl/xxl-job-admin';
         var I18n = ${I18nUtil.getMultString()};
 	</script>
 

xxl-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java

@@ -30,27 +30,27 @@ public class ExecutorBizClient implements ExecutorBiz {
 
     @Override
     public ReturnT<String> beat() {
-        return XxlJobRemotingUtil.postBody(addressUrl+"beat", accessToken, timeout, "", String.class);
+        return XxlJobRemotingUtil.postBody(addressUrl+"internal/etl/wanhua/executor/beat", accessToken, timeout, "", String.class);
     }
 
     @Override
     public ReturnT<String> idleBeat(IdleBeatParam idleBeatParam){
-        return XxlJobRemotingUtil.postBody(addressUrl+"idleBeat", accessToken, timeout, idleBeatParam, String.class);
+        return XxlJobRemotingUtil.postBody(addressUrl+"internal/etl/wanhua/executor/idleBeat", accessToken, timeout, idleBeatParam, String.class);
     }
 
     @Override
     public ReturnT<String> run(TriggerParam triggerParam) {
-        return XxlJobRemotingUtil.postBody(addressUrl + "run", accessToken, timeout, triggerParam, String.class);
+        return XxlJobRemotingUtil.postBody(addressUrl + "internal/etl/wanhua/executor/run", accessToken, timeout, triggerParam, String.class);
     }
 
     @Override
     public ReturnT<String> kill(KillParam killParam) {
-        return XxlJobRemotingUtil.postBody(addressUrl + "kill", accessToken, timeout, killParam, String.class);
+        return XxlJobRemotingUtil.postBody(addressUrl + "internal/etl/wanhua/executor/kill", accessToken, timeout, killParam, String.class);
     }
 
     @Override
     public ReturnT<LogResult> log(LogParam logParam) {
-        return XxlJobRemotingUtil.postBody(addressUrl + "log", accessToken, timeout, logParam, LogResult.class);
+        return XxlJobRemotingUtil.postBody(addressUrl + "internal/etl/wanhua/executor/log", accessToken, timeout, logParam, LogResult.class);
     }
 
 }

xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java

@@ -145,7 +145,12 @@ public class EmbedServer {
             // request parse
             //final byte[] requestBytes = ByteBufUtil.getBytes(msg.content());    // byteBuf.toString(io.netty.util.CharsetUtil.UTF_8);
             String requestData = msg.content().toString(CharsetUtil.UTF_8);
-            String uri = msg.uri();
+            String fullUri = msg.uri();
+            if (fullUri.startsWith("/internal/etl/wanhua/executor")) {
+                // 去掉前面的这一段
+                fullUri = fullUri.substring("/internal/etl/wanhua/executor".length());
+            }
+            String uri = fullUri;
             HttpMethod httpMethod = msg.method();
             boolean keepAlive = HttpUtil.isKeepAlive(msg);
             String accessTokenReq = msg.headers().get(XxlJobRemotingUtil.XXL_JOB_ACCESS_TOKEN);