Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs

zjj

2024-12-12 32448e717f621e1dff5c60d66535433020326ee6

 src/main/java/com/zy/Boot.java

@@ -1,13 +1,13 @@
package com.zy;

import com.core.common.SpringUtils;
import com.zy.common.utils.RandomValidateCodeUtil;
import com.zy.core.ServerBootstrap;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;

@EnableScheduling
@EnableAsync
@SpringBootApplication
public class Boot extends SpringBootServletInitializer {
@@ -15,10 +15,10 @@
    public static void main(String[] args) {
        RandomValidateCodeUtil.init();
        SpringApplication.run(Boot.class, args);
        new Thread(()-> {
            ServerBootstrap serverBootstrap = SpringUtils.getBean(ServerBootstrap.class);
            serverBootstrap.init();
        }).start();
//        new Thread(()-> {
//            ServerBootstrap serverBootstrap = SpringUtils.getBean(ServerBootstrap.class);
//            serverBootstrap.init();
//        }).start();

    }