diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 2942ec3..c9f22f8 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index 307a581..9707804 100644 --- a/couplet-gateway/src/main/resources/bootstrap.yml +++ b/couplet-gateway/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml new file mode 100644 index 0000000..e34dd5a --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-common + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-common-core + + + com.couplet + couplet-common-system + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml new file mode 100644 index 0000000..c9c52a9 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-remote + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-enterprisemanagement-common + + + com.couplet + couplet-common-security + + + com.couplet + couplet-common-security + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java new file mode 100644 index 0000000..08d8a37 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/DeptServiceFegin.java @@ -0,0 +1,36 @@ +package com.couplet.remote; + +import com.couplet.common.core.constant.ServiceNameConstants; +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.security.annotation.RequiresPermissions; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.domain.SysUser; +import com.couplet.remote.factory.RemoteDeptFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + + +@FeignClient(contextId = "remoteFileService" , value = ServiceNameConstants.SYSTEM_SERVICE,fallbackFactory = RemoteDeptFallbackFactory.class) +public interface DeptServiceFegin { + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + @RequiresPermissions("system:dept:list") + @GetMapping("/list") + public Result list (SysDept dept); + /* + * @param user: + * @return Result> + * @author 付凡芮 + * @description TODO + * @date + * 用户信息集合 + */ + @RequiresPermissions("system:user:list") + @GetMapping("/list") + public Result> list (SysUser user); +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java new file mode 100644 index 0000000..816a3c7 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/src/main/java/com/couplet/remote/factory/RemoteDeptFallbackFactory.java @@ -0,0 +1,35 @@ +package com.couplet.remote.factory; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.core.web.page.TableDataInfo; +import com.couplet.common.system.domain.SysDept; +import com.couplet.common.system.domain.SysUser; +import com.couplet.remote.DeptServiceFegin; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.openfeign.FallbackFactory; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:29 + */ +@Slf4j + +public class RemoteDeptFallbackFactory implements FallbackFactory { + @Override + public DeptServiceFegin create(Throwable cause) { + log.error("sys服务调用失败:{}", cause.getMessage()); + return new DeptServiceFegin() { + @Override + public Result list(SysDept dept) { + return Result.error("调用失败..."+cause.getMessage()); + } + + @Override + public Result> list(SysUser user) { + return Result.error("调用失败..."+cause.getMessage()); + } + }; + } +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml new file mode 100644 index 0000000..a6c658e --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml @@ -0,0 +1,92 @@ + + + 4.0.0 + + com.couplet + couplet-enterprisemanagement + 3.6.3 + + + couplet-enterprisemanagement-server + + + 17 + 17 + UTF-8 + + + + com.couplet + couplet-enterprisemanagement-common + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.couplet + couplet-common-datasource + + + + + com.couplet + couplet-common-datascope + + + + + com.couplet + couplet-common-log + + + + + com.couplet + couplet-common-swagger + + + com.couplet + couplet-enterprisemanagement-remote + + + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java new file mode 100644 index 0000000..ae96763 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java @@ -0,0 +1,28 @@ +package com.couplet.server; + +import com.couplet.common.security.annotation.EnableCustomConfig; +import com.couplet.common.security.annotation.EnableMyFeignClients; +import com.couplet.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author fufanrui + * 启动类 + * @version 1.0 + * @description: TODO + * @date 2024/3/27 14:04 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class CoupleManagementApp { + + public static void main(String[] args) { + + SpringApplication.run(CoupleManagementApp.class, args); + + + } +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java new file mode 100644 index 0000000..d51e9b6 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java @@ -0,0 +1,24 @@ +package com.couplet.server.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:33 + */ +@RestController +@RequestMapping("/manage") +public class ManageController { + + + + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java new file mode 100644 index 0000000..3728604 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java @@ -0,0 +1,9 @@ +package com.couplet.server.service; + +import com.couplet.remote.DeptServiceFegin; +import org.springframework.beans.factory.annotation.Autowired; + +public interface ManageServer { + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java new file mode 100644 index 0000000..51df9a0 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java @@ -0,0 +1,23 @@ +package com.couplet.server.service.impl; + +import com.couplet.remote.DeptServiceFegin; +import com.couplet.server.service.ManageServer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/3/27 15:34 + */ +@Service +public class ManageServiceImpl implements ManageServer { + + + + + + +} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..285745c --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 9222 + +# Spring +spring: + application: + # 应用名称 + name: couplet-enterprisemanagement + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + config: + # 配置中心地址 + server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.couplet.system.mapper: DEBUG diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml new file mode 100644 index 0000000..4940ee0 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/couplet-modules/couplet-enterprisemanagement/pom.xml b/couplet-modules/couplet-enterprisemanagement/pom.xml new file mode 100644 index 0000000..8a9e031 --- /dev/null +++ b/couplet-modules/couplet-enterprisemanagement/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.couplet + couplet-modules + 3.6.3 + + + couplet-enterprisemanagement + pom + + couplet-enterprisemanagement-common + couplet-enterprisemanagement-server + couplet-enterprisemanagement-remote + + + + 17 + 17 + UTF-8 + + + diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index fa968e9..8681657 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index df7344c..c041c96 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index 49763a2..c7dbdbe 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java index da7f6c0..b486bd4 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysDeptController.java @@ -14,12 +14,9 @@ import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import java.util.List; - /** * 部门信息 - * * @author couplet */ @RestController diff --git a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java index f0463f6..4683c96 100644 --- a/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java +++ b/couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysUserServiceImpl.java @@ -61,6 +61,8 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @DataScope(deptAlias = "d", userAlias = "u") public List selectUserList (SysUser user) { + Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + user.setDeptId(deptId); return userMapper.selectUserList(user); } diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index 16f0206..0c29b0b 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 5d1cb7d..6bec145 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -13,6 +13,8 @@ couplet-gen couplet-job couplet-file + couplet-enterprisemanagement + couplet-enterprisemanagement couplet-modules diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index ff11d05..d08106c 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/pom.xml b/pom.xml index 61b166e..5a689a7 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,12 @@ ${couplet.version} + + com.couplet + couplet-enterprisemanagement-common + ${couplet.version} + +