From cdffc8a929b06849e21ea49900a282c2485002f1 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Fri, 31 Oct 2025 17:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=A8=A1=E5=9D=97-s?=
=?UTF-8?q?jx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/springblade/auth/AuthApplication.java | 5 ++
.../gateway/GateWayApplication.java | 5 ++
.../plugin/workflow/WorkflowApplication.java | 5 ++
blade-service-api/blade-monitor-api/pom.xml | 27 +++++++++
.../pom.xml | 20 +++----
blade-service-api/pom.xml | 2 +
.../org/springblade/desk/DeskApplication.java | 5 ++
.../controller/LeaveController.java | 6 +-
.../controller/NoticeController.java | 7 +--
.../{ => notice}/entity/ProcessLeave.java | 2 +-
.../desk/{ => notice}/feign/NoticeClient.java | 5 +-
.../desk/{ => notice}/mapper/LeaveMapper.java | 4 +-
.../desk/{ => notice}/mapper/LeaveMapper.xml | 2 +-
.../{ => notice}/mapper/NoticeMapper.java | 2 +-
.../desk/{ => notice}/mapper/NoticeMapper.xml | 2 +-
.../{ => notice}/service/ILeaveService.java | 4 +-
.../{ => notice}/service/INoticeService.java | 2 +-
.../service/impl/LeaveServiceImpl.java | 8 +--
.../service/impl/NoticeServiceImpl.java | 6 +-
.../{ => notice}/wrapper/NoticeWrapper.java | 2 +-
blade-service/blade-monitor/pom.xml | 57 +++++++++++++++++++
.../monitor/MonitorApplication.java} | 12 +++-
.../src/main/resources/application-dev.yml | 2 +-
.../src/main/resources/application-prod.yml | 2 +-
.../src/main/resources/application-test.yml | 2 +-
.../{blade-meter => blade-scheduling}/pom.xml | 32 ++++++-----
.../scheduling/SchedulingApplication.java | 51 +++++++++++++++++
.../src/main/resources/application-dev.yml | 11 ++++
.../src/main/resources/application-prod.yml | 10 ++++
.../src/main/resources/application-test.yml | 10 ++++
.../springblade/system/SystemApplication.java | 5 ++
blade-service/pom.xml | 2 +
pom.xml | 10 ++++
33 files changed, 271 insertions(+), 56 deletions(-)
create mode 100644 blade-service-api/blade-monitor-api/pom.xml
rename blade-service-api/{blade-meter-api => blade-scheduling-api}/pom.xml (54%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/controller/LeaveController.java (92%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/controller/NoticeController.java (97%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/entity/ProcessLeave.java (97%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/feign/NoticeClient.java (92%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/mapper/LeaveMapper.java (91%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/mapper/LeaveMapper.xml (70%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/mapper/NoticeMapper.java (97%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/mapper/NoticeMapper.xml (97%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/service/ILeaveService.java (92%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/service/INoticeService.java (96%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/service/impl/LeaveServiceImpl.java (93%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/service/impl/NoticeServiceImpl.java (91%)
rename blade-service/blade-desk/src/main/java/org/springblade/desk/{ => notice}/wrapper/NoticeWrapper.java (98%)
create mode 100644 blade-service/blade-monitor/pom.xml
rename blade-service/{blade-meter/src/main/java/org/springblade/meter/MeterApplication.java => blade-monitor/src/main/java/org/springblade/monitor/MonitorApplication.java} (73%)
rename blade-service/{blade-meter => blade-monitor}/src/main/resources/application-dev.yml (93%)
rename blade-service/{blade-meter => blade-monitor}/src/main/resources/application-prod.yml (93%)
rename blade-service/{blade-meter => blade-monitor}/src/main/resources/application-test.yml (93%)
rename blade-service/{blade-meter => blade-scheduling}/pom.xml (53%)
create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java
create mode 100644 blade-service/blade-scheduling/src/main/resources/application-dev.yml
create mode 100644 blade-service/blade-scheduling/src/main/resources/application-prod.yml
create mode 100644 blade-service/blade-scheduling/src/main/resources/application-test.yml
diff --git a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java
index 62627f3..6f8772a 100644
--- a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java
+++ b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java
@@ -42,6 +42,11 @@ public class AuthApplication {
public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_AUTH_NAME, AuthApplication.class, args);
+ System.out.println("===================");
+ System.out.println("===================");
+ System.out.println("=======启动成功!====");
+ System.out.println("===================");
+ System.out.println("===================");
}
}
diff --git a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java
index a724b7c..c6b3082 100644
--- a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java
+++ b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java
@@ -43,6 +43,11 @@ public class GateWayApplication {
public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args);
+ System.out.println("===================");
+ System.out.println("===================");
+ System.out.println("=======启动成功!====");
+ System.out.println("===================");
+ System.out.println("===================");
}
}
diff --git a/blade-ops/blade-workflow/src/main/java/org/springblade/plugin/workflow/WorkflowApplication.java b/blade-ops/blade-workflow/src/main/java/org/springblade/plugin/workflow/WorkflowApplication.java
index 27a14f6..9239b7a 100644
--- a/blade-ops/blade-workflow/src/main/java/org/springblade/plugin/workflow/WorkflowApplication.java
+++ b/blade-ops/blade-workflow/src/main/java/org/springblade/plugin/workflow/WorkflowApplication.java
@@ -11,5 +11,10 @@ public class WorkflowApplication {
public static void main(String[] args) {
BladeApplication.run("blade-workflow", WorkflowApplication.class, args);
+ System.out.println("===================");
+ System.out.println("===================");
+ System.out.println("=======启动成功!====");
+ System.out.println("===================");
+ System.out.println("===================");
}
}
diff --git a/blade-service-api/blade-monitor-api/pom.xml b/blade-service-api/blade-monitor-api/pom.xml
new file mode 100644
index 0000000..44fa267
--- /dev/null
+++ b/blade-service-api/blade-monitor-api/pom.xml
@@ -0,0 +1,27 @@
+
+
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.controller;
+package org.springblade.desk.notice.controller;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.CacheNames;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.desk.entity.ProcessLeave;
-import org.springblade.desk.service.ILeaveService;
+import org.springblade.desk.notice.entity.ProcessLeave;
+import org.springblade.desk.notice.service.ILeaveService;
import org.springblade.system.cache.UserCache;
import org.springframework.web.bind.annotation.*;
import io.swagger.v3.oas.annotations.Hidden;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/controller/NoticeController.java
similarity index 97%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/controller/NoticeController.java
index 3301366..9a608e8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/controller/NoticeController.java
@@ -23,7 +23,7 @@
*
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.controller;
+package org.springblade.desk.notice.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -45,9 +45,9 @@ import org.springblade.core.tool.utils.Func;
import org.springblade.core.xss.annotation.XssIgnore;
import org.springblade.desk.pojo.entity.Notice;
import org.springblade.desk.feign.INoticeClient;
-import org.springblade.desk.service.INoticeService;
+import org.springblade.desk.notice.service.INoticeService;
import org.springblade.desk.pojo.vo.NoticeVO;
-import org.springblade.desk.wrapper.NoticeWrapper;
+import org.springblade.desk.notice.wrapper.NoticeWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -60,7 +60,6 @@ import java.util.Map;
@TenantDS
@RestController
@AllArgsConstructor
-@PreAuth(menu = "notice")
@RequestMapping("notice")
@Tag(name = "用户博客", description = "博客接口")
public class NoticeController extends BladeController {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/entity/ProcessLeave.java
similarity index 97%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/entity/ProcessLeave.java
index cc293a3..a574c68 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/entity/ProcessLeave.java
@@ -23,7 +23,7 @@
*
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.entity;
+package org.springblade.desk.notice.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/feign/NoticeClient.java
similarity index 92%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/feign/NoticeClient.java
index ba4074c..aa399cc 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/feign/NoticeClient.java
@@ -23,7 +23,7 @@
*
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.feign;
+package org.springblade.desk.notice.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
@@ -31,8 +31,9 @@ import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.desk.feign.INoticeClient;
+import org.springblade.desk.notice.service.INoticeService;
import org.springblade.desk.pojo.entity.Notice;
-import org.springblade.desk.service.INoticeService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.v3.oas.annotations.Hidden;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/LeaveMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/LeaveMapper.java
similarity index 91%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/LeaveMapper.java
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/LeaveMapper.java
index d6b1a58..58ef109 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/LeaveMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/LeaveMapper.java
@@ -23,10 +23,10 @@
*
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.mapper;
+package org.springblade.desk.notice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.desk.entity.ProcessLeave;
+import org.springblade.desk.notice.entity.ProcessLeave;
/**
* Mapper 接口
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/LeaveMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/LeaveMapper.xml
similarity index 70%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/LeaveMapper.xml
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/LeaveMapper.xml
index 37e86b8..8b48a69 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/LeaveMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/LeaveMapper.xml
@@ -1,6 +1,6 @@
-
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.mapper;
+package org.springblade.desk.notice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/NoticeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml
similarity index 97%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/NoticeMapper.xml
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml
index 93c6a73..6383cfd 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/NoticeMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml
@@ -1,6 +1,6 @@
-
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.service;
+package org.springblade.desk.notice.service;
import org.springblade.core.mp.base.BaseService;
-import org.springblade.desk.entity.ProcessLeave;
+import org.springblade.desk.notice.entity.ProcessLeave;
/**
* 服务类
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/INoticeService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/INoticeService.java
similarity index 96%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/service/INoticeService.java
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/INoticeService.java
index bcb8591..5c84384 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/INoticeService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/INoticeService.java
@@ -23,7 +23,7 @@
*
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.service;
+package org.springblade.desk.notice.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/LeaveServiceImpl.java
similarity index 93%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/LeaveServiceImpl.java
index 1f5c175..571fd9e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/LeaveServiceImpl.java
@@ -23,7 +23,7 @@
*
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.service.impl;
+package org.springblade.desk.notice.service.impl;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -34,9 +34,9 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.entity.ProcessLeave;
-import org.springblade.desk.mapper.LeaveMapper;
-import org.springblade.desk.service.ILeaveService;
+import org.springblade.desk.notice.entity.ProcessLeave;
+import org.springblade.desk.notice.mapper.LeaveMapper;
+import org.springblade.desk.notice.service.ILeaveService;
import org.springblade.flow.core.constant.ProcessConstant;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.flow.core.feign.IFlowClient;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/NoticeServiceImpl.java
similarity index 91%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/NoticeServiceImpl.java
index e23cf09..c9c11c8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/NoticeServiceImpl.java
@@ -23,14 +23,14 @@
*
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.service.impl;
+package org.springblade.desk.notice.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.desk.pojo.entity.Notice;
-import org.springblade.desk.mapper.NoticeMapper;
-import org.springblade.desk.service.INoticeService;
+import org.springblade.desk.notice.mapper.NoticeMapper;
+import org.springblade.desk.notice.service.INoticeService;
import org.springblade.desk.pojo.vo.NoticeVO;
import org.springframework.stereotype.Service;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/wrapper/NoticeWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/wrapper/NoticeWrapper.java
similarity index 98%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/wrapper/NoticeWrapper.java
rename to blade-service/blade-desk/src/main/java/org/springblade/desk/notice/wrapper/NoticeWrapper.java
index d1346ed..084980e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/wrapper/NoticeWrapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/wrapper/NoticeWrapper.java
@@ -23,7 +23,7 @@
*
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.desk.wrapper;
+package org.springblade.desk.notice.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
diff --git a/blade-service/blade-monitor/pom.xml b/blade-service/blade-monitor/pom.xml
new file mode 100644
index 0000000..4fd4b08
--- /dev/null
+++ b/blade-service/blade-monitor/pom.xml
@@ -0,0 +1,57 @@
+
+
* Author: Chill Zhuang (bladejava@qq.com)
*/
-package org.springblade.meter;
+package org.springblade.monitor;
+import org.springblade.common.constant.LauncherConstant;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
@@ -35,10 +36,15 @@ import org.springblade.core.launch.constant.AppConstant;
* @author Chill
*/
@BladeCloudApplication
-public class MeterApplication {
+public class MonitorApplication {
public static void main(String[] args) {
- BladeApplication.run(AppConstant.APPLICATION_DESK_NAME, MeterApplication.class, args);
+ BladeApplication.run(LauncherConstant.APPLICATION_MONITOR_NAME, MonitorApplication.class, args);
+ System.out.println("===================");
+ System.out.println("===================");
+ System.out.println("=======启动成功!====");
+ System.out.println("===================");
+ System.out.println("===================");
}
}
diff --git a/blade-service/blade-meter/src/main/resources/application-dev.yml b/blade-service/blade-monitor/src/main/resources/application-dev.yml
similarity index 93%
rename from blade-service/blade-meter/src/main/resources/application-dev.yml
rename to blade-service/blade-monitor/src/main/resources/application-dev.yml
index 9a2f933..bfbd74a 100644
--- a/blade-service/blade-meter/src/main/resources/application-dev.yml
+++ b/blade-service/blade-monitor/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
#服务器端口
server:
- port: 8109
+ port: 8108
#数据源配置
spring:
diff --git a/blade-service/blade-meter/src/main/resources/application-prod.yml b/blade-service/blade-monitor/src/main/resources/application-prod.yml
similarity index 93%
rename from blade-service/blade-meter/src/main/resources/application-prod.yml
rename to blade-service/blade-monitor/src/main/resources/application-prod.yml
index ae776ae..00b2371 100644
--- a/blade-service/blade-meter/src/main/resources/application-prod.yml
+++ b/blade-service/blade-monitor/src/main/resources/application-prod.yml
@@ -1,6 +1,6 @@
#服务器端口
server:
- port: 8109
+ port: 8108
#数据源配置
spring:
diff --git a/blade-service/blade-meter/src/main/resources/application-test.yml b/blade-service/blade-monitor/src/main/resources/application-test.yml
similarity index 93%
rename from blade-service/blade-meter/src/main/resources/application-test.yml
rename to blade-service/blade-monitor/src/main/resources/application-test.yml
index 0a3ee8d..c2a8492 100644
--- a/blade-service/blade-meter/src/main/resources/application-test.yml
+++ b/blade-service/blade-monitor/src/main/resources/application-test.yml
@@ -1,6 +1,6 @@
#服务器端口
server:
- port: 8109
+ port: 8108
#数据源配置
spring:
diff --git a/blade-service/blade-meter/pom.xml b/blade-service/blade-scheduling/pom.xml
similarity index 53%
rename from blade-service/blade-meter/pom.xml
rename to blade-service/blade-scheduling/pom.xml
index 6b2552c..d06287e 100644
--- a/blade-service/blade-meter/pom.xml
+++ b/blade-service/blade-scheduling/pom.xml
@@ -6,13 +6,11 @@
+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *
+ * 1. This software is for development use only under a valid license + * from BladeX. + *
+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *
+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *
+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling;
+
+import org.springblade.common.constant.LauncherConstant;
+import org.springblade.core.cloud.client.BladeCloudApplication;
+import org.springblade.core.launch.BladeApplication;
+import org.springblade.core.launch.constant.AppConstant;
+
+/**
+ * Desk启动器
+ *
+ * @author Chill
+ */
+@BladeCloudApplication
+public class SchedulingApplication {
+
+ public static void main(String[] args) {
+ BladeApplication.run(LauncherConstant.APPLICATION_SCHEDULING_NAME, SchedulingApplication.class, args);
+ System.out.println("===================");
+ System.out.println("===================");
+ System.out.println("=======启动成功!====");
+ System.out.println("===================");
+ System.out.println("===================");
+ }
+
+}
+
diff --git a/blade-service/blade-scheduling/src/main/resources/application-dev.yml b/blade-service/blade-scheduling/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..732fb67
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/resources/application-dev.yml
@@ -0,0 +1,11 @@
+#服务器端口
+server:
+ port: 8107
+
+#数据源配置
+spring:
+ datasource:
+ url: ${blade.datasource.dev.url}
+ username: ${blade.datasource.dev.username}
+ password: ${blade.datasource.dev.password}
+
diff --git a/blade-service/blade-scheduling/src/main/resources/application-prod.yml b/blade-service/blade-scheduling/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..54a5e2a
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/resources/application-prod.yml
@@ -0,0 +1,10 @@
+#服务器端口
+server:
+ port: 8107
+
+#数据源配置
+spring:
+ datasource:
+ url: ${blade.datasource.prod.url}
+ username: ${blade.datasource.prod.username}
+ password: ${blade.datasource.prod.password}
diff --git a/blade-service/blade-scheduling/src/main/resources/application-test.yml b/blade-service/blade-scheduling/src/main/resources/application-test.yml
new file mode 100644
index 0000000..ebd6d77
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/resources/application-test.yml
@@ -0,0 +1,10 @@
+#服务器端口
+server:
+ port: 8107
+
+#数据源配置
+spring:
+ datasource:
+ url: ${blade.datasource.test.url}
+ username: ${blade.datasource.test.username}
+ password: ${blade.datasource.test.password}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java b/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java
index 278ef63..64f4de3 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java
@@ -38,6 +38,11 @@ public class SystemApplication {
public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_SYSTEM_NAME, SystemApplication.class, args);
+ System.out.println("===================");
+ System.out.println("===================");
+ System.out.println("=======启动成功!====");
+ System.out.println("===================");
+ System.out.println("===================");
}
}
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index b9bd491..cb2ab4b 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -19,6 +19,8 @@