diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 68d4ba81a7..01d5a69b93 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -129,6 +129,9 @@ http://localhost:8090 + + + http://localhost:8091 @@ -176,6 +179,8 @@ lb://oper-customize-server lb://oper-crm-server + + lb://oper-crm-server diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index d11f60a706..02ef41965f 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -114,6 +114,14 @@ spring: - Path=${server.servlet.context-path}/oper/crm/** filters: - StripPrefix=1 + #居民端陌生人导览 + - id: resi-guide-server + uri: @gateway.routes.resi-guide-server.uri@ + order: 10 + predicates: + - Path=${server.servlet.context-path}/resi/guide/** + filters: + - StripPrefix=1 nacos: discovery: server-addr: @nacos.server-addr@ @@ -144,6 +152,7 @@ renren: - /activiti/editor-app/** - /oper/customize/** - /oper/crm/** + - /resi/guide/** management: endpoints: web: diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index febc4ba76c..5ab568cb98 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -22,6 +22,7 @@ epmet-demo oper-customize oper-crm + resi-guide diff --git a/epmet-module/resi-guide/pom.xml b/epmet-module/resi-guide/pom.xml new file mode 100644 index 0000000000..87216ffcfc --- /dev/null +++ b/epmet-module/resi-guide/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + com.epmet + epmet-module + 2.0.0 + + + com.epmet + resi-guide + pom + + + resi-guide-client + resi-guide-server + + + diff --git a/epmet-module/resi-guide/resi-guide-client/pom.xml b/epmet-module/resi-guide/resi-guide-client/pom.xml new file mode 100644 index 0000000000..f168e7feea --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-client/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + + com.epmet + resi-guide + 2.0.0 + + + resi-guide-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-guide/resi-guide-client/src/main/java/com/epmet/dto/form/.gitkeep b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/result/.gitkeep b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/result/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml new file mode 100644 index 0000000000..f7f8694547 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -0,0 +1,142 @@ + + + 4.0.0 + + + com.epmet + resi-guide + 2.0.0 + + resi-guide-server + jar + + + + com.epmet + resi-guide-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 + + + + + ${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 + + + 8091 + dev + + + + + + epmet + elink@833066 + + 0 + 122.152.200.70 + 6379 + 123456 + + false + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + test + + + 8091 + test + + + + + + epmet + elink@833066 + + 0 + 122.152.200.70 + 6379 + 123456 + + true + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/ResiGuideApplication.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/ResiGuideApplication.java new file mode 100644 index 0000000000..f0c424d76a --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/ResiGuideApplication.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 ResiGuideApplication { + + public static void main(String[] args) { + SpringApplication.run(ResiGuideApplication.class, args); + } + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..bdc5e33294 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-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 "resiguide"; + } +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/SwaggerConfig.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/SwaggerConfig.java new file mode 100644 index 0000000000..262f1bc07b --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-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-guide/resi-guide-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/exception/ModuleErrorCode.java new file mode 100644 index 0000000000..1206c71b9a --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/exception/ModuleErrorCode.java @@ -0,0 +1,25 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.exception; + + +import com.epmet.commons.tools.exception.ErrorCode; + +/** + * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码 + *

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

+ * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public interface ModuleErrorCode extends ErrorCode { + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java new file mode 100644 index 0000000000..d9f96aa25d --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java @@ -0,0 +1,21 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.utils; + +import com.epmet.commons.tools.constant.Constant; + +/** + * 模块常量 + * + * @author Mark sunlightcs@gmail.com + * @since 1.1.0 + */ +public interface ModuleConstant extends Constant { + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..7127b7a6c2 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml @@ -0,0 +1,102 @@ +server: + port: @server.port@ + servlet: + context-path: /resi/guide + +spring: + application: + name: resi-guide-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.entity + global-config: + #数据库相关配置 + db-config: + #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; + id-type: ID_WORKER + 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 + max-connections: 200 + max-connections-per-route: 50 + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages.properties b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000000..a7091dbb43 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages.properties @@ -0,0 +1 @@ +#Default diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_en_US.properties b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 0000000000..9e895e4281 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_en_US.properties @@ -0,0 +1 @@ +#English diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_zh_CN.properties b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 0000000000..b21fd22eca --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_zh_CN.properties @@ -0,0 +1 @@ +#\u7B80\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_zh_TW.properties b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_zh_TW.properties new file mode 100644 index 0000000000..4433dba45a --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/messages_zh_TW.properties @@ -0,0 +1 @@ +#\u7E41\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation.properties b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation.properties new file mode 100644 index 0000000000..56ca909c46 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation.properties @@ -0,0 +1 @@ +#Default \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_en_US.properties b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_en_US.properties new file mode 100644 index 0000000000..9e895e4281 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_en_US.properties @@ -0,0 +1 @@ +#English diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_zh_CN.properties b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_zh_CN.properties new file mode 100644 index 0000000000..b21fd22eca --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_zh_CN.properties @@ -0,0 +1 @@ +#\u7B80\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_zh_TW.properties b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_zh_TW.properties new file mode 100644 index 0000000000..4433dba45a --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/i18n/validation_zh_TW.properties @@ -0,0 +1 @@ +#\u7E41\u4F53\u4E2D\u6587 diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..6f0e508a90 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +