From 7c529d0a1fb90ba6fa1242a14d48474dcdac3bc1 Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 4 Sep 2019 14:12:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?oss=E6=96=87=E4=BB=B6=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=83=A8=E7=BD=B2=E5=88=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-oss/epdc-oss-server/pom.xml | 6 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 152 +++++++++++++++++- 3 files changed, 149 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index de8da60d4..a2972ce24 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -132,7 +132,7 @@ epdc - elink888 + elink833066 false 47.104.224.45:8848 @@ -155,9 +155,9 @@ epdc - elink888 + elink833066 - false + true 47.104.224.45:8848 diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml index 276977f08..72f1dfef7 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml @@ -60,7 +60,7 @@ management: mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml #实体扫描,多个package用逗号或者分号分隔 - typeAliasesPackage: io.renren.entity + typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity global-config: #数据库相关配置 db-config: diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/logback-spring.xml index 5deef2105..c6b9811fe 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/logback-spring.xml @@ -1,21 +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 + + - - + + + + + + + + + - - + + + + + + + + + \ No newline at end of file From 8f738a00c7cf470e5521b58aa8e29974324d1388 Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 4 Sep 2019 14:39:27 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8vue=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-cloud-generator/src/main/resources/generator.properties | 2 +- .../src/main/resources/template/Controller.java.vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/renren-cloud-generator/src/main/resources/generator.properties b/renren-cloud-generator/src/main/resources/generator.properties index d04d3682d..4bde9bd4d 100644 --- a/renren-cloud-generator/src/main/resources/generator.properties +++ b/renren-cloud-generator/src/main/resources/generator.properties @@ -3,7 +3,7 @@ main= #\u5305\u540D package=com.elink.esua.epdc -moduleName= +moduleName=news #\u4F5C\u8005 author=yujintao #\u7248\u672C\u53F7 diff --git a/renren-cloud-generator/src/main/resources/template/Controller.java.vm b/renren-cloud-generator/src/main/resources/template/Controller.java.vm index f12a2030d..387cdc696 100644 --- a/renren-cloud-generator/src/main/resources/template/Controller.java.vm +++ b/renren-cloud-generator/src/main/resources/template/Controller.java.vm @@ -43,7 +43,7 @@ import java.util.Map; * @since ${version} ${date} */ @RestController -@RequestMapping("${moduleName}/${pathName}") +@RequestMapping("${pathName}") public class ${className}Controller { @Autowired From f888bfb13f667bc595f4b93e5e83ba27c3ab57fa Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 4 Sep 2019 15:06:59 +0800 Subject: [PATCH 3/6] =?UTF-8?q?redis=E7=BC=93=E5=AD=98=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/SysUserDao.xml | 8 +++++++- .../esua/epdc/commons/tools/security/user/UserDetail.java | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml index 517cd6efa..dc3fcb2cf 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml @@ -23,7 +23,13 @@ diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/user/UserDetail.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/user/UserDetail.java index 96dfd559b..cdd2d2703 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/user/UserDetail.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/user/UserDetail.java @@ -32,6 +32,7 @@ public class UserDetail implements Serializable { private String email; private String mobile; private Long deptId; + private String deptName; private String password; private Integer status; private Integer superAdmin; From a7f425b59bdca1b474a8ca6d6dbc23e47e4e8d06 Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 4 Sep 2019 15:28:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=AC=E7=94=A8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/mybatis/handler/FieldMetaObjectHandler.java | 2 +- .../src/main/resources/template/Entity.java.vm | 2 +- .../src/main/resources/template/ServiceImpl.java.vm | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java index fd54e898c..1a6fbc118 100644 --- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java +++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java @@ -53,7 +53,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { //删除标识 setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpdcDelFlagEnum.NORMAL.value(), metaObject); // 数据权限标志 - setFieldValByName(DEPT_ID, deptId, metaObject); + setInsertFieldValByName(DEPT_ID, deptId, metaObject); } else { if (user == null) { return; diff --git a/renren-cloud-generator/src/main/resources/template/Entity.java.vm b/renren-cloud-generator/src/main/resources/template/Entity.java.vm index 78f0b951e..a2407ccb0 100644 --- a/renren-cloud-generator/src/main/resources/template/Entity.java.vm +++ b/renren-cloud-generator/src/main/resources/template/Entity.java.vm @@ -42,7 +42,7 @@ public class ${className}Entity extends BaseEpdcEntity { private static final long serialVersionUID = 1L; #foreach ($column in $columns) -#if($column.columnName != 'ID' && $column.columnName != 'CREATED_TIME' && $column.columnName != 'CREATED_BY' && $column.columnName != 'UPDATED_TIME' && $column.columnName != 'UPDATED_BY' && $column.columnName != 'DEL_FLAG') +#if($column.columnName != 'ID' && $column.columnName != 'CREATED_TIME' && $column.columnName != 'CREATED_BY' && $column.columnName != 'UPDATED_TIME' && $column.columnName != 'UPDATED_BY' && $column.columnName != 'DEL_FLAG' && $column.columnName != 'REVISION') /** * $column.comments */ diff --git a/renren-cloud-generator/src/main/resources/template/ServiceImpl.java.vm b/renren-cloud-generator/src/main/resources/template/ServiceImpl.java.vm index 90258609d..e0e34c5a3 100644 --- a/renren-cloud-generator/src/main/resources/template/ServiceImpl.java.vm +++ b/renren-cloud-generator/src/main/resources/template/ServiceImpl.java.vm @@ -19,7 +19,6 @@ package ${package}.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import ${main}.commons.mybatis.enums.EpdcDelFlagEnum; import ${main}.commons.mybatis.service.impl.BaseServiceImpl; import ${main}.commons.tools.page.PageData; import ${main}.commons.tools.utils.ConvertUtils; @@ -70,8 +69,7 @@ public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${ String id = (String)params.get(FieldConstant.ID_HUMP); QueryWrapper<${className}Entity> wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) - .eq(FieldConstant.DEL_FLAG, EpdcDelFlagEnum.NORMAL.value()); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @@ -99,9 +97,7 @@ public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${ @Override @Transactional(rollbackFor = Exception.class) public void delete(String[] ids) { - //逻辑删除 - //logicDelete(ids, ${className}Entity.class); - //物理删除 + // 逻辑删除(@TableLogic 注解) baseDao.deleteBatchIds(Arrays.asList(ids)); } From 699d519429f75b60d6fae4ec60f1f7ca77e9495d Mon Sep 17 00:00:00 2001 From: rongchao Date: Wed, 4 Sep 2019 16:27:46 +0800 Subject: [PATCH 5/6] sql --- esua-epdc/db/newupdate.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 esua-epdc/db/newupdate.sql diff --git a/esua-epdc/db/newupdate.sql b/esua-epdc/db/newupdate.sql new file mode 100644 index 000000000..43ca54f6e --- /dev/null +++ b/esua-epdc/db/newupdate.sql @@ -0,0 +1,3 @@ +------------- 2019-09-04 -------------------- +ALTER TABLE esua_epdc_admin.sys_dept ADD type_key varchar(50) NULL COMMENT '机构类型键值'; +ALTER TABLE esua_epdc_admin.sys_dept ADD type_name varchar(50) NULL COMMENT '机构类型名称'; From 9dd577a05579d1280e76850d46897240340e0335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Wed, 4 Sep 2019 17:02:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/PartyMembersDTO.java | 2 ++ .../controller/PartyMembersController.java | 2 +- .../esua/epdc/dao/PartyTagRelationDao.java | 7 ++++-- .../epdc/service/PartyTagRelationService.java | 5 +++- .../service/impl/PartyMembersServiceImpl.java | 15 +++++++++--- .../impl/PartyTagRelationServiceImpl.java | 5 ++++ .../main/resources/mapper/PartyMembersDao.xml | 3 +++ .../resources/mapper/PartyTagRelationDao.xml | 23 +++++++++++++++++++ 8 files changed, 55 insertions(+), 7 deletions(-) create mode 100755 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java index 9df45cd5f..768fa00d2 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java @@ -36,6 +36,8 @@ public class PartyMembersDTO implements Serializable { private String tagIds; + private String[] tagIdsNew; + private String tagName; private String id; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index c18a36440..4269632ba 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java @@ -59,7 +59,7 @@ public class PartyMembersController { @GetMapping("{id}") public Result get(@PathVariable("id") String id){ PartyMembersDTO data = partyMembersService.get(id); - + data.setTagIdsNew(data.getTagIds().split(",")); return new Result().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java index 8329ec861..8b9671825 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyTagRelationDao.java @@ -29,5 +29,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PartyTagRelationDao extends BaseDao { - -} \ No newline at end of file + + void deleteByPartyId(String partyId); + + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java index 2a82e316e..1f9bb16e5 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyTagRelationService.java @@ -44,4 +44,7 @@ public interface PartyTagRelationService extends BaseService and pm.REAL_NAME = #{realName} @@ -100,6 +102,7 @@ and pm.ID = partytag.PARTY_ID and pm.ID = #{id} and pm.DEL_FLAG = '0' + and partytag.DEL_FLAG = '0' diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml new file mode 100755 index 000000000..c559c0dbb --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyTagRelationDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + UPDATE epdc_party_tag_relation SET DEL_FLAG = '1' WHERE PARTY_ID = #{partyId} + + + +