Jelajahi Sumber

不使用注册中心

fengyanjie 4 tahun lalu
induk
melakukan
6ed2cd99aa

+ 4 - 14
dmp-rwd-edit/pom.xml

@@ -14,6 +14,10 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
@@ -62,14 +66,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-config</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
@@ -82,12 +78,6 @@
             <artifactId>dmp-common</artifactId>
             <version>4.0.0</version>
         </dependency>
-        <!-- hystrix 熔断器 -->
-        <dependency>
-            <groupId>com.netflix.hystrix</groupId>
-            <artifactId>hystrix-javanica</artifactId>
-            <version>1.5.12</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring</artifactId>

+ 9 - 4
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/EditApp.java

@@ -6,8 +6,11 @@ import com.persagy.dmp.common.SpringUtils;
 import com.persagy.dmp.common.http.HttpUtils;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.mgt.SecurityManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -21,13 +24,15 @@ import javax.persistence.EntityManager;
  * @verison: 1.0
  */
 @Slf4j
-@SpringCloudApplication
+@SpringBootApplication
 public class EditApp {
 
     public static void main(String[] args) {
-        ConfigurableApplicationContext ctx = SpringApplication.run(EditApp.class, args);
-        ConfigurableEnvironment env = ctx.getEnvironment();
-        log.info("profile                  = {}", env.getProperty("spring.profiles.active"));
+        SpringApplication app = new SpringApplication(EditApp.class);
+        ConfigurableApplicationContext ctx = app.run(args);
+
+        SecurityManager securityManager = ctx.getBean(SecurityManager.class);
+        SecurityUtils.setSecurityManager(securityManager);
     }
 
     @Bean

+ 0 - 1
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/ChangeRecord.java

@@ -1,6 +1,5 @@
 package com.persagy.dmp.rwd.edit.entity;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
 import com.persagy.dmp.rwd.edit.model.ChangeRecordModel;

+ 43 - 0
dmp-rwd-edit/src/main/resources/application.yml

@@ -0,0 +1,43 @@
+server:
+  port: 8838
+persagy:
+  dmp:
+    server: http://192.168.64.18:9930
+#    server: http://39.102.40.239:9970
+    exchange: exchange-dmp
+    admin:
+      routingKey: routing-dmp-rwdedit
+      queue: queue-dmp-rwdedit
+spring:
+  application:
+    name: dmp-rwdedit
+  profiles:
+    active:
+    - dev,log-dev
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.64.15:9934/dmp_rwdedit?useUnicode=true&characterEncoding=utf-8&mysqlEncoding=utf8&useSSL=false
+    username: root
+    password: brzj123456
+    type: com.alibaba.druid.pool.DruidDataSource
+  jpa:
+    show-sql: true
+    hibernate:
+      ddl-auto: none
+  rabbitmq:
+    host: 192.168.64.15
+    port: 9936
+    username: admin
+    password: brzj123456
+    virtual-host: /test
+  redis:
+    database: 10
+    host: 192.168.64.15
+    password: brzj123456
+    port: 9944
+    timeout: 6000
+    pool:
+      max-idle: 200
+      min-idle: 5
+      max-active: 1024
+      max-wait: 1000

+ 0 - 10
dmp-rwd-edit/src/main/resources/bootstrap.yml

@@ -1,10 +0,0 @@
-persagy:
-  dmp:
-    server: http://192.168.64.18:9930
-spring:
-  application:
-    name: dmp-rwd-edit
-  cloud:
-    config:
-      profile: dev2
-      uri: http://192.168.64.18:9932