diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java index 79f32f7d1f..5fd9af0bd1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java @@ -83,4 +83,19 @@ public interface ServiceConstant { * 政府端权限服务 */ String GOV_ACCESS_SERVER = "gov-access-server"; + + /** + * 居民端党群议事 + */ + String RESI_HALL_SERVER="resi-hall-server"; + + /** + * 政府端议题管理 + */ + String GOV_ISSUE_SERVER="gov-issue-server"; + + /** + * 政府端项目跟踪（项目管理） + */ + String GOV_PROJECT_SERVER="gov-project-server"; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java index 3e39d03c04..878d3ef1d4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java @@ -1,23 +1,50 @@ package com.epmet.commons.tools.enums; +/** + * @author wxz + * 政府端功能操作權限 + */ public enum RequirePermissionEnum { + /** + * 工作-基层治理-群组管理 + */ WORK_GRASSROOTS_GROUP_AUDITINGLIST("work_grassroots_group_auditinglist", "基层治理:群组管理:待审核列表", "基层治理:群组管理:待审核列表"), WORK_GRASSROOTS_GROUP_AUDIT("work_grassroots_group_audit", "基层治理:群组管理:审核建组", "基层治理:群组管理:审核建组"), WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID("work_grassroots_group_groupsinthegrid", "基层治理:群组管理:本网格小组列表", "基层治理:群组管理:本网格小组列表"), + /** + * 工作-基层治理-居民管理 + */ WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITINGLIST("work_grassroots_resi_warmhearted_auditinglist", "基层治理:居民管理:热心居民待审核列表", "基层治理:居民管理:热心居民待审核列表"), WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST("work_grassroots_resi_warmhearted_audithistorylist", "基层治理:居民管理:热心审核历史", "基层治理:居民管理:热心审核历史"), WORK_GRASSROOTS_RESI_WARMHEARTED_AUDIT("work_grassroots_resi_warmhearted_audit", "基层治理:居民管理:热心居民审核", "基层治理:居民管理:热心居民审核"), + /** + * 工作-基层治理-党员认证 + */ + WORK_PARTYAUTH_AUDITINGLIST("work_partyauth_auditinglist","基层治理:党员认证:待审核列表","基层治理:党员认证:待审核列表"), + WORK_PARTYAUTH_AUDITEDLIST("work_partyauth_auditedlist","基层治理:党员认证:已认证列表","基层治理:党员认证:已认证列表"), + WORK_PARTYAUTH_AUDITHISTORY("work_partyauth_audithistory","基层治理:党员认证:审核历史","基层治理:党员认证:审核历史"), + WORK_PARTYAUTH_AUDITSUBMIT("work_partyauth_auditsubmit","基层治理:党员认证:审核","基层治理:党员认证:审核"), + + /** + * 组织-机关单位 + */ ORG_AGENCY_TRACE("org_agency_trace", "组织:查看上级机关", "组织:查看上级机关"), ORG_AGENCY_UPDATE("org_agency_update", "组织:机关单位:编辑", "组织:机关单位:编辑"), ORG_SUBAGENCY_LIST("org_subagency_list", "组织:下级机关:列表", "组织:下级机关:列表"), ORG_SUBAGENCY_CREATE("org_subagency_create", "组织:下级机关:新增", "组织:下级机关:新增"), ORG_SUBAGENCY_DELETE("org_subagency_delete", "组织:下级机关:删除", "组织:下级机关:删除"), + /** + * 组织-工作人员 + */ ORG_STAFF_DETAIL("org_staff_detail", "组织:工作人员:详情", "组织:工作人员:详情"), ORG_STAFF_LIST("org_staff_list", "组织:工作人员:列表", "组织:工作人员:列表"), ORG_STAFF_CREATE("org_staff_create", "组织:工作人员:新增", "组织:工作人员:新增"), ORG_STAFF_UPDATE("org_staff_update", "组织:工作人员:编辑", "组织:工作人员:编辑"), ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织:工作人员:禁用", "组织:工作人员:禁用"), + /** + * 组织-部门 + */ ORG_DEPARTMENT_LIST("org_department_list", "组织:直属部门:部门列表", "组织:直属部门:部门列表"), ORG_DEPARTMENT_CREATE("org_department_create", "组织:直属部门:新增部门", "组织:直属部门:新增部门"), ORG_DEPARTMENT_UPDATE("org_department_update", "组织:直属部门:编辑部门", "组织:直属部门:编辑部门"), @@ -25,6 +52,9 @@ public enum RequirePermissionEnum { ORG_DEPARTMENT_STAFF_ADD("org_department_staff_add", "组织:直属部门:添加人员", "组织:直属部门:添加人员"), ORG_DEPARTMENT_STAFF_REMOVE("org_department_staff_remove", "组织:直属部门:移除人员", "组织:直属部门:移除人员"), ORG_DEPARTMENT_STAFF_LIST("org_department_staff_list", "组织:直属部门:人员列表", "组织:直属部门:人员列表"), + /** + * 组织-网格 + */ ORG_GRID_LIST("org_grid_list", "组织:治理网格:网格列表", "组织:治理网格:网格列表"), ORG_GRID_CREATE("org_grid_create", "组织:治理网格:新增网格", "组织:治理网格:新增网格"), ORG_GRID_UPDATE("org_grid_update", "组织:治理网格:编辑网格", "组织:治理网格:编辑网格"), diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 8ea1ab36b8..e3c45756f4 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -165,6 +165,15 @@ http://127.0.0.1:8099 + + + lb://resi-hall-server + + + lb://gov-issue-server + + + lb://gov-project-server @@ -224,11 +233,17 @@ lb://gov-grid-server - + lb://gov-access-server - + lb://gov-mine-server + + lb://resi-hall-server + + lb://gov-issue-server + + lb://gov-project-server @@ -287,11 +302,16 @@ lb://resi-partymember-server lb://gov-access-server - lb://gov-mine-server - + lb://gov-grid-server + + lb://resi-hall-server + + lb://gov-issue-server + + lb://gov-project-server diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index f83c45f2f1..112369073e 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -197,6 +197,33 @@ spring: filters: - StripPrefix=1 - CpAuth=true + #居民端党群e事 + - id: resi-hall-server + uri: @gateway.routes.resi-hall-server.uri@ + order: 20 + predicates: + - Path=${server.servlet.context-path}/resi/hall/** + filters: + - StripPrefix=1 + - CpAuth=true + #政府工作端议题管理 + - id: gov-issue-server + uri: @gateway.routes.gov-issue-server.uri@ + order: 21 + predicates: + - Path=${server.servlet.context-path}/gov/issue/** + filters: + - StripPrefix=1 + - CpAuth=true + #政府工作端项目管理 + - id: gov-project-server + uri: @gateway.routes.gov-project-server.uri@ + order: 22 + predicates: + - Path=${server.servlet.context-path}/gov/project/** + filters: + - StripPrefix=1 + - CpAuth=true nacos: discovery: server-addr: @nacos.server-addr@ @@ -307,6 +334,9 @@ epmet: - /gov/grid/** - /gov/mine/** - /gov/access/** + - /resi/hall/** + - /gov/issue/** + - /gov/project/** swaggerUrls: jwt: diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java index 967e9776dd..c520c9bd86 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -47,6 +49,7 @@ public class ResiGroupController { * @return Result> */ @PostMapping("groupsingrid") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_GROUPSINTHEGRID) public Result> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.getGroupsInGrid(formDTO); @@ -71,6 +74,7 @@ public class ResiGroupController { * @Author wangc * @Date 2020.04.20 13:59 **/ + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_AUDITINGLIST) @PostMapping("auditing") public Result> auditing(@LoginUser TokenDto tokenDto, @RequestBody ApplyingGroupsFormDTO applyingGroupsFormDTO){ applyingGroupsFormDTO.setUserId(tokenDto.getUserId()); @@ -100,6 +104,7 @@ public class ResiGroupController { * @Date 2020.04.20 14:25 **/ @PostMapping("approve") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_AUDIT) public Result agreeApplying(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO){ agreeApplyGroupFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(agreeApplyGroupFormDTO); @@ -114,6 +119,7 @@ public class ResiGroupController { * @Date 2020.04.20 14:26 **/ @PostMapping("reject") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_GROUP_AUDIT) public Result disagreeApplying(@LoginUser TokenDto tokenDto, @RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO){ disAgreeApplyGroupFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index c3cacb7575..1ac93d3c4f 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -47,6 +49,7 @@ public class ResiPartyMemberController { * @Date 2020/4/26 16:04 **/ @PostMapping("auditing") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITINGLIST) public Result> auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) { return resiPartyMemberService.auditing(formDTO); } @@ -59,6 +62,7 @@ public class ResiPartyMemberController { * @Date 2020/4/26 23:31 **/ @PostMapping("audited") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY) public Result> audited(@RequestBody AuditedPartyMemberFormDTO formDTO) { return resiPartyMemberService.audited(formDTO); } @@ -72,6 +76,7 @@ public class ResiPartyMemberController { * @CreatedTime 2020/4/26 16:18 */ @PostMapping(value = "/certified") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITEDLIST) public Result> certifiedList(@LoginUser TokenDto tokenDto, @RequestBody CertifiedFormDTO certifiedFormDTO){ return resiPartyMemberService.certifiedList(certifiedFormDTO); } @@ -96,6 +101,7 @@ public class ResiPartyMemberController { * @author zhaoqifeng */ @PostMapping("audit") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITSUBMIT) public Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO) { ValidatorUtils.validateEntity(fromDTO); return resiPartyMemberService.manualConfirmResult(fromDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java index 47181d2db8..d2c5ae81ef 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiWarmheartedController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -35,6 +37,7 @@ public class ResiWarmheartedController { * @param formDTO 参数 * @return */ + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITHISTORYLIST) @PostMapping("audited") public Result> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO) { return resiWarmheartedService.audited(formDTO); @@ -46,6 +49,7 @@ public class ResiWarmheartedController { * @Description 政府端-获取待审核的热心居民申请列表 **/ @PostMapping("auditing") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDITINGLIST) public Result> auditing(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiWarmheartedService.auditing(formDTO); @@ -57,6 +61,7 @@ public class ResiWarmheartedController { * @Description 政府端-热心居民申请-审核通过 **/ @PostMapping("approve") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDIT) public Result approve(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditApproveFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiWarmheartedService.approve(formDTO); @@ -68,6 +73,7 @@ public class ResiWarmheartedController { * @Description 政府端-热心居民申请-审核驳回 **/ @PostMapping("reject") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_RESI_WARMHEARTED_AUDIT) public Result reject(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditRejectFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiWarmheartedService.reject(formDTO); diff --git a/epmet-module/gov-issue/gov-issue-client/pom.xml b/epmet-module/gov-issue/gov-issue-client/pom.xml new file mode 100644 index 0000000000..6b630e83b6 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/pom.xml @@ -0,0 +1,21 @@ + + + + gov-issue + com.epmet + 2.0.0 + + 4.0.0 + + gov-issue-client + + + + com.epmet + epmet-commons-tools + 2.0.0 + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/.gitkeep b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java new file mode 100644 index 0000000000..fc93172558 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 测试入参 + * @Author yinzuomei + * @Date 2020/5/8 10:00 + */ +@Data +public class DemoTestFormDTO implements Serializable { + private static final long serialVersionUID = 4859779755214502427L; + @NotBlank(message = "客户id不能为空") + private String customerId; + @NotBlank(message = "网格id不能为空") + private String gridId; +} + diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/.gitkeep b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-server/Dockerfile b/epmet-module/gov-issue/gov-issue-server/Dockerfile new file mode 100644 index 0000000000..b2cda1b84a --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8101 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/docker-compose.yml b/epmet-module/gov-issue/gov-issue-server/docker-compose.yml new file mode 100644 index 0000000000..95f65aac18 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3.7" +services: + gov-issue-server: + container_name: gov-issue-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-issue-server:0.3.0 + ports: + - "8101:8101" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/dev:/logs" + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml new file mode 100644 index 0000000000..98fa317a75 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -0,0 +1,182 @@ + + + 0.3.0 + + gov-issue + com.epmet + 2.0.0 + + 4.0.0 + + gov-issue-server + jar + + + + com.epmet + gov-issue-client + 2.0.0 + + + com.epmet + epmet-commons-tools + 2.0.0 + + + com.epmet + epmet-commons-mybatis + 2.0.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + org.springframework.boot + spring-boot-starter-actuator + + + de.codecentric + spring-boot-admin-starter-client + ${spring.boot.admin.version} + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + io.github.openfeign + feign-httpclient + 10.3.0 + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + ${project.basedir}/src/main/java + + + true + ${basedir}/src/main/resources + + + + + + + dev-local + + true + + + 8101 + dev + + + + + + epmet_gov_issue_user + EpmEt-db-UsEr + + 0 + 192.168.1.130 + 6379 + 123456 + + false + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + dev + + + 8101 + dev + + + + + + epmet + elink@833066 + + 0 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 6379 + EpmEtrEdIs!q@w + + true + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + + + false + + + + + test + + + 8101 + test + + + + + + epmet + elink@833066 + + 0 + 10.10.10.248 + 6379 + 123456 + + true + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java new file mode 100644 index 0000000000..36764f5de8 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java @@ -0,0 +1,20 @@ +package com.epmet; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +public class GovIssueApplication { + public static void main(String[] args) { + SpringApplication.run(GovIssueApplication.class, args); + } +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..f25688200f --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.commons.tools.config.ModuleConfig; +import org.springframework.stereotype.Service; + +/** + * 模块配置信息-新闻公告模块 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Service +public class ModuleConfigImpl implements ModuleConfig { + @Override + public String getName() { + return "govissue"; + } +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java new file mode 100644 index 0000000000..219426566f --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java @@ -0,0 +1,27 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.DemoTestFormDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; + +/** + * @Description 测试 + * @Author yinzuomei + * @Date 2020/5/7 22:47 + */ +@RestController +@RequestMapping("demo") +public class GovIssueDemoController { + private static final Logger logger = LoggerFactory.getLogger(GovIssueDemoController.class); + + @PostMapping("test") + public Result test(@RequestBody DemoTestFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); + return new Result().ok("gov-issue-server请求成功"); + } +} + diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..bae3f80753 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -0,0 +1,95 @@ +server: + port: @server.port@ + servlet: + context-path: /gov/issue + +spring: + main: + allow-bean-definition-overriding: true + application: + name: gov-issue-server + #环境 dev|test|prod + profiles: + active: dev + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss + redis: + database: @spring.redis.index@ + host: @spring.redis.host@ + port: @spring.redis.port@ + password: @spring.redis.password@ + timeout: 30s + datasource: + druid: + #MySQL + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + cloud: + nacos: + discovery: + server-addr: @nacos.server-addr@ + #nacos的命名空间ID，默认是public + namespace: @nacos.discovery.namespace@ + #不把自己注册到注册中心的地址 + register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ + config: + enabled: @nacos.config-enabled@ + server-addr: @nacos.server-addr@ + namespace: @nacos.config.namespace@ + group: @nacos.config.group@ + file-extension: yaml +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.epmet.entity + global-config: + #数据库相关配置 + db-config: + #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; + id-type: ID_WORKER + #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断" + field-strategy: NOT_NULL + #驼峰下划线转换 + column-underline: true + banner: false + #原生配置 + configuration: + map-underscore-to-camel-case: true + cache-enabled: false + call-setters-on-nulls: true + jdbc-type-for-null: 'null' + +feign: + hystrix: + enabled: true + client: + config: + default: + loggerLevel: BASIC + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..51c1ee1512 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/.gitkeep b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-issue/pom.xml b/epmet-module/gov-issue/pom.xml new file mode 100644 index 0000000000..a562394bb0 --- /dev/null +++ b/epmet-module/gov-issue/pom.xml @@ -0,0 +1,21 @@ + + + + epmet-module + com.epmet + 2.0.0 + + 4.0.0 + + gov-issue + pom + + + gov-issue-client + gov-issue-server + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 6d128501ed..538f30cff2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -18,6 +18,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -58,6 +60,7 @@ public class AgencyController { * @Description 添加组织 */ @PostMapping("addagency") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_CREATE) public Result addAgency(@LoginUser TokenDto tokenDTO, @RequestBody AddAgencyFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); //机构级别是市级以上则市、区县名称可不传值，是区县级以上则区县名称可不传值 @@ -83,7 +86,7 @@ public class AgencyController { * @Description 组织名称编辑 */ @PostMapping("editagency") - //@RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_UPDATE) + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_UPDATE) public Result editAgency(@LoginUser TokenDto tokenDTO, @RequestBody EditAgencyFormDTO formDTO) { formDTO.setUserId(tokenDTO.getUserId()); ValidatorUtils.validateEntity(formDTO); @@ -97,6 +100,7 @@ public class AgencyController { * @Description 删除组织机关 */ @PostMapping("removeagency") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_DELETE) public Result removeAgency(@LoginUser TokenDto tokenDTO, @RequestBody RemoveAgencyFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return agencyService.removeAgency(formDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java index c521ddc15d..7705d1247c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -35,6 +37,7 @@ public class DepartmentController { * @return */ @PostMapping(value = "adddepartmentstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_ADD) public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentStaffFormDTO addDepartmentStaffFormDTO){ return departmentService.addDepartmentStaff(tokenDto,addDepartmentStaffFormDTO); } @@ -46,6 +49,7 @@ public class DepartmentController { * @Description 添加部门 */ @PostMapping("adddepartment") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_CREATE) public Result addDepartment(@LoginUser TokenDto tokenDTO, @RequestBody AddDepartmentFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return departmentService.addDepartment(formDTO); @@ -58,6 +62,7 @@ public class DepartmentController { * @Description 部门信息修改 */ @PostMapping("editdepartment") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_UPDATE) public Result editDepartment(@LoginUser TokenDto tokenDTO, @RequestBody EditDepartmentFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return departmentService.editDepartment(formDTO); @@ -70,6 +75,7 @@ public class DepartmentController { * @Description 删除部门 */ @PostMapping("removedepartment") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_DELETE) public Result removeDepartment(@LoginUser TokenDto tokenDTO, @RequestBody RemoveDepartmentFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return departmentService.removeDepartment(formDTO); @@ -135,6 +141,7 @@ public class DepartmentController { * @Date 2020.04.26 17:09 **/ @PostMapping("removestaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_DEPARTMENT_STAFF_REMOVE) public Result removeStaff(@LoginUser TokenDto tokenDto,@RequestBody CommonDepartmentStaffInfoFormDTO departmentStaffInfoFormDTO){ departmentStaffInfoFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(departmentStaffInfoFormDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index c1d0b48b40..766df22011 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; @@ -41,6 +43,7 @@ public class GridController { * 新建当前机关下的所属网格 */ @PostMapping("addgrid") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_CREATE) public Result addGrid(@LoginUser TokenDto tokenDto, @RequestBody AddGridFormDTO addGridFormDTO){ return customerGridService.addGrid(tokenDto,addGridFormDTO); @@ -50,6 +53,7 @@ public class GridController { * 管理员修改网格信息 */ @PostMapping("editgrid") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_UPDATE) public Result editGrid(@LoginUser TokenDto tokenDto, @RequestBody EditGridFormDTO editGridFormDTO){ return customerGridService.editGrid(tokenDto,editGridFormDTO); @@ -59,6 +63,7 @@ public class GridController { * 删除网格 */ @PostMapping("deletegrid") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_DELETE) public Result deleteGrid(@LoginUser TokenDto tokenDto, @RequestBody DeleteGridFormDTO deleteGridFormDTO){ return customerGridService.deleteGrid(tokenDto,deleteGridFormDTO); } @@ -114,6 +119,7 @@ public class GridController { * @Date 2020.04.26 15:36 **/ @PostMapping("addgridstaffs") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_STAFF_ADD) public Result addGridStaffs(@LoginUser TokenDto tokenDto, @RequestBody CommonGridStaffListFromDTO commonGridStaffListFromDTO){ commonGridStaffListFromDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(tokenDto); @@ -129,6 +135,7 @@ public class GridController { * @Date 2020.04.26 15:36 **/ @PostMapping("removegridstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_STAFF_REMOVE) public Result removeGridStaff(@LoginUser TokenDto tokenDto, @RequestBody CommonGridStaffInfoFormDTO commonGridStaffInfoFormDTO){ commonGridStaffInfoFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(tokenDto); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 1b8f109082..1c46d607ac 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -3,6 +3,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -82,6 +84,7 @@ public class StaffController { * @return Result */ @PostMapping("addstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_CREATE) public Result addStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitFromDTO fromDTO){ ValidatorUtils.validateEntity(fromDTO); return staffService.addStaff(tokenDto, fromDTO); @@ -94,6 +97,7 @@ public class StaffController { * @return Result */ @PostMapping("editstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_UPDATE) public Result editStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitFromDTO fromDTO){ ValidatorUtils.validateEntity(fromDTO); return staffService.editStaff(tokenDto, fromDTO); @@ -117,6 +121,7 @@ public class StaffController { * @return Result */ @PostMapping("disabledstaff") + @RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_FORBIDDEN) public Result disabledStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffInfoFromDTO fromDTO){ return staffService.disabledStaff(tokenDto, fromDTO); } diff --git a/epmet-module/gov-project/gov-project-client/pom.xml b/epmet-module/gov-project/gov-project-client/pom.xml new file mode 100644 index 0000000000..4533eba408 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/pom.xml @@ -0,0 +1,21 @@ + + + + gov-project + com.epmet + 2.0.0 + + 4.0.0 + + gov-project-client + + + + com.epmet + epmet-commons-tools + 2.0.0 + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/.gitkeep b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java new file mode 100644 index 0000000000..fc93172558 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 测试入参 + * @Author yinzuomei + * @Date 2020/5/8 10:00 + */ +@Data +public class DemoTestFormDTO implements Serializable { + private static final long serialVersionUID = 4859779755214502427L; + @NotBlank(message = "客户id不能为空") + private String customerId; + @NotBlank(message = "网格id不能为空") + private String gridId; +} + diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/.gitkeep b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/gov-project-server/Dockerfile b/epmet-module/gov-project/gov-project-server/Dockerfile new file mode 100644 index 0000000000..adb8530981 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8102 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/docker-compose.yml b/epmet-module/gov-project/gov-project-server/docker-compose.yml new file mode 100644 index 0000000000..71d21eb11b --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3.7" +services: + gov-project-server: + container_name: gov-project-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-project-server:0.3.0 + ports: + - "8102:8102" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/dev:/logs" + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml new file mode 100644 index 0000000000..a1329fba1c --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -0,0 +1,182 @@ + + + 0.3.0 + + gov-project + com.epmet + 2.0.0 + + 4.0.0 + + gov-project-server + jar + + + + com.epmet + gov-project-client + 2.0.0 + + + com.epmet + epmet-commons-tools + 2.0.0 + + + com.epmet + epmet-commons-mybatis + 2.0.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + org.springframework.boot + spring-boot-starter-actuator + + + de.codecentric + spring-boot-admin-starter-client + ${spring.boot.admin.version} + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + io.github.openfeign + feign-httpclient + 10.3.0 + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + ${project.basedir}/src/main/java + + + true + ${basedir}/src/main/resources + + + + + + + dev-local + + true + + + 8102 + dev + + + + + + epmet_gov_project_user + EpmEt-db-UsEr + + 0 + 192.168.1.130 + 6379 + 123456 + + false + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + dev + + + 8102 + dev + + + + + + epmet + elink@833066 + + 0 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 6379 + EpmEtrEdIs!q@w + + true + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + + + false + + + + + test + + + 8102 + test + + + + + + epmet + elink@833066 + + 0 + 10.10.10.248 + 6379 + 123456 + + true + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/GovProjectApplication.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/GovProjectApplication.java new file mode 100644 index 0000000000..ad4410f584 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/GovProjectApplication.java @@ -0,0 +1,20 @@ +package com.epmet; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +public class GovProjectApplication { + public static void main(String[] args) { + SpringApplication.run(GovProjectApplication.class, args); + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..f25688200f --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.commons.tools.config.ModuleConfig; +import org.springframework.stereotype.Service; + +/** + * 模块配置信息-新闻公告模块 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Service +public class ModuleConfigImpl implements ModuleConfig { + @Override + public String getName() { + return "govissue"; + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/GovProjectDemoController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/GovProjectDemoController.java new file mode 100644 index 0000000000..e099bd801c --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/GovProjectDemoController.java @@ -0,0 +1,27 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.DemoTestFormDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; + +/** + * @Description 测试 + * @Author yinzuomei + * @Date 2020/5/7 22:47 + */ +@RestController +@RequestMapping("demo") +public class GovProjectDemoController { + private static final Logger logger = LoggerFactory.getLogger(GovProjectDemoController.class); + + @PostMapping("test") + public Result test(@RequestBody DemoTestFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); + return new Result().ok("gov-project-server请求成功"); + } +} + diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..ae86146eac --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -0,0 +1,95 @@ +server: + port: @server.port@ + servlet: + context-path: /gov/project + +spring: + main: + allow-bean-definition-overriding: true + application: + name: gov-project-server + #环境 dev|test|prod + profiles: + active: dev + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss + redis: + database: @spring.redis.index@ + host: @spring.redis.host@ + port: @spring.redis.port@ + password: @spring.redis.password@ + timeout: 30s + datasource: + druid: + #MySQL + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + cloud: + nacos: + discovery: + server-addr: @nacos.server-addr@ + #nacos的命名空间ID，默认是public + namespace: @nacos.discovery.namespace@ + #不把自己注册到注册中心的地址 + register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ + config: + enabled: @nacos.config-enabled@ + server-addr: @nacos.server-addr@ + namespace: @nacos.config.namespace@ + group: @nacos.config.group@ + file-extension: yaml +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.epmet.entity + global-config: + #数据库相关配置 + db-config: + #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; + id-type: ID_WORKER + #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断" + field-strategy: NOT_NULL + #驼峰下划线转换 + column-underline: true + banner: false + #原生配置 + configuration: + map-underscore-to-camel-case: true + cache-enabled: false + call-setters-on-nulls: true + jdbc-type-for-null: 'null' + +feign: + hystrix: + enabled: true + client: + config: + default: + loggerLevel: BASIC + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/resources/db.migration/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..ffab528aab --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/gov-project/pom.xml b/epmet-module/gov-project/pom.xml new file mode 100644 index 0000000000..dd3a07ad8d --- /dev/null +++ b/epmet-module/gov-project/pom.xml @@ -0,0 +1,21 @@ + + + + epmet-module + com.epmet + 2.0.0 + + 4.0.0 + + gov-project + pom + + + gov-project-client + gov-project-server + + + + \ No newline at end of file diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index 025ecabf30..50fdc831c0 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -30,6 +30,9 @@ gov-grid gov-access gov-mine - + resi-hall + gov-issue + gov-project + diff --git a/epmet-module/resi-hall/pom.xml b/epmet-module/resi-hall/pom.xml new file mode 100644 index 0000000000..2342b4fbc5 --- /dev/null +++ b/epmet-module/resi-hall/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + epmet-module + com.epmet + 2.0.0 + + + com.epmet + resi-hall + pom + + + resi-hall-client + resi-hall-server + + \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-client/pom.xml b/epmet-module/resi-hall/resi-hall-client/pom.xml new file mode 100644 index 0000000000..d22d09cceb --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + resi-hall + com.epmet + 2.0.0 + + + resi-hall-client + jar + + + + com.epmet + epmet-commons-tools + 2.0.0 + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-swagger-ui + + + + + ${project.artifactId} + + \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/.gitkeep b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java new file mode 100644 index 0000000000..fc93172558 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/DemoTestFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 测试入参 + * @Author yinzuomei + * @Date 2020/5/8 10:00 + */ +@Data +public class DemoTestFormDTO implements Serializable { + private static final long serialVersionUID = 4859779755214502427L; + @NotBlank(message = "客户id不能为空") + private String customerId; + @NotBlank(message = "网格id不能为空") + private String gridId; +} + diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/.gitkeep b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-hall/resi-hall-server/Dockerfile b/epmet-module/resi-hall/resi-hall-server/Dockerfile new file mode 100644 index 0000000000..a799989bd3 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8100 + +ENTRYPOINT ["java","-Xms32m","-Xmx250m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/docker-compose.yml b/epmet-module/resi-hall/resi-hall-server/docker-compose.yml new file mode 100644 index 0000000000..27f5503f0b --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3.7" +services: + resi-hall-server: + container_name: resi-hall-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-hall-server:0.3.0 + ports: + - "8100:8100" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/dev:/logs" + deploy: + resources: + limits: + cpus: '0.1' + memory: 300M \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml new file mode 100644 index 0000000000..4c3d9cdefc --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -0,0 +1,147 @@ + + + 4.0.0 + 0.3.0 + + resi-hall + com.epmet + 2.0.0 + + + resi-hall-server + jar + + + + com.epmet + resi-hall-client + 2.0.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + org.springframework.boot + spring-boot-starter-actuator + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + io.github.openfeign + feign-httpclient + 10.3.0 + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + ${project.basedir}/src/main/java + + + true + ${basedir}/src/main/resources + + + + + + dev-local + + true + + + 8100 + dev + + + 0 + 192.168.1.130 + 6379 + 123456 + + false + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + dev + + + 8100 + dev + + + 0 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 6379 + EpmEtrEdIs!q@w + + true + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + + + false + + + + + test + + + 8100 + test + + + 0 + 10.10.10.248 + 6379 + 123456 + + true + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/ResiHallApplication.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/ResiHallApplication.java new file mode 100644 index 0000000000..83139e9255 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/ResiHallApplication.java @@ -0,0 +1,23 @@ +package com.epmet; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +public class ResiHallApplication { + + public static void main(String[] args) { + SpringApplication.run(ResiHallApplication.class, args); + } + +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..6b70abf844 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.commons.tools.config.ModuleConfig; +import org.springframework.stereotype.Service; + +/** + * 模块配置信息 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Service +public class ModuleConfigImpl implements ModuleConfig { + @Override + public String getName() { + return "resihall"; + } +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/.gitkeep b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java new file mode 100644 index 0000000000..56c01421a7 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java @@ -0,0 +1,27 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.DemoTestFormDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; + +/** + * @Description 测试 + * @Author yinzuomei + * @Date 2020/5/7 22:47 + */ +@RestController +@RequestMapping("demo") +public class ResiHallDemoController { + private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class); + + @PostMapping("test") + public Result test(@RequestBody DemoTestFormDTO formDTO) { + logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); + ValidatorUtils.validateEntity(formDTO); + return new Result().ok("resi-hall-server请求成功"); + } +} + diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/exception/ModuleErrorCode.java new file mode 100644 index 0000000000..f7aba2c2c7 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/exception/ModuleErrorCode.java @@ -0,0 +1,16 @@ +package com.epmet.exception; + +import com.epmet.commons.tools.exception.ErrorCode; + +/** + * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码 + *

+ * 如：100001001（100001代表模块，001代表业务代码） + *

+ * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public interface ModuleErrorCode extends ErrorCode { + +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/.gitkeep b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/.gitkeep b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/.gitkeep b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/.gitkeep b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/util/ModuleConstant.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/util/ModuleConstant.java new file mode 100644 index 0000000000..4d91a3efe6 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/util/ModuleConstant.java @@ -0,0 +1,5 @@ +package com.epmet.util; + + +public interface ModuleConstant { +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..3552110780 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml @@ -0,0 +1,71 @@ +server: + port: @server.port@ + servlet: + context-path: /resi/hall + +spring: + main: + allow-bean-definition-overriding: true + application: + name: resi-hall-server + #环境 dev|test|prod + profiles: + active: dev + messages: + encoding: UTF-8 + basename: i18n/messages_common + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss + redis: + database: @spring.redis.index@ + host: @spring.redis.host@ + port: @spring.redis.port@ + password: @spring.redis.password@ + timeout: 30s + cloud: + nacos: + discovery: + server-addr: @nacos.server-addr@ + #nacos的命名空间ID，默认是public + namespace: @nacos.discovery.namespace@ + #不把自己注册到注册中心的地址 + register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ + config: + enabled: @nacos.config-enabled@ + server-addr: @nacos.server-addr@ + namespace: @nacos.config.namespace@ + group: @nacos.config.group@ + file-extension: yaml +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + + +feign: + hystrix: + enabled: true + client: + config: + default: + loggerLevel: BASIC + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..ebd85dcb70 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java index 65c557df7e..54dd2f09f7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java @@ -1,8 +1,6 @@ package com.epmet.controller; import com.epmet.commons.mybatis.entity.DataScope; -import com.epmet.commons.tools.annotation.RequirePermission; -import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.GovStaffRoleDTO; @@ -21,13 +19,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - import java.util.ArrayList; import java.util.List; /** - * @return - * 工作人员相关api + * @return 工作人员相关api * @Author wxz * @Description * @Date 2020/4/22 22:44 @@ -44,6 +40,7 @@ public class StaffRoleController { /** * 查询工作人员具有的角色列表 + * * @return */ @PostMapping("staffroles") @@ -63,6 +60,7 @@ public class StaffRoleController { /** * 查询拥有指定角色的用户列表 + * * @param staffRoleFormDTO * @return */ @@ -72,32 +70,32 @@ public class StaffRoleController { ValidatorUtils.validateEntity(staffRoleFormDTO, StaffRoleFormDTO.GetStaffsInRole.class); String roleKey = staffRoleFormDTO.getRoleKey(); String orgId = staffRoleFormDTO.getOrgId(); - List staffRoleDTOS = staffRoleService.listStaffsInRole(roleKey, orgId , DataScope.getDefault()); + List staffRoleDTOS = staffRoleService.listStaffsInRole(roleKey, orgId, DataScope.getDefault()); return new Result>().ok(staffRoleDTOS); } /** + * @return Result * @Description 查询一个员工在指定客户下的角色 * @Param CommonUserFormDTO - * @return Result * @Author wangc * @Date 2020.04.26 13:06 **/ @PostMapping("getcustomerstaffroles") //@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_LIST) - public Result getCustomerStaffRoles(@RequestBody CommonUserFormDTO commonUserFormDTO){ + public Result getCustomerStaffRoles(@RequestBody CommonUserFormDTO commonUserFormDTO) { ValidatorUtils.validateEntity(commonUserFormDTO); return staffRoleService.getStaffRoles(commonUserFormDTO); } /** - * @Description 查找具有特定角色的人员Id(可用) * @param rolesUsersListFormDTO + * @Description 查找具有特定角色的人员Id(可用) * @author wangc * @date 2020.04.29 23:49 - **/ + **/ @PostMapping("specificrolesstaffs") - public Result> specificRolesStaffs(@RequestBody RolesUsersListFormDTO rolesUsersListFormDTO){ + public Result> specificRolesStaffs(@RequestBody RolesUsersListFormDTO rolesUsersListFormDTO) { return staffRoleService.getSpecificRolesStaffs(rolesUsersListFormDTO); } }