ibiz4j 发布系统代码

ibzuaa-core/src/main/java/cn/ibizlab/core/util/config/XxlJobConfig.java

 package cn.ibizlab.core.util.config;
 
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
 
-/**
- * xxl-job config
- *  分布式任务调度平台XXL-JOB配置加载
- * @author xuxueli 2017-04-28
- */
+
 @Configuration
 public class XxlJobConfig {
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-
-    @Value("${xxl.job.admin.addresses:}")
-    private String adminAddresses;
-
-    @Value("${xxl.job.accessToken:}")
-    private String accessToken;
-
-    @Value("${xxl.job.executor.appname:ibzuaa}")
-    private String appName;
-
-    @Value("${xxl.job.executor.ip:127.0.0.1}")
-    private String ip;
-
-   @Value("${xxl.job.executor.port:9999}")
-   private int port;
-
-    @Value("${xxl.job.executor.logpath:/app/joblog}")
-    private String logPath;
-
-    @Value("${xxl.job.executor.logretentiondays:-1}")
-    private int logRetentionDays;
-
-    @Bean(initMethod = "start", destroyMethod = "destroy")
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        if(!StringUtils.isEmpty(adminAddresses)){
-            logger.info(">>>>>>>>>>> xxl-job config init.");
-            logger.info(">>>>>>>>>>> adminAddresses:"+adminAddresses);
-            logger.info(">>>>>>>>>>> appName:"+appName);
-            logger.info(">>>>>>>>>>> ip:"+ip);
-            logger.info(">>>>>>>>>>> port:"+port);
-            XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-            xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-            xxlJobSpringExecutor.setAppName(appName);
-            xxlJobSpringExecutor.setIp(ip);
-            xxlJobSpringExecutor.setPort(port);
-            xxlJobSpringExecutor.setAccessToken(accessToken);
-            xxlJobSpringExecutor.setLogPath(logPath);
-            xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-            return xxlJobSpringExecutor;
-        }
-        
-        logger.info(">>>>>>>>>>> xxl-job config not init.");
-        return null;
-    }
 
-    /**
-     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
-     *
-     *      1、引入依赖：
-     *          <dependency>
-     *             <groupId>org.springframework.cloud</groupId>
-     *             <artifactId>spring-cloud-commons</artifactId>
-     *             <version>${version}"</version>
-     *         </dependency>
-     *
-     *      2、配置文件，或者容器启动变量
-     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-     *
-     *      3、获取IP
-     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-     */
 }

ibzuaa-dependencies/pom.xml

@@ -74,8 +74,8 @@
         <!--httpClient -->
         <openfeign-httpclient.version>11.0</openfeign-httpclient.version>
 
-        <!--xxl-job定时服务 -->
-        <xxl-job.version>2.1.0</xxl-job.version>
+        <!--baomidou-jobs定时服务 -->
+        <baomidou-jobs.version>1.0.3</baomidou-jobs.version>
 
         <oracle.version>11.2.0.3</oracle.version>
         <postgresql.version>42.2.6</postgresql.version>
@@ -256,9 +256,9 @@
             </dependency>
 
             <dependency>
-                <groupId>com.xuxueli</groupId>
-                <artifactId>xxl-job-core</artifactId>
-                <version>${xxl-job.version}</version>
+                <groupId>com.baomidou</groupId>
+                <artifactId>jobs-spring-boot-starter</artifactId>
+                <version>${baomidou-jobs.version}</version>
             </dependency>
 
         </dependencies>

ibzuaa-util/src/main/resources/application-sys.yml

+#nacos配置中心、数据源
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 172.16.102.211:8848
+  cache:
+    redis:
+      time-to-live: 3600
+    caffeine:
+      spec: initialCapacity=5,maximumSize=500,expireAfterWrite=3600s
+  redis:
+    host: 172.16.100.243
+    port: 6379
+    password:
+    database: 0
+    lettuce:
+      pool:
+        max-active: 32
+        max-wait: 300ms
+        max-idle: 16
+        min-idle: 8
+  datasource:
+    username: a_A_5d9d78509
+    password: '@6dEfb3@'
+    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+    driver-class-name: com.mysql.jdbc.Driver
+    filters: stat,wall,log4j2
+    #配置初始化大小/最小/最大
+    initial-size: 1
+    min-idle: 1
+    max-active: 20
+    #获取连接等待超时时间
+    max-wait: 60000
+    #间隔多久进行一次检测，检测需要关闭的空闲连接
+    time-between-eviction-runs-millis: 60000
+    #一个连接在池中最小生存的时间
+    min-evictable-idle-time-millis: 300000
+    validation-query: SELECT 1 FROM DUAL
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+    pool-prepared-statements: false
+    max-pool-prepared-statement-per-connection-size: 20
+    isSyncDBSchema: false
+    defaultSchema: a_A_5d9d78509
+    conf: classpath:liquibase/master.xml
+
+#Mybatis-plus配置
+mybatis-plus:
+  global-config:
+    refresh-mapper: true
+    db-config:
+      # 全局逻辑已删除默认值
+      logic-delete-value: 0
+      # 全局逻辑未删除默认值
+      logic-not-delete-value: 1
+  mapper-locations: classpath*:/mapper/*/*/*.xml
+  configuration:
+    jdbc-type-for-null: 'null'
+    map-underscore-to-camel-case: false
+
+#阿里sentinel熔断器
+feign:
+  httpclient:
+    enabled: true
+  sentinel:
+    enabled: true
+
+#Log配置
+logging:
+  level:
+    cn.ibizlab: debug
+    org.springframework.boot.autoconfigure: ERROR
+
+#zuul网关超时设置
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
+#系统是否开启权限验证、是否开启缓存
+#缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
+ibiz:
+  enablePermissionValid: false
+  cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
+
+### jobs
+jobs:
+  admin-address: http://127.0.0.1:40005
+  app-name: ibzuaa
+  app-port: 9999
+    #app-ip: 127.0.0.1
+