diff --git a/urbanLifelineServ/agent/pom.xml b/urbanLifelineServ/agent/pom.xml new file mode 100644 index 0000000..d4827c2 --- /dev/null +++ b/urbanLifelineServ/agent/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + urban-lifeline + 1.0.0 + + + org.xyzh + agent + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/agent/src/main/java/org/xyzh/agent/AgentApp.java b/urbanLifelineServ/agent/src/main/java/org/xyzh/agent/AgentApp.java new file mode 100644 index 0000000..906de32 --- /dev/null +++ b/urbanLifelineServ/agent/src/main/java/org/xyzh/agent/AgentApp.java @@ -0,0 +1,24 @@ +package org.xyzh.agent; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@EnableDubbo // 启用 Dubbo 服务 +@ComponentScan(basePackages = { + "org.xyzh.agent", // 当前agent模块 + "org.xyzh.common" // 公共模块 +}) +public class AgentApp { + private static final Logger logger = LoggerFactory.getLogger(AgentApp.class); + + public static void main(String[] args) { + logger.info("======================== AgentApp 启动中 ========================="); + SpringApplication.run(AgentApp.class, args); + logger.info("======================== AgentApp 启动成功 ========================="); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-agent/pom.xml b/urbanLifelineServ/apis/api-agent/pom.xml new file mode 100644 index 0000000..9a27dcd --- /dev/null +++ b/urbanLifelineServ/apis/api-agent/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + apis + 1.0.0 + + + org.xyzh + api-agent + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-bidding/pom.xml b/urbanLifelineServ/apis/api-bidding/pom.xml new file mode 100644 index 0000000..37afad8 --- /dev/null +++ b/urbanLifelineServ/apis/api-bidding/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + apis + 1.0.0 + + + org.xyzh + api-bidding + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-bidding/src/main/java/org/xyzh/Main.java b/urbanLifelineServ/apis/api-bidding/src/main/java/org/xyzh/Main.java new file mode 100644 index 0000000..f660b7a --- /dev/null +++ b/urbanLifelineServ/apis/api-bidding/src/main/java/org/xyzh/Main.java @@ -0,0 +1,7 @@ +package org.xyzh; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-crontab/pom.xml b/urbanLifelineServ/apis/api-crontab/pom.xml new file mode 100644 index 0000000..e7ba447 --- /dev/null +++ b/urbanLifelineServ/apis/api-crontab/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + apis + 1.0.0 + + + org.xyzh + api-crontab + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-crontab/src/main/java/org/xyzh/Main.java b/urbanLifelineServ/apis/api-crontab/src/main/java/org/xyzh/Main.java new file mode 100644 index 0000000..f660b7a --- /dev/null +++ b/urbanLifelineServ/apis/api-crontab/src/main/java/org/xyzh/Main.java @@ -0,0 +1,7 @@ +package org.xyzh; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-platform/pom.xml b/urbanLifelineServ/apis/api-platform/pom.xml new file mode 100644 index 0000000..bc1ad5f --- /dev/null +++ b/urbanLifelineServ/apis/api-platform/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + apis + 1.0.0 + + + org.xyzh + api-platform + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-platform/src/main/java/org/xyzh/Main.java b/urbanLifelineServ/apis/api-platform/src/main/java/org/xyzh/Main.java new file mode 100644 index 0000000..f660b7a --- /dev/null +++ b/urbanLifelineServ/apis/api-platform/src/main/java/org/xyzh/Main.java @@ -0,0 +1,7 @@ +package org.xyzh; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/UserDeptRoleVO.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/UserDeptRoleVO.java index 9ecacd0..b5cfd0b 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/UserDeptRoleVO.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/UserDeptRoleVO.java @@ -134,7 +134,7 @@ public class UserDeptRoleVO extends BaseVO { dto.setDescription(vo.getRoleDescription()); dto.setScope(vo.getScope()); dto.setOwnerDeptId(vo.getOwnerDeptId()); - dto.setStatus(vo.isRoleStatus()); + dto.setStatus(vo.getRoleStatus()); dto.setOptsn(vo.getOptsn()); dto.setCreator(vo.getCreator()); dto.setUpdater(vo.getUpdater()); @@ -180,7 +180,7 @@ public class UserDeptRoleVO extends BaseVO { vo.setRoleDescription(permissionVO.getRoleDescription()); vo.setScope(permissionVO.getRoleScope()); vo.setOwnerDeptId(permissionVO.getRoleOwnerDeptId()); - vo.setRoleStatus(permissionVO.isRoleStatus()); + vo.setRoleStatus(permissionVO.getRoleStatus()); vo.setOptsn(permissionVO.getOptsn()); vo.setCreator(permissionVO.getCreator()); vo.setUpdater(permissionVO.getUpdater()); diff --git a/urbanLifelineServ/apis/api-workcase/pom.xml b/urbanLifelineServ/apis/api-workcase/pom.xml new file mode 100644 index 0000000..5bcd75a --- /dev/null +++ b/urbanLifelineServ/apis/api-workcase/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + apis + 1.0.0 + + + org.xyzh + api-workcase + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/apis/api-workcase/src/main/java/org/xyzh/Main.java b/urbanLifelineServ/apis/api-workcase/src/main/java/org/xyzh/Main.java new file mode 100644 index 0000000..f660b7a --- /dev/null +++ b/urbanLifelineServ/apis/api-workcase/src/main/java/org/xyzh/Main.java @@ -0,0 +1,7 @@ +package org.xyzh; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/apis/pom.xml b/urbanLifelineServ/apis/pom.xml index a4d2083..85987ea 100644 --- a/urbanLifelineServ/apis/pom.xml +++ b/urbanLifelineServ/apis/pom.xml @@ -20,6 +20,11 @@ api-message api-log api-system + api-crontab + api-agent + api-bidding + api-platform + api-workcase diff --git a/urbanLifelineServ/bidding/pom.xml b/urbanLifelineServ/bidding/pom.xml new file mode 100644 index 0000000..7ea4bdb --- /dev/null +++ b/urbanLifelineServ/bidding/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + urban-lifeline + 1.0.0 + + + org.xyzh + bidding + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/bidding/src/main/java/org/xyzh/bidding/BiddingApp.java b/urbanLifelineServ/bidding/src/main/java/org/xyzh/bidding/BiddingApp.java new file mode 100644 index 0000000..3b8dc40 --- /dev/null +++ b/urbanLifelineServ/bidding/src/main/java/org/xyzh/bidding/BiddingApp.java @@ -0,0 +1,24 @@ +package org.xyzh.bidding; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@EnableDubbo // 启用 Dubbo 服务 +@ComponentScan(basePackages = { + "org.xyzh.bidding", // 当前bidding模块 + "org.xyzh.common" // 公共模块 +}) +public class BiddingApp { + private static final Logger logger = LoggerFactory.getLogger(BiddingApp.class); + + public static void main(String[] args) { + logger.info("======================== BiddingApp 启动中 ========================="); + SpringApplication.run(BiddingApp.class, args); + logger.info("======================== BiddingApp 启动成功 ========================="); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/crontab/pom.xml b/urbanLifelineServ/crontab/pom.xml new file mode 100644 index 0000000..15205ac --- /dev/null +++ b/urbanLifelineServ/crontab/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + urban-lifeline + 1.0.0 + + + org.xyzh + crontab + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/crontab/src/main/java/org/xyzh/crontab/CrontabApp.java b/urbanLifelineServ/crontab/src/main/java/org/xyzh/crontab/CrontabApp.java new file mode 100644 index 0000000..122cebc --- /dev/null +++ b/urbanLifelineServ/crontab/src/main/java/org/xyzh/crontab/CrontabApp.java @@ -0,0 +1,24 @@ +package org.xyzh.crontab; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@EnableDubbo // 启用 Dubbo 服务 +@ComponentScan(basePackages = { + "org.xyzh.crontab", // 当前crontab模块 + "org.xyzh.common" // 公共模块 +}) +public class CrontabApp { + private static final Logger logger = LoggerFactory.getLogger(CrontabApp.class); + + public static void main(String[] args) { + logger.info("======================== CrontabApp 启动中 ========================="); + SpringApplication.run(CrontabApp.class, args); + logger.info("======================== CrontabApp 启动成功 ========================="); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/message/pom.xml b/urbanLifelineServ/message/pom.xml new file mode 100644 index 0000000..17934c8 --- /dev/null +++ b/urbanLifelineServ/message/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + urban-lifeline + 1.0.0 + + + org.xyzh + message + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/message/src/main/java/org/xyzh/message/MessageApp.java b/urbanLifelineServ/message/src/main/java/org/xyzh/message/MessageApp.java new file mode 100644 index 0000000..700beed --- /dev/null +++ b/urbanLifelineServ/message/src/main/java/org/xyzh/message/MessageApp.java @@ -0,0 +1,24 @@ +package org.xyzh.message; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@EnableDubbo // 启用 Dubbo 服务 +@ComponentScan(basePackages = { + "org.xyzh.message", // 当前message模块 + "org.xyzh.common" // 公共模块 +}) +public class MessageApp { + private static final Logger logger = LoggerFactory.getLogger(MessageApp.class); + + public static void main(String[] args) { + logger.info("======================== MessageApp 启动中 ========================="); + SpringApplication.run(MessageApp.class, args); + logger.info("======================== MessageApp 启动成功 ========================="); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/platform/pom.xml b/urbanLifelineServ/platform/pom.xml new file mode 100644 index 0000000..35638ae --- /dev/null +++ b/urbanLifelineServ/platform/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + urban-lifeline + 1.0.0 + + + org.xyzh + platform + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/platform/src/main/java/org/xyzh/platform/PlatformApp.java b/urbanLifelineServ/platform/src/main/java/org/xyzh/platform/PlatformApp.java new file mode 100644 index 0000000..fae82f4 --- /dev/null +++ b/urbanLifelineServ/platform/src/main/java/org/xyzh/platform/PlatformApp.java @@ -0,0 +1,24 @@ +package org.xyzh.platform; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@EnableDubbo // 启用 Dubbo 服务 +@ComponentScan(basePackages = { + "org.xyzh.platform", // 当前platform模块 + "org.xyzh.common" // 公共模块 +}) +public class PlatformApp { + private static final Logger logger = LoggerFactory.getLogger(PlatformApp.class); + + public static void main(String[] args) { + logger.info("======================== PlatformApp 启动中 ========================="); + SpringApplication.run(PlatformApp.class, args); + logger.info("======================== PlatformApp 启动成功 ========================="); + } +} \ No newline at end of file diff --git a/urbanLifelineServ/pom.xml b/urbanLifelineServ/pom.xml index 1e5f399..46b0f03 100644 --- a/urbanLifelineServ/pom.xml +++ b/urbanLifelineServ/pom.xml @@ -15,6 +15,12 @@ system auth file + message + crontab + agent + bidding + platform + workcase @@ -247,7 +253,16 @@ common-auth ${urban-lifeline.version} - + + org.xyzh.common + common-redis + ${urban-lifeline.version} + + + org.xyzh.common + common-utils + ${urban-lifeline.version} + org.xyzh diff --git a/urbanLifelineServ/workcase/pom.xml b/urbanLifelineServ/workcase/pom.xml new file mode 100644 index 0000000..8345861 --- /dev/null +++ b/urbanLifelineServ/workcase/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.xyzh + urban-lifeline + 1.0.0 + + + org.xyzh + case + 1.0.0 + + + 21 + 21 + + + \ No newline at end of file diff --git a/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/WorkcaseApp.java b/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/WorkcaseApp.java new file mode 100644 index 0000000..5f855af --- /dev/null +++ b/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/WorkcaseApp.java @@ -0,0 +1,24 @@ +package org.xyzh.workcase; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@EnableDubbo // 启用 Dubbo 服务 +@ComponentScan(basePackages = { + "org.xyzh.workcase", // workcase + "org.xyzh.common" // 公共模块 +}) +public class WorkcaseApp { + private static final Logger logger = LoggerFactory.getLogger(WorkcaseApp.class); + + public static void main(String[] args) { + logger.info("======================== WorkcaseApp 启动中 ========================="); + SpringApplication.run(WorkcaseApp.class, args); + logger.info("======================== WorkcaseApp 启动成功 ========================="); + } +} \ No newline at end of file diff --git a/应用对应服务.drawio.xml b/应用对应服务.drawio.xml new file mode 100644 index 0000000..fb0e8d5 --- /dev/null +++ b/应用对应服务.drawio.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +