diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java index 88e16e9b8..8dd54177d 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java @@ -10,6 +10,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.feign.ResourceFeignClient; import com.elink.esua.epdc.commons.tools.security.bo.ResourceBO; +import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; @@ -20,6 +21,7 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ +@Component public class ResourceFeignClientFallback implements ResourceFeignClient { @Override diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index fa1b1bd5b..76a676fcd 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -11,6 +11,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.feign.UserFeignClient; +import org.springframework.stereotype.Component; /** * 用户接口 Fallback @@ -18,6 +19,7 @@ import com.elink.esua.epdc.feign.UserFeignClient; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ +@Component public class UserFeignClientFallback implements UserFeignClient { @Override 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 c3b8c6778..fd54e898c 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 @@ -54,7 +54,6 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpdcDelFlagEnum.NORMAL.value(), metaObject); // 数据权限标志 setFieldValByName(DEPT_ID, deptId, metaObject); - } else { if (user == null) { return; @@ -64,11 +63,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { //创建时间 setFieldValByName(CREATE_DATE, date, metaObject); //创建者所属部门 - if (metaObject.hasGetter(DEPT_ID)) { - if (null == metaObject.getValue(DEPT_ID)) { - setFieldValByName(DEPT_ID, user.getDeptId(), metaObject); - } - } + setInsertFieldValByName(DEPT_ID, user.getDeptId(), metaObject); //更新者 setFieldValByName(UPDATER, user.getId(), metaObject); //更新时间 diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java index dce6e8978..8665147ae 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java @@ -63,4 +63,8 @@ public interface ServiceConstant { * 移动端接口模块 */ String EPDC_APP_SERVER = "epdc-app-server"; + /** + * APP用户模块 + */ + String EPDC_USER_SERVER = "epdc-user-server"; } diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index c10e0c8bf..0c9e9c81c 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -74,6 +74,7 @@ lb://epdc-auth-server + lb://epdc-admin-server lb://epdc-activiti-server @@ -94,6 +95,8 @@ lb://epdc-services-server + lb://epdc-user-server + false @@ -124,6 +127,7 @@ lb://epdc-oss-server lb://epdc-party-server lb://epdc-services-server + lb://epdc-user-server true @@ -154,6 +158,7 @@ lb://epdc-oss-server lb://epdc-party-server lb://epdc-services-server + lb://epdc-user-server true diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java index 2f21a1005..da14350a3 100644 --- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java +++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java @@ -12,6 +12,7 @@ import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.feign.ResourceFeignClient; +import org.springframework.stereotype.Component; /** * 资源接口 Fallback @@ -19,6 +20,7 @@ import com.elink.esua.epdc.feign.ResourceFeignClient; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ +@Component public class ResourceFeignClientFallback implements ResourceFeignClient { @Override diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index 14d6a0e32..ac8e81c47 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -111,7 +111,7 @@ spring: - Path=/services/** filters: - StripPrefix=0 - #生活服务模块 + #移动端接口模块 - id: epdc-app-server uri: @gateway.routes.epdc-app-server.uri@ order: 13 @@ -120,6 +120,14 @@ spring: filters: - StripPrefix=0 - CpAuth=true + #APP用户模块 + - id: epdc-user-server + uri: @gateway.routes.epdc-user-server.uri@ + order: 13 + predicates: + - Path=/app-user/** + filters: + - StripPrefix=0 nacos: discovery: server-addr: @nacos.server-addr@ diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml index 5b6fa3045..22167de71 100644 --- a/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml @@ -43,6 +43,11 @@ epdc-services-client 1.0.0 + + com.esua.epdc + epdc-user-client + 1.0.0 + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml deleted file mode 100644 index 57cb6edb5..000000000 --- a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - update schedule_job set status = #{status} where id in - - #{id} - - - - diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml deleted file mode 100644 index 3683f2ca4..000000000 --- a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml deleted file mode 100644 index 57cb6edb5..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - update schedule_job set status = #{status} where id in - - #{id} - - - - diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml deleted file mode 100644 index 3683f2ca4..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml deleted file mode 100644 index 57cb6edb5..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - update schedule_job set status = #{status} where id in - - #{id} - - - - diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml deleted file mode 100644 index 3683f2ca4..000000000 --- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml deleted file mode 100644 index 57cb6edb5..000000000 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - update schedule_job set status = #{status} where id in - - #{id} - - - - diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml deleted file mode 100644 index 3683f2ca4..000000000 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml deleted file mode 100644 index 57cb6edb5..000000000 --- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - update schedule_job set status = #{status} where id in - - #{id} - - - - diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml deleted file mode 100644 index 3683f2ca4..000000000 --- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml deleted file mode 100644 index 57cb6edb5..000000000 --- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - update schedule_job set status = #{status} where id in - - #{id} - - - - diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml deleted file mode 100644 index 3683f2ca4..000000000 --- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-client/pom.xml new file mode 100644 index 000000000..ead3d8880 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/pom.xml @@ -0,0 +1,15 @@ + + + + epdc-user + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-user-client + jar + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml new file mode 100644 index 000000000..27da1f565 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -0,0 +1,143 @@ + + + + epdc-user + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-user-server + jar + + + + com.esua.epdc + epdc-user-client + 1.0.0 + + + com.esua.epdc + epdc-commons-tools + 1.0.0 + + + com.esua.epdc + epdc-commons-mybatis + 1.0.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + de.codecentric + spring-boot-admin-starter-client + ${spring.boot.admin.version} + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + + + + + + + + dev + + true + + + dev + + 9068 + + 47.104.224.45 + 6379 + elink@888 + + + + + epdc + elink888 + + false + 47.104.224.45:8848 + + + + + test + + test + + 9068 + + 47.104.224.45 + 6379 + elink@888 + + + + + epdc + elink888 + + false + 47.104.224.45:8848 + + + + + prod + + prod + + 9068 + + 47.104.224.45 + 6379 + elink@888 + + + + + epdc + elink888 + + false + 47.104.224.45:8848 + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java new file mode 100644 index 000000000..851d91f25 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * APP用户模块 + * + * @author Mark sunlightcs@gmail.com + * @since 1.1.0 + */ +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +public class UserApplication { + + public static void main(String[] args) { + SpringApplication.run(UserApplication.class, args); + } + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java new file mode 100644 index 000000000..f4d2ecc9d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

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

+ * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.config; + +import com.elink.esua.epdc.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 "user"; + } +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml new file mode 100644 index 000000000..30e59bb36 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml @@ -0,0 +1,65 @@ +server: + port: @server.port@ + servlet: + context-path: /app-user + +spring: + application: + name: epdc-user-server + # 环境 dev|test|prod + profiles: + active: @spring.profiles.active@ + 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: 0 + host: @spring.redis.host@ + timeout: 30s + port: @spring.redis.port@ + password: @spring.redis.password@ + cloud: + nacos: + discovery: + server-addr: @nacos.server-addr@ + register-enabled: @nacos.register-enabled@ + datasource: + druid: + driver-class-name: com.mysql.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + + +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.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' diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_TW.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_en_US.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_CN.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_TW.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..43b52215c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/pom.xml b/esua-epdc/epdc-module/epdc-user/pom.xml new file mode 100644 index 000000000..458822958 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/pom.xml @@ -0,0 +1,20 @@ + + + + epdc-module + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-user + pom + + epdc-user-client + epdc-user-server + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml index d68ea69ef..50d7b61a6 100644 --- a/esua-epdc/epdc-module/pom.xml +++ b/esua-epdc/epdc-module/pom.xml @@ -25,6 +25,7 @@ epdc-neighbor epdc-services epdc-app + epdc-user