瀏覽代碼

初始化

dsx 2 年之前
父節點
當前提交
4744564724

+ 15 - 1
xxl-job-admin/pom.xml

@@ -22,7 +22,15 @@
 			<dependency>
 				<groupId>com.alibaba.cloud</groupId>
 				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
-				<version>2.2.7.RELEASE</version>
+				<version>2021.0.4.0</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>2021.0.4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -92,6 +100,12 @@
 			<version>2.4.0-SNAPSHOT</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-bootstrap</artifactId>
+<!--			<version></version>-->
+		</dependency>
+
 	</dependencies>
 
 	<build>

+ 0 - 5
xxl-job-admin/src/main/resources/application-test.properties

@@ -1,5 +0,0 @@
-spring.application.name=job-admin
-spring.cloud.nacos.server-addr=120.24.144.164:8848
-spring.cloud.nacos.namespace=4dkankan-v4-test
-spring.cloud.nacos.config.namespace=${spring.cloud.nacos.namespace}
-spring.cloud.nacos.discovery.namespace=${spring.cloud.nacos.namespace}

+ 0 - 65
xxl-job-admin/src/main/resources/application.properties

@@ -1,65 +0,0 @@
-### web
-server.port=8080
-server.servlet.context-path=/xxl-job-admin
-
-### actuator
-management.server.servlet.context-path=/actuator
-management.health.mail.enabled=false
-
-### resources
-spring.mvc.servlet.load-on-startup=0
-spring.mvc.static-path-pattern=/static/**
-spring.resources.static-locations=classpath:/static/
-
-### freemarker
-spring.freemarker.templateLoaderPath=classpath:/templates/
-spring.freemarker.suffix=.ftl
-spring.freemarker.charset=UTF-8
-spring.freemarker.request-context-attribute=request
-spring.freemarker.settings.number_format=0.##########
-
-### mybatis
-mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
-#mybatis.type-aliases-package=com.xxl.job.admin.core.model
-
-### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://120.24.144.164:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
-spring.datasource.username=root
-spring.datasource.password=4Dage@4Dage#@168
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-### datasource-pool
-spring.datasource.type=com.zaxxer.hikari.HikariDataSource
-spring.datasource.hikari.minimum-idle=10
-spring.datasource.hikari.maximum-pool-size=30
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.idle-timeout=30000
-spring.datasource.hikari.pool-name=HikariCP
-spring.datasource.hikari.max-lifetime=900000
-spring.datasource.hikari.connection-timeout=10000
-spring.datasource.hikari.connection-test-query=SELECT 1
-spring.datasource.hikari.validation-timeout=1000
-
-### xxl-job, email
-spring.mail.host=smtp.qq.com
-spring.mail.port=25
-spring.mail.username=xxx@qq.com
-spring.mail.from=xxx@qq.com
-spring.mail.password=xxx
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true
-spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-
-### xxl-job, access token
-xxl.job.accessToken=
-
-### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en")
-xxl.job.i18n=zh_CN
-
-## xxl-job, triggerpool max size
-xxl.job.triggerpool.fast.max=200
-xxl.job.triggerpool.slow.max=100
-
-### xxl-job, log retention days
-xxl.job.logretentiondays=30

+ 43 - 0
xxl-job-admin/src/main/resources/bootstrap-test.yml

@@ -0,0 +1,43 @@
+spring:
+  application:
+    name: job-admin
+  cloud:
+    nacos:
+      server-addr: 120.24.144.164:8848
+      namespace: 4dkankan-v4-test
+      config:
+        file-extension: yaml
+        namespace: ${spring.cloud.nacos.namespace}
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-logback-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        namespace: ${spring.cloud.nacos.namespace}
+
+
+
+
+
+
+