diff --git a/README.md b/README.md index 60f43324ec93aa02f9dc83dc0f9d4cb6866535b3..2773472df4527cc88df3f7df4464e796d4416bfe 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,6 @@ ### 搭建步骤 > Docker环境部署 +- 启动本项目docker命令参考：[启动本项目docker命令](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker_neuray_pm.md))； - 在VirtualBox或其他环境中安装CenterOs7.6; -- Docker环境的安装请参考：[开发者必备Docker命令](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker.md)； -- 本项目Docker镜像构建请参考：[使用Maven插件为SpringBoot应用构建Docker镜像](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker_maven.md)； -- 本项目在Docker容器下的部署请参考：[mall在Linux环境下的部署（基于Docker容器）](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker_file.md)； -- 本项目使用Docker Compose请参考： [mall在Linux环境下的部署（基于Docker Compose）](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker_compose.md)。 +- Docker环境的安装请参考：[开发者必备Docker命令](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker.md) diff --git a/docs/docker/docker_neuray_pm.md b/docs/docker/docker_neuray_pm.md new file mode 100644 index 0000000000000000000000000000000000000000..cfaeff5683e89ef4d48713849d6da623ef6b645d --- /dev/null +++ b/docs/docker/docker_neuray_pm.md @@ -0,0 +1,33 @@ +## 启动注册中心 + docker run -p 8070:8070 --name neuray-pm-center \ + -v /etc/localtime:/etc/localtime \ + -v /neuray-pm/logs/neuray-pm-center/logs:/var/logs \ + -d 44b0af5e0606 +## 启动鉴权中心 + docker run -p 8071:8071 --name neuray-pm-auth \ + -v /etc/localtime:/etc/localtime \ + -v /neuray-pm/logs/neuray-pm-auth/logs:/var/logs \ + -d b1be51daf91e +## 启动网关 + docker run -p 8072:8072 --name neuray-pm-gate \ + -v /etc/localtime:/etc/localtime \ + -v /neuray-pm/logs/neuray-pm-gate/logs:/var/logs \ + -d d87ab76050f6 +## 启动代码生成服务 + docker run -p 8073:8073 --name neuray-pm-code \ + -v /etc/localtime:/etc/localtime \ + -v /neuray-pm/logs/neuray-pm-code/logs:/var/logs \ + -d 6adb2f61703c +## 启动人员管理服务 + docker run -p 8081:8081 --name neuray-pm-admin \ + -v /etc/localtime:/etc/localtime \ + -v /neuray-pm/logs/neuray-pm-admin/logs:/var/logs \ + -d 43085cbb69ee + + +> 查看容器动态日志。 + + docker logs -f -t --tail 10 docker_id +> 关键字删除镜像。 + +docker rmi --force `docker images | grep doss-api | awk '{print $3}'` //其中doss-api为关键字 diff --git a/neuray-pm-base-server/base-auth/auth-server/pom.xml b/neuray-pm-base-server/base-auth/auth-server/pom.xml index 0442c9c4cdef33c2a36e8d54ab54cccbebcf3f21..20f8793cb42f721ddaf73a655311d61ec5345ec1 100644 --- a/neuray-pm-base-server/base-auth/auth-server/pom.xml +++ b/neuray-pm-base-server/base-auth/auth-server/pom.xml @@ -31,11 +31,6 @@ spring-cloud-starter-openfeign - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - org.springframework.cloud spring-cloud-starter-zipkin @@ -119,6 +114,19 @@ 1.0-SNAPSHOT + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + 2.0.0.RELEASE + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + 2.0.0.RELEASE + neuray-pm-auth diff --git a/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/BaseAuthBootstrap.java b/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/BaseAuthBootstrap.java index 9ffe87359219948d7d704407a974ddbf5b0059d2..f3e05a7a1778f9d6bc33efbc1fa606a1fddd1ace 100644 --- a/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/BaseAuthBootstrap.java +++ b/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/BaseAuthBootstrap.java @@ -5,7 +5,7 @@ import com.gitee.neuray.security.common.config.DruidConfig; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Import; @@ -17,10 +17,10 @@ import org.springframework.context.annotation.Import; * @des */ @SpringBootApplication -@EnableEurekaClient @EnableFeignClients @MapperScan("com.gitee.neuray.security.auth.mapper") @Import(DruidConfig.class) +@EnableDiscoveryClient //@RemoteApplicationEventScan(basePackages = "com.gitee.neuray.security.auth.common.event") public class BaseAuthBootstrap { public static void main(String[] args) { diff --git a/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml index f844e735a1a29334de01cfb1dbfaf39b17693b39..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml @@ -1,125 +0,0 @@ -spring: - application: - name: neuray-pm-auth - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - default-property-inclusion: non_null - redis: - database: 1 - #需要修改地址 - host: ${REDIS_HOST:192.168.1.205} - port: ${REDIS_PORT:6379} - pool: - max-active: 200 - password: 123456 - datasource: - name: test - url: jdbc:oracle:thin:@${ORACLE_HOST:192.168.1.205}:${ORACLE_PORT:5566}:arltr - username: NeurayPM_Auth - password: NeurayPM_Auth - # 使用druid数据源 - type: com.alibaba.druid.pool.DruidDataSource -# driver-class-name: com.mysql.jdbc.Driver - driver-class-name: oracle.jdbc.OracleDriver - druid: - max-active: 18 - initial-size: 3 - min-idle: 3 - max-wait: 250000 - time-between-eviction-runs-millis: 250000 - min-evictable-idle-time-millis: 120000 - validation-query: select 'x' from dual - test-while-idle: true - test-on-borrow: false - test-on-return: false - max-open-prepared-statements: 20 - filter: stat,wall,log4j - sleuth: - sampler: - percentage: 1 - - -mybatis: - basepackage: com.gitee.neuray.security.auth.mapper - xmlLocation: classpath:mapper/**/*.xml - mapper-locations: "classpath*:mapper/*.xml" - -server: - port: 8071 #启动端口 - -feign: - httpclient: - enabled: false - okhttp: - enabled: true - -ribbon: - eureka: - enabled: true - ReadTimeout: 30000 - ConnectTimeout: 30000 - MaxAutoRetries: 0 - MaxAutoRetriesNextServer: 1 - OkToRetryOnAllOperations: false - -hystrix: - threadpool: - default: - coreSize: 10000 ##并发执行的最大线程数，默认10 - maxQueueSize: 10000 ##BlockingQueue的最大队列数 - queueSizeRejectionThreshold: 5000 ##即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝 - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 60000 - -eureka: - instance: - statusPageUrlPath: /actuator/info - healthCheckUrlPath: /actuator/health - # docker 部署开启 -# prefer-ip-address: true -# ip-address: 127.0.0.1 - client: - serviceUrl: - # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ - ###向注册中心上注册自己 - register-with-eureka: true - ###是否需要从eureka上获取注册信息 - fetch-registry: true - - - -jwt: - token-header: Authorization - ###jwt的存在时间设置为无限期 - expire: 7200 - rsa-secret: xx1WET12^%3^(WE45 - -client: - id: neuray-pm-auth - secret: 123456 - token-header: client-token - expire: 14400 - rsa-secret: x2318^^(*WRYQWR(QW&T -####新增用户时的默认密码 -auth: - user: - defaultPassword: 123456 -##druid数据库连接池管理页面配置 -druid: - enabled: true - ###允许登录的白名单 - whiteip: 127.0.0.1 - ###不允许登录的黑名单 - blackip: 192.168.1.1 - loginUsername: admin - loginPassword: 123456 -sys: - username: larksys - password: larksys - orgcode: '0010000103' diff --git a/neuray-pm-base-server/base-auth/auth-server/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000000000000000000000000000000000..a96d6692d07ffec321d6d1db7bada87294d95128 --- /dev/null +++ b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/bootstrap.yml @@ -0,0 +1,16 @@ +server: + port: 8071 +spring: + application: + name: neuray-pm-auth + cloud: + nacos: + discovery: + server-addr: 192.168.1.205:8848 + heart-beat-interval: 10000 + config: + server-addr: 192.168.1.205:8848 + group: NEURAY-PM-AUTH + fileExtension: yaml + + diff --git a/neuray-pm-base-server/base-center/pom.xml b/neuray-pm-base-server/base-center/pom.xml deleted file mode 100644 index 972fcf5faeafa005b82b52157b97e8a0b108452f..0000000000000000000000000000000000000000 --- a/neuray-pm-base-server/base-center/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - neuray-pm-base-server - com.gitee.neuray.security - 1.0-SNAPSHOT - - 4.0.0 - - base-center - - 1.5.12 - - - - - org.springframework.cloud - spring-cloud-netflix-eureka-server - - - org.springframework.cloud - spring-cloud-starter - - - - neuray-pm-center - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - diff --git a/neuray-pm-base-server/base-center/src/main/java/com/gitee/neuray/security/center/BaseCenterBootstrap.java b/neuray-pm-base-server/base-center/src/main/java/com/gitee/neuray/security/center/BaseCenterBootstrap.java deleted file mode 100644 index bb73bff9ac3e405a1d5f8581fc8987f4c1cb4005..0000000000000000000000000000000000000000 --- a/neuray-pm-base-server/base-center/src/main/java/com/gitee/neuray/security/center/BaseCenterBootstrap.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.gitee.neuray.security.center; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; - -/** - * 东睿设计组 - */ -@EnableEurekaServer //启动一个服务注册中心提供给其他应用进行对话 -@SpringBootApplication -public class BaseCenterBootstrap { - public static void main(String[] args) { - SpringApplication.run(BaseCenterBootstrap.class, args); - } -} diff --git a/neuray-pm-base-server/base-center/src/main/resources/application.yml b/neuray-pm-base-server/base-center/src/main/resources/application.yml deleted file mode 100644 index 683aaa8c84675f9dd4bf5a41703ffc09420a7a1e..0000000000000000000000000000000000000000 --- a/neuray-pm-base-server/base-center/src/main/resources/application.yml +++ /dev/null @@ -1,13 +0,0 @@ -spring: - application: - name: neuray-pm-center - -server: - port: 8070 #启动端口 - -eureka: - client: - registerWithEureka: false #false:不作为一个客户端注册到注册中心 - fetchRegistry: false #为true时，可以启动，但报异常：Cannot execute request on any known server - service-url: - defaultZone: http://127.0.0.1:8070/eureka diff --git a/neuray-pm-base-server/base-code-generator/pom.xml b/neuray-pm-base-server/base-code-generator/pom.xml index 4cd16e3866bef2fe2e34ec71d1832c1ac83e02f7..d028b5509a35e008567aeee9faf98d0d9e20946a 100644 --- a/neuray-pm-base-server/base-code-generator/pom.xml +++ b/neuray-pm-base-server/base-code-generator/pom.xml @@ -93,9 +93,18 @@ neuray-pm-common 1.0-SNAPSHOT + + - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + 2.0.0.RELEASE + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + 2.0.0.RELEASE com.gitee.neuray.security diff --git a/neuray-pm-base-server/base-code-generator/src/main/resources/application.yml b/neuray-pm-base-server/base-code-generator/src/main/resources/application.yml index 3cff34b7c9f241fd6cf471f0dbacafe34a0385f8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-code-generator/src/main/resources/application.yml @@ -1,62 +0,0 @@ -server: - port: 8073 - servlet: - context-path: /code - - -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - #MySQL配置 -# driverClassName: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:3306/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai -# username: renren -# password: 123456 - #oracle配置 - driverClassName: oracle.jdbc.OracleDriver - url: jdbc:oracle:thin:@192.168.1.205:5566:arltr - username: NeurayPM - password: NeurayPM - #SQLServer配置 -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://192.168.10.10:1433;DatabaseName=renren_security -# username: sa -# password: 123456 - #PostgreSQL配置 -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://192.168.10.10:5432/renren_security -# username: postgres -# password: 123456 - jackson: - time-zone: GMT+8 - date-format: yyyy-MM-dd HH:mm:ss - default-property-inclusion: non_null - resources: - static-locations: classpath:/static/,classpath:/views/ - application: - name: neuray-pm-code - - - -mybatis: - mapperLocations: classpath:mapper/**/*.xml - - -pagehelper: - reasonable: true - supportMethodsArguments: true - params: count=countSql - - -#指定数据库，可选值有【mysql、oracle、sqlserver、postgresql】 -air: - database: oracle - -auth: - serviceId: neuray-pm-auth - user: - token-header: Authorization - client: - token-header: client-token - id: neuray-pm-code #不填则默认读取spring.application.name - secret: 123456 diff --git a/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml index 5c98689e495f1bc2d10a13d117b7f6bada097c05..6f3c3115ed7ae38c64489fcf47933c4c68642694 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml @@ -1,32 +1,13 @@ -eureka: - instance: - statusPageUrlPath: /actuator/info - healthCheckUrlPath: /actuator/health - home-page-url-path: / - # docker 部署开启 -# prefer-ip-address: true -# ip-address: 127.0.0.1 - client: - serviceUrl: - # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ - ###向注册中心上注册自己 - register-with-eureka: true - ###是否需要从eureka上获取注册信息 - fetch-registry: true - -#请求和响应GZIP压缩支持 -feign: - httpclient: - enabled: false - okhttp: - enabled: true - compression: - request: - enabled: true - mime-types: text/xml,application/xml,application/json - min-request-size: 2048 - response: - enabled: true - hystrix: - enabled: true +server: + port: 8073 +spring: + application: + name: neuray-pm-code + cloud: + nacos: + discovery: + server-addr: 192.168.1.205:8848 + config: + server-addr: 192.168.1.205:8848 + group: NEURAY-PM-CODE + fileExtension: yaml diff --git a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml index 1c3f7ec2368dede46745176486502270aec6bd5f..5e78b28d1c3444341e24b3ed9c1eb1868c0319b7 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml +++ b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml @@ -47,10 +47,6 @@ org.springframework.cloud spring-cloud-starter-openfeign - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - org.springframework.cloud @@ -76,6 +72,19 @@ feign-jackson 8.18.0 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + 2.0.0.RELEASE + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + 2.0.0.RELEASE + neuray-gateway diff --git a/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/application.yml b/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/application.yml index e3ee341f812125909cda30d5e21d0900a7d372a0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/application.yml @@ -1,99 +0,0 @@ -spring: - application: - name: neuray-pm-gate - thymeleaf: - mode: LEGACYHTML5 - cache: false - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - default-property-inclusion: non_null - redis: - database: 1 - #需要修改地址 - # host: 10.11.24.5 - host: 192.168.1.205 - jedis: - pool: - max-active: 200 - password: 123456 - sleuth: - sampler: - percentage: 1 - zuul: - enabled: true -server: - port: 8072 #启动端口 - -# -zuul: - ignored-services: "*" - sensitive-headers: #默认过滤所有的请求头，为空则放行所有的请求头 - prefix: /api #为zuul设置一个公共的前缀 - ratelimit: # 网关限流 - key-prefix: gate_rate - enabled: true - repository: REDIS #REDIS, JPA, IN_MEMORY - behind-proxy: true - default-policy: #optional - will apply unless specific policy exists - limit: 2000 - refresh-interval: 60 #default value (in seconds) - type: #optional - - user - - origin - - url - routes: - back: - path: /admin/** - serviceId: neuray-pm-admin - - auth: - path: /auth/** - serviceId: neuray-pm-auth - - code: - path: /generator/** - serviceId: neuray-pm-code - -ribbon: - eureka: - enabled: true - ReadTimeout: 30000 - ConnectTimeout: 30000 - MaxAutoRetries: 0 - MaxAutoRetriesNextServer: 1 - OkToRetryOnAllOperations: false - httpclient: - enabled: false - okhttp: - enabled: true - - -hystrix: - threadpool: - default: - coreSize: 10000 ##并发执行的最大线程数，默认10 - maxQueueSize: 10000 ##BlockingQueue的最大队列数 - queueSizeRejectionThreshold: 5000 ##即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝 - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 200000 - strategy: SEMAPHORE - - -gate: - ignore: - startWith: /static,/auth/jwt,/admin/org/tree,/admin/org/orgUsers,/admin/org/user,/admin/api - - -auth: - serviceId: neuray-pm-auth - user: - token-header: Authorization - client: - token-header: client-token - id: neuray-pm-gate #不填则默认读取spring.application.name - secret: 123456 diff --git a/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml index b8789d63a562add4d1f3effdfdd317b45a2625d0..6f41da64078f2500e4f088311d4286b4eec5eb0c 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml @@ -1,32 +1,15 @@ -eureka: - instance: - statusPageUrlPath: /actuator/info - healthCheckUrlPath: /actuator/health - home-page-url-path: / - # docker 部署开启 -# prefer-ip-address: true -# ip-address: 127.0.0.1 - client: - serviceUrl: - # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ - ###向注册中心上注册自己 - register-with-eureka: true - ###是否需要从eureka上获取注册信息 - fetch-registry: true +server: + port: 8072 +spring: + application: + name: neuray-pm-gate + cloud: + nacos: + discovery: + server-addr: 192.168.1.205:8848 + heart-beat-interval: 10000 + config: + server-addr: 192.168.1.205:8848 + group: NEURAY-PM-GATE + fileExtension: yaml -#请求和响应GZIP压缩支持 -feign: - httpclient: - enabled: false - okhttp: - enabled: true - compression: - request: - enabled: true - mime-types: text/xml,application/xml,application/json - min-request-size: 2048 - response: - enabled: true - hystrix: - enabled: true diff --git a/neuray-pm-base-server/pom.xml b/neuray-pm-base-server/pom.xml index 45d13284a11a207b1853471e214331cee2445b88..cfe30c6effd13fb209e312b8a3f23db47d29af3f 100644 --- a/neuray-pm-base-server/pom.xml +++ b/neuray-pm-base-server/pom.xml @@ -14,7 +14,6 @@ base-auth base-gateway - base-center base-code-generator base-dfsfile-client diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/ServiceAdminBootstrap.java b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/ServiceAdminBootstrap.java index a1529c40a5919951cd06815115b00d1aa2da0c93..8e46c1471fa935d8ac3fa582e446c0694974482e 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/ServiceAdminBootstrap.java +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/ServiceAdminBootstrap.java @@ -10,7 +10,6 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; @@ -23,7 +22,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * @author 协同设计小组 * @create 2017-05-25 12:44 */ -@EnableEurekaClient @EnableDiscoveryClient @EnableCircuitBreaker @SpringBootApplication diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml index b05380e11f314b139e28b2244967038061f0d78f..b880af1634f5265c0ea35a1f7e4239db2d7fd061 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml @@ -3,8 +3,6 @@ logging: # tk.mybatis: DEBUG com.gitee.neuray.security.admin: DEBUG spring: - application: - name: neuray-pm-admin jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 @@ -44,25 +42,6 @@ mybatis: basepackage: com.gitee.neuray.security.admin.mapper xmlLocation: classpath:mapper/**/*.xml mapper-locations: "classpath*:mapper/*.xml" - -server: - port: 8081 - -eureka: - instance: - statusPageUrlPath: /actuator/info - healthCheckUrlPath: /actuator/health - # docker 部署开启 -# prefer-ip-address: true -# ip-address: 127.0.0.1 - client: - serviceUrl: - # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ - ###向注册中心上注册自己 - register-with-eureka: true - ###是否需要从eureka上获取注册信息 - fetch-registry: true # 必须配置 feign: httpclient: diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000000000000000000000000000000000..9b6f813857012a23c35467d910178c1949a79472 --- /dev/null +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml @@ -0,0 +1,10 @@ +server: + port: 8081 +spring: + application: + name: neuray-pm-admin + cloud: + nacos: + discovery: + server-addr: 192.168.1.205:8848 + diff --git a/neuray-pm-provider/pom.xml b/neuray-pm-provider/pom.xml index 0f7f9c7eebefbbb8107fc204a85cabd48d6de2cb..adf795bc22497726d53f722c2d310617e66fd18b 100644 --- a/neuray-pm-provider/pom.xml +++ b/neuray-pm-provider/pom.xml @@ -27,13 +27,12 @@ org.springframework.cloud spring-cloud-starter-netflix-hystrix - - + org.springframework.cloud - spring-cloud-starter-netflix-eureka-client + spring-cloud-starter-alibaba-nacos-discovery + 0.9.0.RELEASE - org.springframework.cloud