From 1064b9d9c551c95ec0847ddc4c164feae63f2a78 Mon Sep 17 00:00:00 2001 From: hosinokamui Date: Tue, 24 Mar 2020 12:15:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?release=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/OperCustomizeConstant.java | 15 +- .../com/epmet/constant/ReginConstant.java | 32 ++-- .../com/epmet/controller/HomeController.java | 24 +-- .../com/epmet/dao/CustomerHomeDetailDao.java | 11 +- .../java/com/epmet/service/HomeService.java | 46 ++--- .../epmet/service/impl/HomeServiceImpl.java | 165 ++++++++---------- .../mapper/CustomerHomeDetailDao.xml | 58 ++---- 7 files changed, 161 insertions(+), 190 deletions(-) rename epmet-module/oper-customize/{oper-customize-client/src/main/java/com/epmet/dto => oper-customize-server/src/main/java/com/epmet}/constant/OperCustomizeConstant.java (55%) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/OperCustomizeConstant.java similarity index 55% rename from epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java rename to epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/OperCustomizeConstant.java index dfddc87a50..20ffd9c3cd 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/OperCustomizeConstant.java @@ -6,7 +6,7 @@ * 版权所有，侵权必究！ */ -package com.epmet.dto.constant; +package com.epmet.constant; /** * 常量 @@ -17,9 +17,18 @@ public interface OperCustomizeConstant { /** * 数据状态-已发布 */ - String STATUS = "0"; + String STATUS_RELEASED = "0"; /** * 数据状态-草稿 */ - String STATUS_ONE = "1"; + String STATUS_DRAFT = "1"; + + /** + * 数据状态-已发布 + */ + Integer STATUS_IS_RELEASED = 0; + /** + * 数据状态-草稿 + */ + Integer STATUS_IS_DRAFT = 1; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginConstant.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginConstant.java index 1a1b1fec32..7d930df883 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginConstant.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginConstant.java @@ -1,19 +1,25 @@ package com.epmet.constant; /** - * @Classname ReginEnum - * @Description 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区 - * @Date 2020/3/17 15:22 - * @Created by yangs + * 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区 + * @date 2020/3/17 15:22 + * @author angs */ public interface ReginConstant { - //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区 - //0.标题区 - String titleList="titleList"; - //1.置顶区 - String topList="topList"; - //2.功能区 - String functionList="functionList"; - //3.悬浮区 - String floatingList="floatingList"; + /** + * 标题区 + */ + String TITLE_LIST ="titleList"; + /** + * 置顶区 + */ + String TOP_LIST ="topList"; + /** + * 功能区 + */ + String FUNCTION_LIST ="functionList"; + /** + * 悬浮区 + */ + String FLOATING_LIST="floatingList"; } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java index e528ed9b83..fbe082019b 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java @@ -2,10 +2,9 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.constant.OperCustomizeConstant; +import com.epmet.constant.OperCustomizeConstant; import com.epmet.dto.form.ComponentListByCustomerFormDTO; import com.epmet.dto.form.CustomerHomeFormDTO; -import com.epmet.dto.form.HomeDesignByCustomerFormDTO; import com.epmet.dto.form.HomeDesignFormDTO; import com.epmet.dto.result.ComponentListByCustomerResultDTO; import com.epmet.dto.result.HomeDesignByCustomerResultDTO; @@ -44,13 +43,15 @@ public class HomeController { /** * @param formDTO * @return com.epmet.commons.tools.utils.Result - * @Author yang - * @Description 获取客户首页配置的设计稿 - * @Date 2020/3/16 13:21 + * @author yang + * @description 获取客户首页配置的设计稿 + * @date 2020/3/16 13:21 **/ @PostMapping("gethomedesignbycustomer") - public Result getHomeDesignByCustomer(@RequestBody HomeDesignByCustomerFormDTO formDTO) { + public Result getHomeDesignByCustomer(@RequestBody CustomerHomeFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); + //草稿数据 + formDTO.setStatus(OperCustomizeConstant.STATUS_DRAFT); return homeService.getHomeDesignByCustomer(formDTO); } @@ -64,8 +65,7 @@ public class HomeController { @PostMapping("savehomedesign") public Result saveHomeDesign(@RequestBody HomeDesignFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - homeService.saveHomeDesign(formDTO); - return new Result(); + return homeService.saveHomeDesign(formDTO); } /** @@ -78,8 +78,7 @@ public class HomeController { @PostMapping("distributehomedesign") public Result distributeHomeDesign(@RequestBody HomeDesignFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - homeService.distributeHomeDesign(formDTO); - return new Result(); + return homeService.distributeHomeDesign(formDTO); } /** @@ -91,8 +90,9 @@ public class HomeController { **/ @PostMapping("gethomereleasebycustomer") public Result getHomeReleaseByCustomer(@RequestBody CustomerHomeFormDTO formDTO) { - formDTO.setStatus(OperCustomizeConstant.STATUS);//已发布数据 + //已发布数据 + formDTO.setStatus(OperCustomizeConstant.STATUS_RELEASED); ValidatorUtils.validateEntity(formDTO); - return homeService.getHomeReleaseByCustomer(formDTO); + return homeService.getHomeDesignByCustomer(formDTO); } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java index 2ad445ea6f..af499fe5d2 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java @@ -19,7 +19,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.CustomerHomeFormDTO; -import com.epmet.dto.form.HomeDesignByCustomerFormDTO; import com.epmet.dto.result.CommonComponentDesignResultDTO; import com.epmet.entity.CustomerHomeDetailEntity; import org.apache.ibatis.annotations.Mapper; @@ -42,14 +41,16 @@ public interface CustomerHomeDetailDao extends BaseDao * @author zhaoqifeng * @date 2020/3/16 14:02 */ - void updateCustomerHomeDetailByHomeId(String homeId); + void deleteCustomerHomeDetailByHomeId(String homeId); + /** * * 根据客户id,所属端获取客户首页配置的设计稿 + * + * @param form 客户参数 + * @return List * @author yangshaoping * @date 2020/3/1714:02 */ - List getCustomerHomeDetailComponent(HomeDesignByCustomerFormDTO form); - - List getHomeReleaseByCustomer(CustomerHomeFormDTO form); + List selectCustomerHomeDetail(CustomerHomeFormDTO form); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java index 375d092f81..c6c1e0771c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java @@ -24,37 +24,43 @@ public interface HomeService { Result getComponentListByCustomer(ComponentListByCustomerFormDTO formDTO); /** - * @param formDTO + * + * 获取客户首页配置的设计稿 + * + * @param formDTO 参数 * @return com.epmet.commons.tools.utils.Result - * @Author yang - * @Description 获取客户首页配置的设计稿 - * @Date 2020/3/16 13:21 + * @author yang + * @date 2020/3/16 13:21 **/ - Result getHomeDesignByCustomer(HomeDesignByCustomerFormDTO formDTO); + Result getHomeDesignByCustomer(CustomerHomeFormDTO formDTO); /** * * 首页设计稿组件上传数据 - * @param: formDTO - * @author: zhaoqifeng - * @date: 2020/03/16 13:49:41 + * + * @param formDTO 参数 + * @return Result + * @author zhaoqifeng + * @date 2020/03/16 13:49:41 */ - void saveHomeDesign(HomeDesignFormDTO formDTO); + Result saveHomeDesign(HomeDesignFormDTO formDTO); /** * * 首页设计稿发版 - * @param: formDTO - * @author: zhaoqifeng - * @date: 2020/03/16 13:49:41 + * + * @param formDTO 参数 + * @return Result + * @author zhaoqifeng + * @date 2020/03/16 13:49:41 */ - void distributeHomeDesign(HomeDesignFormDTO formDTO); + Result distributeHomeDesign(HomeDesignFormDTO formDTO); - /** - * @param formDTO - * @return com.epmet.commons.tools.utils.Result - * @Author sun - * @Description 获取客户首页发布数据 - **/ - Result getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO); +// /** +// * @param formDTO +// * @return com.epmet.commons.tools.utils.Result +// * @Author sun +// * @Description 获取客户首页发布数据 +// **/ +// Result getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java index 68d3faff90..60689d7f01 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java @@ -1,6 +1,8 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.OperCustomizeConstant; import com.epmet.constant.ReginConstant; import com.epmet.dao.CustomerHomeDao; import com.epmet.dao.CustomerHomeDetailDao; @@ -11,136 +13,115 @@ import com.epmet.dto.result.ComponentListByCustomerResultDTO; import com.epmet.dto.result.HomeDesignByCustomerResultDTO; import com.epmet.entity.CustomerHomeDetailEntity; import com.epmet.entity.CustomerHomeEntity; +import com.epmet.service.CustomerHomeDetailService; import com.epmet.service.HomeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; /** - * @Description 客户定制化服务-首页 - * @Author yinzuomei - * @Date 2020/3/11 13:14 + * 客户定制化服务-首页 + * + * @author yinzuomei + * @date 2020/3/11 13:14 */ +@Slf4j @Service public class HomeServiceImpl implements HomeService { - @Autowired - private HomeComponentDao homeComponentDao; - @Autowired - private CustomerHomeDetailDao customerHomeDetailDao; + @Autowired + private HomeComponentDao homeComponentDao; + @Autowired + private CustomerHomeDetailDao customerHomeDetailDao; @Autowired private CustomerHomeDao customerHomeDao; + @Autowired + private CustomerHomeDetailService customerHomeDetailService; - @Override - public Result getComponentListByCustomer(ComponentListByCustomerFormDTO formDTO) { - ComponentListByCustomerResultDTO resultDTO = new ComponentListByCustomerResultDTO(); - resultDTO.setCommonList(homeComponentDao.selectListCommonComponentResultDTO(formDTO)); - resultDTO.setFunctionList(homeComponentDao.selectListFunctionComponentResultDTO(formDTO)); - return new Result().ok(resultDTO); - } - - @Override - public Result getHomeDesignByCustomer(HomeDesignByCustomerFormDTO formDTO) { - HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO(); - //根据客户id,所属端获取客户首页配置的设计稿 - List list = customerHomeDetailDao.getCustomerHomeDetailComponent(formDTO); - List titlelist=new ArrayList(); - List toplist=new ArrayList(); - List functionlist=new ArrayList(); - List floatlist=new ArrayList(); - List usedComponent=new ArrayList<>();//使用过的组件集合 - for(CommonComponentDesignResultDTO c:list){ - usedComponent.add(c.getComponentId()); - //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区 - if(ReginConstant.titleList.equals(c.getRegion())){ - titlelist.add(c); - }else if(ReginConstant.topList.equals(c.getRegion())){ - toplist.add(c); - }else if(ReginConstant.functionList.equals(c.getRegion())){ - functionlist.add(c); - }else if(ReginConstant.floatingList.equals(c.getRegion())){ - floatlist.add(c); - } - } - resultDTO.setTitleList(titlelist); - resultDTO.setTopList(toplist); - resultDTO.setFloatingList(floatlist); - resultDTO.setFunctionList(functionlist); - resultDTO.setUsedComponentIdList(usedComponent); - return new Result().ok(resultDTO); - } + @Override + public Result getComponentListByCustomer(ComponentListByCustomerFormDTO formDTO) { + ComponentListByCustomerResultDTO resultDTO = new ComponentListByCustomerResultDTO(); + resultDTO.setCommonList(homeComponentDao.selectListCommonComponentResultDTO(formDTO)); + resultDTO.setFunctionList(homeComponentDao.selectListFunctionComponentResultDTO(formDTO)); + return new Result().ok(resultDTO); + } @Override - public void saveHomeDesign(HomeDesignFormDTO formDTO) { + public Result getHomeDesignByCustomer(CustomerHomeFormDTO formDTO) { + HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO(); + //根据客户id,所属端获取客户首页配置的设计稿 + List list = customerHomeDetailDao.selectCustomerHomeDetail(formDTO); + List titleList = new ArrayList<>(); + List topList = new ArrayList<>(); + List functionList = new ArrayList<>(); + List floatingList = new ArrayList<>(); + //使用过的组件集合 + List usedComponent = new ArrayList<>(); + for (CommonComponentDesignResultDTO c : list) { + usedComponent.add(c.getComponentId()); + //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区 + if (ReginConstant.TITLE_LIST.equals(c.getRegion())) { + titleList.add(c); + } else if (ReginConstant.TOP_LIST.equals(c.getRegion())) { + topList.add(c); + } else if (ReginConstant.FUNCTION_LIST.equals(c.getRegion())) { + functionList.add(c); + } else if (ReginConstant.FLOATING_LIST.equals(c.getRegion())) { + floatingList.add(c); + } + } + resultDTO.setTitleList(titleList); + resultDTO.setTopList(topList); + resultDTO.setFloatingList(floatingList); + resultDTO.setFunctionList(functionList); + if (OperCustomizeConstant.STATUS_DRAFT.equals(formDTO.getStatus())) { + resultDTO.setUsedComponentIdList(usedComponent); + } + return new Result().ok(resultDTO); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result saveHomeDesign(HomeDesignFormDTO formDTO) { //根据客户ID和所属端类型从客户首页表找到对应的已发布和草稿 List customerHomeList = customerHomeDao.selectCustomerHomeList(formDTO); //只处理草稿的数据 - for(CustomerHomeEntity entity : customerHomeList) { - if (entity.getStatus() == 1) { + for (CustomerHomeEntity entity : customerHomeList) { + if (OperCustomizeConstant.STATUS_IS_DRAFT.equals(entity.getStatus())) { saveCustomerHomeDetail(formDTO, entity); } } + + return new Result(); } @Override - public void distributeHomeDesign(HomeDesignFormDTO formDTO) { + @Transactional(rollbackFor = Exception.class) + public Result distributeHomeDesign(HomeDesignFormDTO formDTO) { //根据客户ID和所属端类型从客户首页表找到对应的已发布和草稿 List customerHomeList = customerHomeDao.selectCustomerHomeList(formDTO); //草稿和模板数据都要处理 - for(CustomerHomeEntity entity : customerHomeList) { + for (CustomerHomeEntity entity : customerHomeList) { saveCustomerHomeDetail(formDTO, entity); } + + return new Result(); } - private void saveCustomerHomeDetail(HomeDesignFormDTO formDTO, CustomerHomeEntity entity) { + private void saveCustomerHomeDetail(HomeDesignFormDTO formDTO, CustomerHomeEntity customerHomeEntity) { //根据homeID清空客户首页详情表中的数据 - customerHomeDetailDao.updateCustomerHomeDetailByHomeId(entity.getId()); + customerHomeDetailDao.deleteCustomerHomeDetailByHomeId(customerHomeEntity.getId()); + + List list = ConvertUtils.sourceToTarget(formDTO.getComponentList(), CustomerHomeDetailEntity.class); //将数据存入客户首页详情表 - for (HomeComponentFormDTO homeComponentForm : formDTO.getComponentList()) { - CustomerHomeDetailEntity customerHomeDetailEntity = new CustomerHomeDetailEntity(); - customerHomeDetailEntity.setHomeId(entity.getId()); - customerHomeDetailEntity.setComponentId(homeComponentForm.getComponentId()); - customerHomeDetailEntity.setRegion(homeComponentForm.getRegion()); - customerHomeDetailEntity.setConfiguration(homeComponentForm.getConfiguration()); - customerHomeDetailEntity.setDemoData(homeComponentForm.getDemoData()); - customerHomeDetailEntity.setDisplayOrder(homeComponentForm.getDisplayOrder()); - customerHomeDetailDao.insert(customerHomeDetailEntity); + customerHomeDetailService.insertBatch(list); - } } - @Override - public Result getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO) { - HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO(); - //根据客户id,所属端获取客户首页配置的设计稿 - List list = customerHomeDetailDao.getHomeReleaseByCustomer(formDTO); - List titlelist=new ArrayList(); - List toplist=new ArrayList(); - List functionlist=new ArrayList(); - List floatlist=new ArrayList(); - //List usedComponent=new ArrayList<>();//使用过的组件集合 - for(CommonComponentDesignResultDTO c:list){ - //usedComponent.add(c.getComponentId()); - //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区 - if(ReginConstant.titleList.equals(c.getRegion())){ - titlelist.add(c); - }else if(ReginConstant.topList.equals(c.getRegion())){ - toplist.add(c); - }else if(ReginConstant.functionList.equals(c.getRegion())){ - functionlist.add(c); - }else if(ReginConstant.floatingList.equals(c.getRegion())){ - floatlist.add(c); - } - } - resultDTO.setTitleList(titlelist); - resultDTO.setTopList(toplist); - resultDTO.setFloatingList(floatlist); - resultDTO.setFunctionList(functionlist); - //resultDTO.setUsedComponentIdList(usedComponent); - return new Result().ok(resultDTO); - } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml index c5695e7ee8..f32a0c63be 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml @@ -18,7 +18,7 @@ - + UPDATE CUSTOMER_HOME_DETAIL set @@ -28,49 +28,17 @@ AND DEL_FLAG = 0 - - SELECT - b.COMPONENT_ID, - c.COMPONENT_NAME, - c.COMPONENT_FRONT_ID, - b.REGION, - b.CONFIGURATION, - b.DEMO_DATA, - b.DISPLAY_ORDER - FROM - ( - SELECT - a.id - FROM - customer_home a - WHERE - a.DEL_FLAG = 0 - AND a.CUSTOMER_ID = #{customerId} - AND a.CLIENT_TYPE = #{clientType} - and a.`STATUS`=1 - ORDER BY - a.CREATED_TIME DESC - LIMIT 1 - ) a - INNER JOIN customer_home_detail b ON a.id = b.HOME_ID - LEFT JOIN home_component c ON b.COMPONENT_ID = c.id - WHERE - b.DEL_FLAG = 0 and c.DEL_FLAG=0 - - - - \ No newline at end of file From abf0965b543a919332c56b3f7906cc33575e3b28 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Wed, 25 Mar 2020 12:55:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/开发规范/命名规范.txt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/doc/开发规范/命名规范.txt b/doc/开发规范/命名规范.txt index 684d4b35ef..439096e23c 100644 --- a/doc/开发规范/命名规范.txt +++ b/doc/开发规范/命名规范.txt @@ -1,19 +1,14 @@ -dao层： +一、controller +1、方法名和接口名一致，改为驼峰式 +二、service层： +2、同controller一致 +三、dao层： 1、结果集是集合用selectListXXX 2、结果集为一个实例用selectOneXXX 3、更新：updateXXX 4、插入：insertXXX 5、删除：deleteXXX 6、获取统计值的方法用 selectCount -service层： -1、结果集是集合：listXXX -2、结果集是一个实例：getXXX -3、插入：saveXXX -5、修改：modifyXXX -4、删除：removeXXX -5、获取统计值的方法用 countXXX -数据传输对象：xxxDTO，xxx 为业务领域相关的名称 -controller层根据接口定义来取名，接口定的什么就取什么 From 79599584d3c45cf915e4297d623d37cd20433a22 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Wed, 25 Mar 2020 15:12:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?redis=E8=BF=9E=E6=8E=A5=E6=94=B9=E4=B8=BA10?= =?UTF-8?q?.10.10.77?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 4 ++-- epmet-auth/pom.xml | 4 ++-- epmet-gateway/pom.xml | 4 ++-- epmet-module/epmet-activiti/epmet-activiti-server/pom.xml | 4 ++-- epmet-module/epmet-demo/epmet-demo-server/pom.xml | 4 ++-- epmet-module/epmet-job/epmet-job-server/pom.xml | 4 ++-- epmet-module/epmet-message/epmet-message-server/pom.xml | 4 ++-- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 4 ++-- epmet-module/gov-org/gov-org-server/pom.xml | 4 ++-- epmet-module/oper-access/oper-access-server/pom.xml | 4 ++-- epmet-module/oper-crm/oper-crm-server/pom.xml | 4 ++-- epmet-module/oper-customize/oper-customize-server/pom.xml | 4 ++-- epmet-module/resi-guide/resi-guide-server/pom.xml | 4 ++-- epmet-module/resi-mine/resi-mine-server/pom.xml | 4 ++-- epmet-user/epmet-user-server/pom.xml | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 773ee4729d..57008f3d6b 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -99,7 +99,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -129,7 +129,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 3d8c615718..bee517a83e 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -123,7 +123,7 @@ 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -157,7 +157,7 @@ 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 960e9c8b7e..d4ab31a087 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -95,7 +95,7 @@ 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -163,7 +163,7 @@ 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index eebb530f54..77c63cce67 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -175,7 +175,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -203,7 +203,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 06fdbd6546..f5069b05a8 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -115,7 +115,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -145,7 +145,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 207e7d95d2..69e393849b 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -112,7 +112,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -142,7 +142,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 195c274f3a..02c764271c 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -135,7 +135,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -162,7 +162,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 49a297e1f5..28570008ee 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -143,7 +143,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -173,7 +173,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 164cf5387f..1ab1be15fe 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -106,7 +106,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -136,7 +136,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 21efec9f84..8df713a550 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -108,7 +108,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -138,7 +138,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index a7d55f5520..8473caf7e8 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -107,7 +107,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -137,7 +137,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index acd7a063cb..c2781bb01a 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -101,7 +101,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -131,7 +131,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 4cf1999e78..213e2aae32 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -119,7 +119,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -149,7 +149,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 6e973e581e..01a62faf8d 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -107,7 +107,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 @@ -137,7 +137,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index f1f3a8cda1..1020d925ff 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -115,7 +115,7 @@ elink@833066 0 - 10.10.10.79 + 10.10.10.77 6379 123456 @@ -145,7 +145,7 @@ elink@833066 0 - 122.152.200.70 + 10.10.10.77 6379 123456 From 30f9bc2e0fd1b1b7485b9724556e9bd18c65e90c Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Fri, 27 Mar 2020 17:11:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?demo=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-demo-server/src/main/resources/bootstrap.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml index 5134667e20..c34d1822b8 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml @@ -6,6 +6,8 @@ server: spring: application: name: epmet-demo-server + main: + allow-bean-definition-overriding: true #环境 dev|test|prod profiles: active: dev From e59f3077edd184c0f2894a73f78d6606d5957885 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Sat, 28 Mar 2020 11:09:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9Eresi-group,resi-partymemb?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 8 + .../src/main/resources/bootstrap.yml | 22 +++ epmet-module/pom.xml | 2 + epmet-module/resi-group/pom.xml | 21 +++ .../resi-group/resi-group-client/pom.xml | 35 ++++ .../resi/group/dto/comment/form/.gitkeep | 0 .../resi/group/dto/comment/result/.gitkeep | 0 .../epmet/resi/group/dto/group/form/.gitkeep | 0 .../resi/group/dto/group/result/.gitkeep | 0 .../epmet/resi/group/dto/member/form/.gitkeep | 0 .../resi/group/dto/member/result/.gitkeep | 0 .../epmet/resi/group/dto/topic/form/.gitkeep | 0 .../resi/group/dto/topic/result/.gitkeep | 0 .../resi-group/resi-group-server/pom.xml | 148 ++++++++++++++++ .../java/com/epmet/ResiGroupApplication.java | 31 ++++ .../com/epmet/config/ModuleConfigImpl.java | 26 +++ .../java/com/epmet/config/SwaggerConfig.java | 68 ++++++++ .../epmet/modules/comment/controller/.gitkeep | 0 .../com/epmet/modules/comment/dao/.gitkeep | 0 .../com/epmet/modules/comment/entity/.gitkeep | 0 .../com/epmet/modules/comment/excel/.gitkeep | 0 .../modules/comment/service/impl/.gitkeep | 0 .../modules/exception/ModuleErrorCode.java | 25 +++ .../com/epmet/modules/feign/fallback/.gitkeep | 0 .../epmet/modules/group/controller/.gitkeep | 0 .../java/com/epmet/modules/group/dao/.gitkeep | 0 .../com/epmet/modules/group/entity/.gitkeep | 0 .../com/epmet/modules/group/excel/.gitkeep | 0 .../epmet/modules/group/service/impl/.gitkeep | 0 .../epmet/modules/member/controller/.gitkeep | 0 .../com/epmet/modules/member/dao/.gitkeep | 0 .../com/epmet/modules/member/entity/.gitkeep | 0 .../com/epmet/modules/member/excel/.gitkeep | 0 .../modules/member/service/impl/.gitkeep | 0 .../epmet/modules/topic/controller/.gitkeep | 0 .../java/com/epmet/modules/topic/dao/.gitkeep | 0 .../com/epmet/modules/topic/entity/.gitkeep | 0 .../com/epmet/modules/topic/excel/.gitkeep | 0 .../epmet/modules/topic/service/impl/.gitkeep | 0 .../epmet/modules/utils/ModuleConstant.java | 30 ++++ .../src/main/resources/bootstrap.yml | 106 +++++++++++ .../main/resources/i18n/messages.properties | 1 + .../resources/i18n/messages_en_US.properties | 1 + .../resources/i18n/messages_zh_CN.properties | 1 + .../resources/i18n/messages_zh_TW.properties | 1 + .../main/resources/i18n/validation.properties | 1 + .../i18n/validation_en_US.properties | 1 + .../i18n/validation_zh_CN.properties | 1 + .../i18n/validation_zh_TW.properties | 1 + .../src/main/resources/logback-spring.xml | 164 ++++++++++++++++++ .../main/resources/mapper/comment/.gitkeep | 0 .../src/main/resources/mapper/group/.gitkeep | 0 .../src/main/resources/mapper/member/.gitkeep | 0 .../src/main/resources/mapper/topic/.gitkeep | 0 epmet-module/resi-partymember/pom.xml | 21 +++ .../resi-partymember-client/pom.xml | 35 ++++ .../partymember/dto/partymember/form/.gitkeep | 0 .../dto/partymember/result/.gitkeep | 0 .../partymember/dto/warmhearted/form/.gitkeep | 0 .../dto/warmhearted/result/.gitkeep | 0 .../resi-partymember-server/pom.xml | 148 ++++++++++++++++ .../com/epmet/ResiPartyMemberApplication.java | 31 ++++ .../com/epmet/config/ModuleConfigImpl.java | 26 +++ .../java/com/epmet/config/SwaggerConfig.java | 68 ++++++++ .../modules/exception/ModuleErrorCode.java | 25 +++ .../com/epmet/modules/feign/fallback/.gitkeep | 0 .../modules/partymember/controller/.gitkeep | 0 .../epmet/modules/partymember/dao/.gitkeep | 0 .../epmet/modules/partymember/entity/.gitkeep | 0 .../epmet/modules/partymember/excel/.gitkeep | 0 .../modules/partymember/service/impl/.gitkeep | 0 .../epmet/modules/utils/ModuleConstant.java | 30 ++++ .../modules/warmhearted/controller/.gitkeep | 0 .../epmet/modules/warmhearted/dao/.gitkeep | 0 .../epmet/modules/warmhearted/entity/.gitkeep | 0 .../epmet/modules/warmhearted/excel/.gitkeep | 0 .../modules/warmhearted/service/impl/.gitkeep | 0 .../src/main/resources/bootstrap.yml | 106 +++++++++++ .../main/resources/i18n/messages.properties | 1 + .../resources/i18n/messages_en_US.properties | 1 + .../resources/i18n/messages_zh_CN.properties | 1 + .../resources/i18n/messages_zh_TW.properties | 1 + .../main/resources/i18n/validation.properties | 1 + .../i18n/validation_en_US.properties | 1 + .../i18n/validation_zh_CN.properties | 1 + .../i18n/validation_zh_TW.properties | 1 + .../src/main/resources/logback-spring.xml | 160 +++++++++++++++++ .../resources/mapper/partymember/.gitkeep | 0 .../resources/mapper/warmhearted/.gitkeep | 0 89 files changed, 1352 insertions(+) create mode 100644 epmet-module/resi-group/pom.xml create mode 100644 epmet-module/resi-group/resi-group-client/pom.xml create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/pom.xml create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/ModuleConfigImpl.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/SwaggerConfig.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/dao/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/excel/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/service/impl/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/excel/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/excel/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/excel/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages.properties create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_en_US.properties create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_zh_CN.properties create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_zh_TW.properties create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation.properties create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_en_US.properties create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_zh_CN.properties create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_zh_TW.properties create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/comment/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/.gitkeep create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/.gitkeep create mode 100644 epmet-module/resi-partymember/pom.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-client/pom.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/pom.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/ModuleConfigImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/SwaggerConfig.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/excel/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages.properties create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_en_US.properties create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_zh_CN.properties create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_zh_TW.properties create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation.properties create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_en_US.properties create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_zh_CN.properties create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_zh_TW.properties create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/.gitkeep create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/.gitkeep diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index d4ab31a087..5421e82774 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -150,6 +150,10 @@ http://127.0.0.1:8093 http://127.0.0.1:8094 + + http://127.0.0.1:8095 + + http://127.0.0.1:8096 @@ -205,6 +209,10 @@ lb://oper-access-server lb://resi-mine-server + + lb://resi-group-server + + lb://resi-partymember-server diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 067ec4dd30..50041b3be2 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -156,6 +156,24 @@ spring: filters: - StripPrefix=1 - CpAuth=true + #居民端楼院校组 + - id: resi-group-server + uri: @gateway.routes.resi-group-server.uri@ + order: 16 + predicates: + - Path=${server.servlet.context-path}/resi/group/** + filters: + - StripPrefix=1 + - CpAuth=true + #党员热心居民 + - id: resi-partymember-server + uri: @gateway.routes.resi-partymember-server.uri@ + order: 17 + predicates: + - Path=${server.servlet.context-path}/resi/partymember/** + filters: + - StripPrefix=1 + - CpAuth=true nacos: discovery: server-addr: @nacos.server-addr@ @@ -193,6 +211,8 @@ renren: - /sys/** - /resi/guide/** - /resi/mine/** + - /resi/group/** + - /resi/partymember/** management: endpoints: web: @@ -256,6 +276,8 @@ epmet: - /resi/guide/stranger/getgridhome - /auth/login/logout - /resi/mine/** + - /resi/group/** + - /resi/partymember/** swaggerUrls: jwt: diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index 4ace2972f1..f48d428c3e 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -25,6 +25,8 @@ gov-org oper-access resi-mine + resi-group + resi-partymember diff --git a/epmet-module/resi-group/pom.xml b/epmet-module/resi-group/pom.xml new file mode 100644 index 0000000000..0630bbdace --- /dev/null +++ b/epmet-module/resi-group/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + com.epmet + epmet-module + 2.0.0 + + + com.epmet + resi-group + pom + + + resi-group-client + resi-group-server + + + diff --git a/epmet-module/resi-group/resi-group-client/pom.xml b/epmet-module/resi-group/resi-group-client/pom.xml new file mode 100644 index 0000000000..47b577fe72 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + + com.epmet + resi-group + 2.0.0 + + + resi-group-client + jar + + + + com.epmet + epmet-commons-tools + 2.0.0 + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-swagger-ui + + + + + ${project.artifactId} + + + diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/.gitkeep b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/.gitkeep b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/.gitkeep b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/.gitkeep b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/.gitkeep b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/.gitkeep b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/.gitkeep b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/.gitkeep b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml new file mode 100644 index 0000000000..aec9ad4f52 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -0,0 +1,148 @@ + + + 4.0.0 + + + com.epmet + resi-group + 2.0.0 + + resi-group-server + jar + + + + com.epmet + resi-group-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 + + true + + + 8095 + dev + + + + + + epmet + elink@833066 + + 0 + 10.10.10.77 + 6379 + 123456 + + false + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + test + + + 8095 + test + + + + + + epmet + elink@833066 + + 0 + 10.10.10.77 + 6379 + 123456 + + true + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java new file mode 100644 index 0000000000..85be2e5128 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +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 ResiGroupApplication { + + public static void main(String[] args) { + SpringApplication.run(ResiGroupApplication.class, args); + } + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..2e5e9d45ee --- /dev/null +++ b/epmet-module/resi-group/resi-group-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 "resigroup"; + } +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/SwaggerConfig.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/SwaggerConfig.java new file mode 100644 index 0000000000..262f1bc07b --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/SwaggerConfig.java @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.commons.tools.constant.Constant; +import io.swagger.annotations.ApiOperation; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.ApiKey; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import java.util.List; + +import static com.google.common.collect.Lists.newArrayList; + +/** + * Swagger配置 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Configuration +@EnableSwagger2 +public class SwaggerConfig implements WebMvcConfigurer { + + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + //加了ApiOperation注解的类，才生成接口文档 + .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) + .paths(PathSelectors.any()) + .build() + .directModelSubstitute(java.util.Date.class, String.class) + .securitySchemes(security()); + + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("人人开源") + .description("模块接口文档") + .termsOfServiceUrl("https://www.renren.io") + .version("1.1.0") + .build(); + } + + private List security() { + return newArrayList( + new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header") + ); + } + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/dao/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/dao/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/excel/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/excel/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/service/impl/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/service/impl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java new file mode 100644 index 0000000000..4daeeb6450 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java @@ -0,0 +1,25 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.modules.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-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/excel/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/excel/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/excel/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/excel/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/excel/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/excel/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java new file mode 100644 index 0000000000..7c826f258c --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.modules.utils; + +import com.epmet.commons.tools.constant.Constant; + +/** + * 模块常量 + * + * @author Mark sunlightcs@gmail.com + * @since 1.1.0 + */ +public interface ModuleConstant extends Constant { + + /** + * tokenDto不能为null userId不能为空 + */ + String USER_NOT_NULL="用户信息不能为空"; + + /** + * 接口只限居民端调用 + */ + String FOR_RESI_CALL="当前接口只限居民端调用"; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..5b182f44a1 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -0,0 +1,106 @@ +server: + port: @server.port@ + servlet: + context-path: /resi/group + +spring: + main: + allow-bean-definition-overriding: true + application: + name: resi-group-server + #环境 dev|test|prod + profiles: + active: dev + messages: + encoding: UTF-8 + basename: i18n/messages,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 + 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 + #指定共享配置，且支持动态刷新 +# ext-config: +# - data-id: datasource.yaml +# group: ${spring.cloud.nacos.config.group} +# refresh: true +# - data-id: common.yaml +# group: ${spring.cloud.nacos.config.group} +# refresh: true +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.epmet.modules.*.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/resi-group/resi-group-server/src/main/resources/i18n/messages.properties b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000000..a7091dbb43 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages.properties @@ -0,0 +1 @@ +#Default diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_en_US.properties b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 0000000000..9e895e4281 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_en_US.properties @@ -0,0 +1 @@ +#English diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_zh_CN.properties b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 0000000000..b21fd22eca --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_zh_CN.properties @@ -0,0 +1 @@ +#\u7B80\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_zh_TW.properties b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_zh_TW.properties new file mode 100644 index 0000000000..4433dba45a --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/messages_zh_TW.properties @@ -0,0 +1 @@ +#\u7E41\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation.properties b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation.properties new file mode 100644 index 0000000000..56ca909c46 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation.properties @@ -0,0 +1 @@ +#Default \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_en_US.properties b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_en_US.properties new file mode 100644 index 0000000000..9e895e4281 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_en_US.properties @@ -0,0 +1 @@ +#English diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_zh_CN.properties b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_zh_CN.properties new file mode 100644 index 0000000000..b21fd22eca --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_zh_CN.properties @@ -0,0 +1 @@ +#\u7B80\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_zh_TW.properties b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_zh_TW.properties new file mode 100644 index 0000000000..4433dba45a --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/i18n/validation_zh_TW.properties @@ -0,0 +1 @@ +#\u7E41\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..2fae9b3cd9 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + 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/resi-group/resi-group-server/src/main/resources/mapper/comment/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/comment/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/pom.xml b/epmet-module/resi-partymember/pom.xml new file mode 100644 index 0000000000..ce86193575 --- /dev/null +++ b/epmet-module/resi-partymember/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + com.epmet + epmet-module + 2.0.0 + + + com.epmet + resi-partymember + pom + + + resi-partymember-client + resi-partymember-server + + + diff --git a/epmet-module/resi-partymember/resi-partymember-client/pom.xml b/epmet-module/resi-partymember/resi-partymember-client/pom.xml new file mode 100644 index 0000000000..58886b71a1 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + + com.epmet + resi-partymember + 2.0.0 + + + resi-partymember-client + jar + + + + com.epmet + epmet-commons-tools + 2.0.0 + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-swagger-ui + + + + + ${project.artifactId} + + + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/.gitkeep b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/.gitkeep b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/.gitkeep b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/.gitkeep b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml new file mode 100644 index 0000000000..f9741d6372 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -0,0 +1,148 @@ + + + 4.0.0 + + + com.epmet + resi-partymember + 2.0.0 + + resi-partymember-server + jar + + + + com.epmet + resi-partymember-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 + + true + + + 8096 + dev + + + + + + epmet + elink@833066 + + 0 + 10.10.10.77 + 6379 + 123456 + + false + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + test + + + 8096 + test + + + + + + epmet + elink@833066 + + 0 + 10.10.10.77 + 6379 + 123456 + + true + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java new file mode 100644 index 0000000000..b5fe00951d --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +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 ResiPartyMemberApplication { + + public static void main(String[] args) { + SpringApplication.run(ResiPartyMemberApplication.class, args); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..8156569be6 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-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 "resipartymember"; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/SwaggerConfig.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/SwaggerConfig.java new file mode 100644 index 0000000000..262f1bc07b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/SwaggerConfig.java @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.commons.tools.constant.Constant; +import io.swagger.annotations.ApiOperation; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.ApiKey; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import java.util.List; + +import static com.google.common.collect.Lists.newArrayList; + +/** + * Swagger配置 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Configuration +@EnableSwagger2 +public class SwaggerConfig implements WebMvcConfigurer { + + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + //加了ApiOperation注解的类，才生成接口文档 + .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) + .paths(PathSelectors.any()) + .build() + .directModelSubstitute(java.util.Date.class, String.class) + .securitySchemes(security()); + + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("人人开源") + .description("模块接口文档") + .termsOfServiceUrl("https://www.renren.io") + .version("1.1.0") + .build(); + } + + private List security() { + return newArrayList( + new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header") + ); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java new file mode 100644 index 0000000000..4daeeb6450 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java @@ -0,0 +1,25 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.modules.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-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java new file mode 100644 index 0000000000..7c826f258c --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.modules.utils; + +import com.epmet.commons.tools.constant.Constant; + +/** + * 模块常量 + * + * @author Mark sunlightcs@gmail.com + * @since 1.1.0 + */ +public interface ModuleConstant extends Constant { + + /** + * tokenDto不能为null userId不能为空 + */ + String USER_NOT_NULL="用户信息不能为空"; + + /** + * 接口只限居民端调用 + */ + String FOR_RESI_CALL="当前接口只限居民端调用"; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/excel/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/excel/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..9e0c0fac96 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -0,0 +1,106 @@ +server: + port: @server.port@ + servlet: + context-path: /resi/partymember + +spring: + main: + allow-bean-definition-overriding: true + application: + name: resi-partymember-server + #环境 dev|test|prod + profiles: + active: dev + messages: + encoding: UTF-8 + basename: i18n/messages,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 + 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 + #指定共享配置，且支持动态刷新 +# ext-config: +# - data-id: datasource.yaml +# group: ${spring.cloud.nacos.config.group} +# refresh: true +# - data-id: common.yaml +# group: ${spring.cloud.nacos.config.group} +# refresh: true +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.epmet.modules.*.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/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages.properties b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000000..a7091dbb43 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages.properties @@ -0,0 +1 @@ +#Default diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_en_US.properties b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 0000000000..9e895e4281 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_en_US.properties @@ -0,0 +1 @@ +#English diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_zh_CN.properties b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 0000000000..b21fd22eca --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_zh_CN.properties @@ -0,0 +1 @@ +#\u7B80\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_zh_TW.properties b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_zh_TW.properties new file mode 100644 index 0000000000..4433dba45a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/messages_zh_TW.properties @@ -0,0 +1 @@ +#\u7E41\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation.properties b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation.properties new file mode 100644 index 0000000000..56ca909c46 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation.properties @@ -0,0 +1 @@ +#Default \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_en_US.properties b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_en_US.properties new file mode 100644 index 0000000000..9e895e4281 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_en_US.properties @@ -0,0 +1 @@ +#English diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_zh_CN.properties b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_zh_CN.properties new file mode 100644 index 0000000000..b21fd22eca --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_zh_CN.properties @@ -0,0 +1 @@ +#\u7B80\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_zh_TW.properties b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_zh_TW.properties new file mode 100644 index 0000000000..4433dba45a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/i18n/validation_zh_TW.properties @@ -0,0 +1 @@ +#\u7E41\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..f91bdce635 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + 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/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/.gitkeep b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/.gitkeep new file mode 100644 index 0000000000..e69de29bb2