!26 升级JDK17

Merge pull request !26 from Tany/dev_jdk17

_solon_plugin/job-solon-plugin/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.noear</groupId>
+        <artifactId>solon-parent</artifactId>
+        <version>2.2.2</version>
+    </parent>
+
+    <groupId>fun.asgc</groupId>
+    <artifactId>job-solon-plugin</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <!--quartz-->
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <!--hutool-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+            <version>5.8.15</version>
+        </dependency>
+    </dependencies>
+</project>

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/CustomThreadFactory.java

@@ -0,0 +1,34 @@
+package fun.asgc.solon.extend.job;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public class CustomThreadFactory implements ThreadFactory {
+	private final ThreadGroup group;
+	private final AtomicInteger threadNumber = new AtomicInteger(1);
+	private final String namePrefix;
+
+	public CustomThreadFactory(String prefix) {
+		SecurityManager s = System.getSecurityManager();
+		group = (s != null) ? s.getThreadGroup() :
+			Thread.currentThread().getThreadGroup();
+		namePrefix = prefix + "-thread-";
+	}
+
+	@Override
+	public Thread newThread(Runnable r) {
+		Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
+		if (t.isDaemon()) {
+			t.setDaemon(false);
+		}
+		if (t.getPriority() != Thread.NORM_PRIORITY) {
+			t.setPriority(Thread.NORM_PRIORITY);
+		}
+		return t;
+	}
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/IJobCallback.java

@@ -0,0 +1,17 @@
+package fun.asgc.solon.extend.job;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public interface IJobCallback {
+
+	/**
+	 * 执行日志
+	 * @param jobInfo
+	 * @param param
+	 * @param throwable
+	 */
+	void executeLog(JobInfo jobInfo, String param, Throwable throwable);
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/IJobExecutor.java

@@ -0,0 +1,34 @@
+package fun.asgc.solon.extend.job;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public interface IJobExecutor {
+
+	/**
+	 * 初始化
+	 * @throws JobException
+	 */
+	void init() throws Exception;
+
+	/**
+	 * 新增job
+	 * @param jobInfo
+	 */
+	void add(JobInfo jobInfo);
+
+	/**
+	 * 删除job
+	 * @param jobName
+	 */
+	void remove(String jobName);
+
+	/**
+	 * 触发
+	 * @param jobName
+	 * @param param
+	 */
+	void trigger(String jobName, String param);
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/IJobHandler.java

@@ -0,0 +1,16 @@
+package fun.asgc.solon.extend.job;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public interface IJobHandler {
+
+	/**
+	 * job执行
+	 * @param param
+	 * @throws Exception
+	 */
+	void execute(String param) throws Exception;
+
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/IJobSource.java

@@ -0,0 +1,17 @@
+package fun.asgc.solon.extend.job;
+
+import java.util.List;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public interface IJobSource {
+
+	/**
+	 * 获取所有job列表
+	 * @return
+	 */
+	List<JobInfo> sourceList();
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/JobBean.java

@@ -0,0 +1,26 @@
+package fun.asgc.solon.extend.job;
+
+import fun.asgc.solon.extend.job.impl.JobExecutor;
+import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.Solon;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+@Slf4j
+public class JobBean implements Job {
+
+	@Override
+	public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+		JobExecutor jobExecutor = Solon.context().getBean(JobExecutor.class);
+		if (null != jobExecutor) {
+			jobExecutor.execute(jobExecutionContext);
+		}
+	}
+
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/JobInfo.java

@@ -0,0 +1,23 @@
+package fun.asgc.solon.extend.job;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Map;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+@Accessors(chain = true)
+@Data
+public class JobInfo {
+	private String id;
+	private String name;
+	private String desc;
+	private String cron;
+	private String param;
+	private boolean enable;
+	private Map<String, Object> extension;
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/XPluginImp.java

@@ -0,0 +1,45 @@
+package fun.asgc.solon.extend.job;
+
+import fun.asgc.solon.extend.job.annotation.EnableJob;
+import fun.asgc.solon.extend.job.impl.DefaultJobCallback;
+import fun.asgc.solon.extend.job.impl.DefaultJobSource;
+import fun.asgc.solon.extend.job.impl.JobExecutor;
+import org.noear.solon.Solon;
+import org.noear.solon.core.AopContext;
+import org.noear.solon.core.Plugin;
+import org.noear.solon.core.event.AppLoadEndEvent;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/3/11
+ */
+public class XPluginImp implements Plugin {
+
+    @Override
+    public void start(AopContext context) throws Throwable {
+        EnableJob enableJob = Solon.app().source().getAnnotation(EnableJob.class);
+        if (null == enableJob || !enableJob.value()) {
+            return;
+        }
+
+        //应用加载完后，再启动任务
+        Solon.app().onEvent(AppLoadEndEvent.class, e -> {
+            IJobSource jobSource = context.getBean(IJobSource.class);
+            IJobCallback jobCallback = context.getBean(IJobCallback.class);
+            if (null == jobSource) {
+                jobSource = new DefaultJobSource();
+            }
+            if (null == jobCallback) {
+                jobCallback = new DefaultJobCallback();
+            }
+
+            JobExecutor jobExecutor = new JobExecutor();
+            jobExecutor.setJobSource(jobSource);
+            jobExecutor.setJobCallback(jobCallback);
+            jobExecutor.start();
+
+            context.wrapAndPut(JobExecutor.class, jobExecutor);
+        });
+    }
+
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/annotation/EnableJob.java

@@ -0,0 +1,16 @@
+package fun.asgc.solon.extend.job.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/3/12
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnableJob {
+    boolean value() default true;
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/annotation/JobHandler.java

@@ -0,0 +1,20 @@
+package fun.asgc.solon.extend.job.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JobHandler {
+	String name();
+	String desc() default "";
+	String cron();
+	String param() default "";
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/impl/DefaultJobCallback.java

@@ -0,0 +1,23 @@
+package fun.asgc.solon.extend.job.impl;
+
+import fun.asgc.solon.extend.job.IJobCallback;
+import fun.asgc.solon.extend.job.JobInfo;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/3/12
+ */
+@Slf4j
+public class DefaultJobCallback implements IJobCallback {
+
+    @Override
+    public void executeLog(JobInfo jobInfo, String param, Throwable throwable) {
+        if (null == throwable) {
+            log.debug("[Solon Plugin Job] Job执行 id:{} name:{} desc:{} param:{}", jobInfo.getId(), jobInfo.getName(), jobInfo.getDesc(), param);
+        } else {
+            log.error("[Solon Plugin Job] Job执行 id:{} name:{} desc:{} param:{}", jobInfo.getId(), jobInfo.getName(), jobInfo.getDesc(), param, throwable);
+        }
+    }
+
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/impl/DefaultJobSource.java

@@ -0,0 +1,44 @@
+package fun.asgc.solon.extend.job.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import fun.asgc.solon.extend.job.IJobHandler;
+import fun.asgc.solon.extend.job.IJobSource;
+import fun.asgc.solon.extend.job.annotation.JobHandler;
+import fun.asgc.solon.extend.job.JobInfo;
+import org.noear.solon.Solon;
+
+import java.util.List;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public class DefaultJobSource implements IJobSource {
+
+	@Override
+	public List<JobInfo> sourceList() {
+		List<IJobHandler> jobHandlerList = Solon.context().getBeansOfType(IJobHandler.class);
+		if (CollectionUtil.isEmpty(jobHandlerList)) {
+			return CollectionUtil.newArrayList();
+		}
+		List<JobInfo> jobInfoList = CollectionUtil.newArrayList();
+		for (IJobHandler jobHandler : jobHandlerList) {
+			JobHandler handler = jobHandler.getClass().getAnnotation(JobHandler.class);
+			if (null == handler || StrUtil.isEmpty(handler.name()) || StrUtil.isEmpty(handler.cron())) {
+				continue;
+			}
+			jobInfoList.add(new JobInfo()
+				.setId(handler.name())
+				.setName(handler.name())
+				.setDesc(handler.desc())
+				.setCron(handler.cron())
+				.setParam(handler.param())
+				.setEnable(true)
+			);
+		}
+		return jobInfoList;
+	}
+
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/impl/JobExecutor.java

@@ -0,0 +1,175 @@
+package fun.asgc.solon.extend.job.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import fun.asgc.solon.extend.job.*;
+import fun.asgc.solon.extend.job.annotation.JobHandler;
+import org.noear.solon.Solon;
+import org.quartz.*;
+import org.quartz.impl.StdSchedulerFactory;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Job执行器
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public class JobExecutor implements IJobExecutor {
+	private IJobSource jobSource;
+	private ThreadPoolExecutor threadPoolExecutor;
+	private Map<String, JobInfo> jobInfoMap = new ConcurrentHashMap<>();
+	private SchedulerFactory schedulerFactory;
+	private Scheduler scheduler;
+	private Map<String, IJobHandler> jobHandlerMap = new ConcurrentHashMap<>();
+	private Set<String> runJobSet = CollectionUtil.newHashSet();
+	private IJobCallback jobCallback;
+	private Map<String, TriggerKey> triggerKeyMap = new ConcurrentHashMap<>();
+
+	public void start() {
+		if (null == threadPoolExecutor) {
+			threadPoolExecutor = new ThreadPoolExecutor(5, 20, 10L, TimeUnit.SECONDS,
+					new LinkedBlockingQueue<>(), new CustomThreadFactory("SolonJob"));
+		}
+
+		List<IJobHandler> jobHandlerList = Solon.context().getBeansOfType(IJobHandler.class);
+		if (!CollectionUtil.isEmpty(jobHandlerList)) {
+			for (IJobHandler item : jobHandlerList) {
+				JobHandler jobHandler = item.getClass().getAnnotation(JobHandler.class);
+				if (null == jobHandler) {
+					continue;
+				}
+				jobHandlerMap.put(jobHandler.name(), item);
+			}
+		}
+
+		try {
+			this.schedulerFactory = new StdSchedulerFactory();
+			this.scheduler = schedulerFactory.getScheduler();
+			this.init();
+		} catch (Exception e){
+			throw new RuntimeException("job初始化异常");
+		}
+	}
+
+	public void setJobSource(IJobSource jobSource) {
+		this.jobSource = jobSource;
+	}
+
+	public void setThreadPoolExecutor(ThreadPoolExecutor threadPoolExecutor) {
+		this.threadPoolExecutor = threadPoolExecutor;
+	}
+
+	public void setJobCallback(IJobCallback jobCallback) {
+		this.jobCallback = jobCallback;
+	}
+
+	@Override
+	public void init() throws Exception {
+		List<JobInfo> jobInfoList = jobSource.sourceList();
+		if (CollectionUtil.isEmpty(jobInfoList)) {
+			return;
+		}
+
+		for (JobInfo jobInfo : jobInfoList) {
+			add(jobInfo);
+		}
+	}
+
+	@Override
+	public void add(JobInfo jobInfo) {
+		if (null == jobInfo || StrUtil.isEmpty(jobInfo.getId()) || StrUtil.isEmpty(jobInfo.getName()) ||
+				StrUtil.isEmpty(jobInfo.getCron())) {
+			return;
+		}
+		synchronized (jobInfo.getId()) {
+			runJobSet.add(jobInfo.getName());
+			jobInfoMap.put(jobInfo.getId(), jobInfo);
+
+			TriggerKey triggerKey = TriggerKey.triggerKey(jobInfo.getId());
+			triggerKeyMap.put(jobInfo.getId(), triggerKey);
+			JobKey jobKey = new JobKey(jobInfo.getName());
+
+			CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(jobInfo.getCron()).withMisfireHandlingInstructionDoNothing();
+			CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withSchedule(cronScheduleBuilder).build();
+			JobDetail jobDetail = JobBuilder.newJob(JobBean.class).withIdentity(jobKey).build();
+
+			try {
+				if (jobInfo.isEnable()) {
+					scheduler.scheduleJob(jobDetail, cronTrigger);
+					scheduler.start();
+				}
+			} catch (Exception e) {
+				throw new RuntimeException(String.format("新增job[name=%s]异常", jobInfo.getName()));
+			}
+		}
+	}
+
+	@Override
+	public void remove(String jobId) {
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			return;
+		}
+		synchronized (jobId) {
+			runJobSet.remove(jobInfo.getName());
+			unscheduleJob(jobId);
+		}
+	}
+
+	@Override
+	public void trigger(String jobId, String param) {
+		doExecute(jobId, param);
+	}
+
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		if (null == context || null == context.getTrigger()) {
+			return;
+		}
+		String jobId = context.getTrigger().getKey().getName();
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			unscheduleJob(jobId);
+			return;
+		}
+		doExecute(jobId, jobInfo.getParam());
+	}
+
+	private void unscheduleJob(String jobId) {
+		TriggerKey triggerKey = triggerKeyMap.get(jobId);
+		if (null != triggerKey) {
+			try {
+				scheduler.unscheduleJob(triggerKey);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	private void doExecute(String jobId, String param) {
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			return;
+		}
+		IJobHandler jobHandler =jobHandlerMap.get(jobInfo.getName());
+		if (null == jobHandler) {
+			return;
+		}
+		threadPoolExecutor.submit(() -> {
+			try {
+				jobHandler.execute(param);
+				if (null != jobCallback) {
+					jobCallback.executeLog(jobInfo, param, null);
+				}
+			} catch (Throwable e) {
+				jobCallback.executeLog(jobInfo, param, e);
+			}
+		});
+	}
+}

_solon_plugin/job-solon-plugin/src/main/java/fun/asgc/solon/extend/job/package-info.java

@@ -0,0 +1 @@
+package fun.asgc.solon.extend.job;

_solon_plugin/job-solon-plugin/src/main/resources/META-INF/solon/fun.asgc.solon.extend.job.properties

@@ -0,0 +1,2 @@
+solon.plugin=fun.asgc.solon.extend.job.XPluginImp
+solon.plugin.priority=2

_solon_plugin/orika-solon-plugin/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.noear</groupId>
+        <artifactId>solon-parent</artifactId>
+        <version>2.2.2</version>
+    </parent>
+
+    <groupId>fun.asgc</groupId>
+    <artifactId>orika-solon-plugin</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon</artifactId>
+        </dependency>
+
+        <!--orika-->
+        <dependency>
+            <groupId>ma.glasnost.orika</groupId>
+            <artifactId>orika-core</artifactId>
+            <version>1.5.4</version>
+        </dependency>
+    </dependencies>
+</project>

_solon_plugin/orika-solon-plugin/src/main/java/fun/asgc/solon/extend/orika/XPluginImp.java

@@ -0,0 +1,33 @@
+package fun.asgc.solon.extend.orika;
+
+import ma.glasnost.orika.CustomConverter;
+import ma.glasnost.orika.Mapper;
+import ma.glasnost.orika.MapperFacade;
+import ma.glasnost.orika.MapperFactory;
+import ma.glasnost.orika.impl.DefaultMapperFactory;
+import ma.glasnost.orika.metadata.ClassMapBuilder;
+import org.noear.solon.core.AopContext;
+import org.noear.solon.core.Plugin;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/3/11
+ */
+public class XPluginImp implements Plugin {
+    @Override
+    public void start(AopContext context) throws Throwable {
+        DefaultMapperFactory factory = new DefaultMapperFactory.Builder().build();
+        context.subBeansOfType(CustomConverter.class, bean -> {
+            factory.getConverterFactory().registerConverter(bean);
+        });
+        context.subBeansOfType(Mapper.class, bean -> {
+            factory.registerMapper(bean);
+        });
+        context.subBeansOfType(ClassMapBuilder.class, bean -> {
+            factory.registerClassMap((ClassMapBuilder<? extends Object, ? extends Object>) bean);
+        });
+        context.wrapAndPut(MapperFactory.class, factory);
+        context.wrapAndPut(MapperFacade.class, factory.getMapperFacade());
+    }
+
+}

_solon_plugin/orika-solon-plugin/src/main/java/fun/asgc/solon/extend/orika/package-info.java

@@ -0,0 +1 @@
+package fun.asgc.solon.extend.orika;

_solon_plugin/orika-solon-plugin/src/main/resources/META-INF/solon/fun.asgc.solon.extend.orika.properties

@@ -0,0 +1,2 @@
+solon.plugin=fun.asgc.solon.extend.orika.XPluginImp
+solon.plugin.priority=1

neutrino-proxy-admin/src/main.js

@@ -16,7 +16,6 @@ import './icons' // icon
 import './errorLog'// error log
 import './permission' // permission control
 import './mock' // simulation data
-import './plugins/baiduhm' // 百度统计
 
 import * as filters from './filters' // global filters
 

neutrino-proxy-admin/src/plugins/baiduhm.js

@@ -1,7 +0,0 @@
-const _hmt = _hmt || [];
-(function() {
-  const hm = document.createElement("script");
-  hm.src = "https://hm.baidu.com/hm.js?173e771eef816c412396d2cb4fe2d632";
-  const s = document.getElementsByTagName("script")[0];
-  s.parentNode.insertBefore(hm, s);
-})();

neutrino-proxy-client/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:17-jdk-alpine
 #同步时间
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
     apk update && apk add wget unzip vim && apk add -U tzdata && \

neutrino-proxy-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:17-jdk-alpine
 #同步时间
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
     apk update && apk add wget unzip vim && apk add -U tzdata && \
@@ -12,4 +12,4 @@ COPY ../neutrino-proxy-admin/dist /root/neutrino-proxy/neutrino-proxy-admin/dist
 #VOLUME ["/root/neutrino-proxy"]
 ENTRYPOINT ["java","-jar","neutrino-proxy-server.jar","config=./config/app.yml"]
 
-#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7
+#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7

neutrino-proxy-server/docker-compose.yml

@@ -1,18 +0,0 @@
-version: '3.1'
-
-services:
-
-  neutrino-proxy11:
-    container_name: 'np-server'
-    restart: always
-    image: registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:1.8.0
-    ports:
-      - "9000-9200:9000-9200"
-      - "8888:8888"
-
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - /root/neutrino-proxy/config:/root/neutrino-proxy/config
-
-    privileged: true

neutrino-proxy-server/pom.xml

@@ -30,13 +30,17 @@
             <groupId>org.noear</groupId>
             <artifactId>activerecord-solon-plugin</artifactId>
         </dependency>
+        <!--orika-->
         <dependency>
-            <groupId>org.dromara.solon-plugins</groupId>
+            <groupId>fun.asgc</groupId>
-            <artifactId>job-solon-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.dromara.solon-plugins</groupId>
             <artifactId>orika-solon-plugin</artifactId>
+            <version>2.2.2</version>
+        </dependency>
+        <!--job-->
+        <dependency>
+            <groupId>fun.asgc</groupId>
+            <artifactId>job-solon-plugin</artifactId>
+            <version>2.2.2</version>
         </dependency>
         <dependency>
             <groupId>org.dromara.neutrino-proxy</groupId>
@@ -48,8 +52,8 @@
             <artifactId>sqlite-jdbc</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
+            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java

@@ -1,6 +1,6 @@
 package org.dromara.neutrinoproxy.server;
 
-import org.dromara.solonplugins.job.annotation.EnableJob;
+import fun.asgc.solon.extend.job.annotation.EnableJob;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.SolonMain;
 import org.noear.solon.web.cors.CrossFilter;

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DataCleanJob.java

@@ -3,12 +3,12 @@ package org.dromara.neutrinoproxy.server.job;
 import com.alibaba.fastjson.JSONObject;
 import org.dromara.neutrinoproxy.core.util.DateUtil;
 import org.dromara.neutrinoproxy.server.dal.*;
+import fun.asgc.solon.extend.job.IJobHandler;
+import fun.asgc.solon.extend.job.annotation.JobHandler;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.solonplugins.job.IJobHandler;
-import org.dromara.solonplugins.job.annotation.JobHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DemoJob.java

@@ -1,8 +1,8 @@
 package org.dromara.neutrinoproxy.server.job;
 
+import fun.asgc.solon.extend.job.IJobHandler;
+import fun.asgc.solon.extend.job.annotation.JobHandler;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.solonplugins.job.IJobHandler;
-import org.dromara.solonplugins.job.annotation.JobHandler;
 import org.noear.solon.annotation.Component;
 
 /**

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForDayJob.java

@@ -30,10 +30,10 @@ import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.FlowReportDayDO;
 import org.dromara.neutrinoproxy.server.dal.entity.FlowReportHourDO;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
+import fun.asgc.solon.extend.job.IJobHandler;
+import fun.asgc.solon.extend.job.annotation.JobHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.solonplugins.job.IJobHandler;
-import org.dromara.solonplugins.job.annotation.JobHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForHourJob.java

@@ -8,10 +8,10 @@ import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.FlowReportHourDO;
 import org.dromara.neutrinoproxy.server.dal.entity.FlowReportMinuteDO;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
+import fun.asgc.solon.extend.job.IJobHandler;
+import fun.asgc.solon.extend.job.annotation.JobHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.solonplugins.job.IJobHandler;
-import org.dromara.solonplugins.job.annotation.JobHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForMinuteJob.java

@@ -7,9 +7,9 @@ import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.FlowReportMinuteDO;
 import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
+import fun.asgc.solon.extend.job.IJobHandler;
+import fun.asgc.solon.extend.job.annotation.JobHandler;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.solonplugins.job.IJobHandler;
-import org.dromara.solonplugins.job.annotation.JobHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForMonthJob.java

@@ -6,10 +6,10 @@ import org.dromara.neutrinoproxy.server.dal.*;
 import org.dromara.neutrinoproxy.server.dal.entity.FlowReportDayDO;
 import org.dromara.neutrinoproxy.server.dal.entity.FlowReportMonthDO;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
+import fun.asgc.solon.extend.job.IJobHandler;
+import fun.asgc.solon.extend.job.annotation.JobHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.solonplugins.job.IJobHandler;
-import org.dromara.solonplugins.job.annotation.JobHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/HttpProxy.java

@@ -97,9 +97,6 @@ public class HttpProxy implements EventListener<AppLoadEndEvent> {
                 return;
             }
 
-            // 用户连接到代理服务器时，设置用户连接不可读，等待代理后端服务器连接成功后再改变为可读状态
-            ctx.channel().config().setOption(ChannelOption.AUTO_READ, false);
-
             String host = getHost(bytes);
             if (StringUtils.isBlank(host)) {
                 ctx.channel().close();
@@ -171,11 +168,6 @@ public class HttpProxy implements EventListener<AppLoadEndEvent> {
             super.channelInactive(ctx);
         }
 
-        @Override
-        public void channelActive(ChannelHandlerContext ctx) throws Exception {
-            super.channelActive(ctx);
-        }
-
         @Override
         public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
             // 当出现异常就关闭连接

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java

@@ -19,24 +19,19 @@ import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoUpdateEnabl
 import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoUpdateRes;
 import org.dromara.neutrinoproxy.server.dal.JobInfoMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.JobInfoDO;
-import org.dromara.neutrinoproxy.server.job.*;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import fun.asgc.solon.extend.job.IJobSource;
+import fun.asgc.solon.extend.job.JobInfo;
+import fun.asgc.solon.extend.job.impl.JobExecutor;
 import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.ibatis.solon.annotation.Db;
-import org.dromara.solonplugins.job.IJobHandler;
-import org.dromara.solonplugins.job.IJobSource;
-import org.dromara.solonplugins.job.JobInfo;
-import org.dromara.solonplugins.job.impl.JobExecutor;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  *
@@ -50,29 +45,6 @@ public class JobInfoService implements IJobSource {
     private MapperFacade mapperFacade;
     @Db
     private JobInfoMapper jobInfoMapper;
-    @Inject
-    private DataCleanJob dataCleanJob;
-    @Inject
-    private DemoJob demoJob;
-    @Inject
-    private FlowReportForDayJob flowReportForDayJob;
-    @Inject
-    private FlowReportForHourJob flowReportForHourJob;
-    @Inject
-    private FlowReportForMinuteJob flowReportForMinuteJob;
-    @Inject
-    private FlowReportForMonthJob flowReportForMonthJob;
-    private Map<String, IJobHandler> jobHandlerMap = new HashMap<>();
-
-    @Init
-    public void init() {
-       jobHandlerMap.put("DataCleanJob", dataCleanJob);
-       jobHandlerMap.put("DemoJob", demoJob);
-       jobHandlerMap.put("FlowReportForDayJob", flowReportForDayJob);
-       jobHandlerMap.put("FlowReportForHourJob", flowReportForHourJob);
-       jobHandlerMap.put("FlowReportForMinuteJob", flowReportForMinuteJob);
-       jobHandlerMap.put("FlowReportForMonthJob", flowReportForMonthJob);
-    }
 
     public PageInfo<JobInfoListRes> page(PageQuery pageQuery, JobInfoListReq req) {
         Page<JobInfoListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
@@ -93,15 +65,22 @@ public class JobInfoService implements IJobSource {
         ParamCheckUtil.checkNotNull(jobInfoDO, ExceptionConstant.JOB_INFO_NOT_EXIST);
         jobInfoMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
         if (EnableStatusEnum.ENABLE.getStatus().equals(req.getEnable())) {
-            Solon.context().getBean(JobExecutor.class).startById(String.valueOf(req.getId()));
+            Solon.context().getBean(JobExecutor.class).add(new JobInfo()
+                    .setId(String.valueOf(jobInfoDO.getId()))
+                    .setName(jobInfoDO.getHandler())
+                    .setDesc(jobInfoDO.getDesc())
+                    .setCron(jobInfoDO.getCron())
+                    .setParam(jobInfoDO.getParam())
+                    .setEnable(true)
+            );
         } else {
-            Solon.context().getBean(JobExecutor.class).stopById(String.valueOf(req.getId()));
+            Solon.context().getBean(JobExecutor.class).remove(String.valueOf(req.getId()));
         }
         return new JobInfoUpdateEnableStatusRes();
     }
 
     public JobInfoExecuteRes execute(JobInfoExecuteReq req) {
-        Solon.context().getBean(JobExecutor.class).triggerById(String.valueOf(req.getId()), req.getParam());
+        Solon.context().getBean(JobExecutor.class).trigger(String.valueOf(req.getId()), req.getParam());
         return new JobInfoExecuteRes();
     }
 
@@ -120,7 +99,6 @@ public class JobInfoService implements IJobSource {
                     .setCron(item.getCron())
                     .setParam(item.getParam())
                     .setEnable(EnableStatusEnum.ENABLE.getStatus().equals(item.getEnable()))
-                    .setJobHandler(jobHandlerMap.get(item.getHandler()))
             );
         }
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java

@@ -30,12 +30,12 @@ import org.dromara.neutrinoproxy.server.controller.req.log.JobLogListReq;
 import org.dromara.neutrinoproxy.server.controller.res.log.JobLogListRes;
 import org.dromara.neutrinoproxy.server.dal.JobLogMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.JobLogDO;
+import fun.asgc.solon.extend.job.IJobCallback;
+import fun.asgc.solon.extend.job.JobInfo;
 import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.ibatis.solon.annotation.Db;
-import org.dromara.solonplugins.job.IJobCallback;
-import org.dromara.solonplugins.job.JobInfo;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 

neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql

@@ -96,7 +96,7 @@ CREATE TABLE IF NOT EXISTS `user_login_record` (
 #客户端连接记录表
 CREATE TABLE IF NOT EXISTS `client_connect_record` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-    `ip` varchar(50) NOT NULL COMMENT 'IP',
+    `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'IP',
     `license_id` int NOT NULL COMMENT 'licenseId',
     `type` int NOT NULL COMMENT '类型（1、连接 2、断开连接）',
     `msg` varchar(512) DEFAULT NULL COMMENT '消息',
@@ -163,7 +163,7 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
     `write_bytes` int NOT NULL COMMENT '写入流量',
     `read_bytes` int NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
-    `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd HH',
+    `date_str` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '时间 yyyy-MM-dd HH',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`),
     KEY `I_flow_report_hour_create_time` (`create_time`) USING BTREE,
@@ -180,7 +180,7 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
     `write_bytes` int NOT NULL COMMENT '写入流量',
     `read_bytes` int NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
-    `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd',
+    `date_str` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '时间 yyyy-MM-dd',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`),
     KEY `I_flow_report_day_create_time` (`create_time`) USING BTREE,
@@ -197,7 +197,7 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     `write_bytes` int NOT NULL COMMENT '写入流量',
     `read_bytes` int NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
-    `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM',
+    `date_str` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '时间 yyyy-MM',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`),
     KEY `I_flow_report_month_create_time` (`create_time`) USING BTREE,

neutrino-proxy-vuepress/docs/01.使用教程/01.开始使用/03.关于端口.md

@@ -27,5 +27,5 @@ License分组下的端口，归属于某一个特定的License。
 
 # 基础端口说明
 - WEB端口：服务端API、后台管理访问端口，默认为：8888
-- 服务端等待客户端连接的端口，非SSL：默认9000，SSL端口：默认9002（若不需要SSL支持，可不配置SSL端口）
+- 服务端等待客户端连接的端口，非SSL：默认9000，SSL端口：默认9000（若不需要SSL支持，可不配置SSL端口）
 - HTTP代理端口：默认80，用于域名映射，若无需域名映射，可以忽略。

neutrino-proxy-vuepress/docs/index.md

@@ -289,7 +289,7 @@ postList: none
 <h2>🤝 友情开源项目</h2>
 <p>
 <a href="https://gitee.com/noear/solon" target="_blank" class="friends-item" style="display: flex;">
-    <img class="no-zoom friends-item-img hover-alt" :src="$withBase('/img/logo/solon_logo_500_150.png')" msg="一个高效的应用开发框架：更快、更小、更简单。" />
+    <img class="no-zoom friends-item-img hover-alt" :src="$withBase('/img/logo/solon.png')" msg="一个高效的应用开发框架：更快、更小、更简单。" style="margin-left: 15px;"/><div style="margin-left: 10px;font-size: 30px;">Solon</div>
 </a>
 </p>
 

pom.xml

@@ -20,6 +20,8 @@
         <module>neutrino-proxy-core</module>
         <module>neutrino-proxy-client</module>
         <module>neutrino-proxy-server</module>
+        <module>_solon_plugin/job-solon-plugin</module>
+        <module>_solon_plugin/orika-solon-plugin</module>
     </modules>
 
     <properties>
@@ -27,11 +29,12 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <revision>1.0-SNAPSHOT</revision>
-
+        <maven.compiler.source>17</maven.compiler.source>
-        <java.version>1.8</java.version>
+        <maven.compiler.target>17</maven.compiler.target>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <java.version>17</java.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-flatten.version>1.1.0</maven-flatten.version>
-        <org.projectlombok.version>1.18.4</org.projectlombok.version>
+        <org.projectlombok.version>1.18.26</org.projectlombok.version>
     </properties>
 
     <dependencyManagement>
@@ -39,7 +42,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-                <version>4.1.22.Final</version>
+                <version>4.1.91.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -92,32 +95,21 @@
                 <artifactId>sqlite-jdbc</artifactId>
                 <version>3.39.2.1</version>
             </dependency>
+<!--            <dependency>-->
+<!--                <groupId>mysql</groupId>-->
+<!--                <artifactId>mysql-connector-java</artifactId>-->
+<!--                <version>5.1.49</version>-->
+<!--            </dependency>-->
             <dependency>
-                <groupId>mysql</groupId>
+                <groupId>com.mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
+                <artifactId>mysql-connector-j</artifactId>
-                <version>5.1.49</version>
+                <version>8.0.32</version>
             </dependency>
             <dependency>
                 <groupId>com.zaxxer</groupId>
                 <artifactId>HikariCP</artifactId>
                 <version>4.0.3</version>
             </dependency>
-            <dependency>
-                <groupId>org.dromara.solon-plugins</groupId>
-                <artifactId>job-solon-plugin</artifactId>
-                <version>0.0.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>cn.hutool</groupId>
-                        <artifactId>hutool-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.dromara.solon-plugins</groupId>
-                <artifactId>orika-solon-plugin</artifactId>
-                <version>0.0.4</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

todolist.MD

@@ -2,7 +2,6 @@
 - [ ] 增加针对https的支持
 
 # Bug
-- 指令通达被close的问题，org.dromara.neutrinoproxy.server.proxy.core.ServerChannelHandler.channelInactive 
 - windows环境下直接运行发布版的jar包，日志输出乱码
 - 代理mysql时，使用未开启远程访问的账号走代理访问mysql，代理客户端出现断开现象