Просмотр исходного кода

添加Nacos Docker Compose文件

mrbird 6 лет назад
Родитель
Сommit
a208b90cc2

+ 1 - 1
febs-auth/src/main/java/cc/mrbird/febs/auth/configure/FebsAuthorizationServerConfigurer.java

@@ -91,7 +91,7 @@ public class FebsAuthorizationServerConfigurer extends AuthorizationServerConfig
         DefaultUserAuthenticationConverter userAuthenticationConverter = new DefaultUserAuthenticationConverter();
         DefaultUserAuthenticationConverter userAuthenticationConverter = new DefaultUserAuthenticationConverter();
         userAuthenticationConverter.setUserDetailsService(userDetailService);
         userAuthenticationConverter.setUserDetailsService(userDetailService);
         defaultAccessTokenConverter.setUserTokenConverter(userAuthenticationConverter);
         defaultAccessTokenConverter.setUserTokenConverter(userAuthenticationConverter);
-        accessTokenConverter.setSigningKey(properties.getJwtAccessKey());
+        accessTokenConverter.setSigningKey("febs");
         return accessTokenConverter;
         return accessTokenConverter;
     }
     }
 
 

+ 0 - 4
febs-auth/src/main/java/cc/mrbird/febs/auth/properties/FebsAuthProperties.java

@@ -26,8 +26,4 @@ public class FebsAuthProperties {
      * 验证码配置
      * 验证码配置
      */
      */
     private FebsValidateCodeProperties code = new FebsValidateCodeProperties();
     private FebsValidateCodeProperties code = new FebsValidateCodeProperties();
-    /**
-     * JWT加密密钥
-     */
-    private String jwtAccessKey;
 }
 }

+ 0 - 1
febs-auth/src/main/resources/febs-auth.properties

@@ -12,7 +12,6 @@ febs.auth.clients[1].scope=test
 febs.auth.clients[1].accessTokenValiditySeconds=3600
 febs.auth.clients[1].accessTokenValiditySeconds=3600
 
 
 febs.auth.anonUrl=/actuator/**,/captcha
 febs.auth.anonUrl=/actuator/**,/captcha
-febs.auth.jwtAccessKey=febs
 
 
 febs.auth.code.time=120
 febs.auth.code.time=120
 febs.auth.code.type=png
 febs.auth.code.type=png

+ 11 - 35
febs-cloud/docker compose/febs-cloud/docker-compose.yml

@@ -1,30 +1,6 @@
 version: '3'
 version: '3'
 
 
 services:
 services:
-  febs-register:
-    image: febs-register:latest
-    container_name: febs-register
-    volumes:
-      - "/febs/log:/log"
-    command:
-      - "--febs-monitor-admin=127.0.0.1"
-      - "--febs-register=127.0.0.1"
-    ports:
-      - 8001:8001
-    restart: always
-  febs-config:
-    image: febs-config:latest
-    container_name: febs-config
-    depends_on:
-      - febs-register
-    volumes:
-      - "/febs/log:/log"
-    command:
-      - "--febs-monitor-admin=127.0.0.1"
-      - "--febs-register=127.0.0.1"
-    ports:
-      - 8501:8501
-    restart: always
   febs-monitor-admin:
   febs-monitor-admin:
     image: febs-monitor-admin:latest
     image: febs-monitor-admin:latest
     container_name: febs-monitor-admin
     container_name: febs-monitor-admin
@@ -32,7 +8,7 @@ services:
       - "/febs/log:/log"
       - "/febs/log:/log"
     ports:
     ports:
       - 8401:8401
       - 8401:8401
-    restart: always
+    restart: on-failure
   febs-gateway:
   febs-gateway:
     image: febs-gateway:latest
     image: febs-gateway:latest
     container_name: febs-gateway
     container_name: febs-gateway
@@ -43,10 +19,10 @@ services:
       - "/febs/log:/log"
       - "/febs/log:/log"
     command:
     command:
       - "--febs-monitor-admin=127.0.0.1"
       - "--febs-monitor-admin=127.0.0.1"
-      - "--febs-register=127.0.0.1"
+      - "--nacos.url=127.0.0.1"
     ports:
     ports:
       - 8301:8301
       - 8301:8301
-    restart: always
+    restart: on-failure
   febs-auth:
   febs-auth:
     image: febs-auth:latest
     image: febs-auth:latest
     container_name: febs-auth
     container_name: febs-auth
@@ -57,11 +33,11 @@ services:
       - "/febs/log:/log"
       - "/febs/log:/log"
     command:
     command:
       - "--febs-monitor-admin=127.0.0.1"
       - "--febs-monitor-admin=127.0.0.1"
-      - "--febs-register=127.0.0.1"
+      - "--nacos.url=127.0.0.1"
       - "--mysql.url=127.0.0.1"
       - "--mysql.url=127.0.0.1"
       - "--redis.url=127.0.0.1"
       - "--redis.url=127.0.0.1"
       - "--spring.profiles.active=prod"
       - "--spring.profiles.active=prod"
-    restart: always
+    restart: on-failure
   febs-server-system:
   febs-server-system:
     image: febs-server-system:latest
     image: febs-server-system:latest
     container_name: febs-server-system
     container_name: febs-server-system
@@ -72,12 +48,12 @@ services:
       - "/febs/log:/log"
       - "/febs/log:/log"
     command:
     command:
       - "--febs-monitor-admin=127.0.0.1"
       - "--febs-monitor-admin=127.0.0.1"
-      - "--febs-register=127.0.0.1"
       - "--febs-gateway=127.0.0.1"
       - "--febs-gateway=127.0.0.1"
+      - "--nacos.url=127.0.0.1"
       - "--mysql.url=127.0.0.1"
       - "--mysql.url=127.0.0.1"
       - "--rabbitmq.url=127.0.0.1"
       - "--rabbitmq.url=127.0.0.1"
       - "--spring.profiles.active=prod"
       - "--spring.profiles.active=prod"
-    restart: always
+    restart: on-failure
   febs-server-test:
   febs-server-test:
     image: febs-server-test:latest
     image: febs-server-test:latest
     container_name: febs-server-test
     container_name: febs-server-test
@@ -88,10 +64,10 @@ services:
       - "/febs/log:/log"
       - "/febs/log:/log"
     command:
     command:
       - "--rabbitmq.url=127.0.0.1"
       - "--rabbitmq.url=127.0.0.1"
+      - "--nacos.url=127.0.0.1"
       - "--febs-monitor-admin=127.0.0.1"
       - "--febs-monitor-admin=127.0.0.1"
-      - "--febs-register=127.0.0.1"
       - "--febs-gateway=127.0.0.1"
       - "--febs-gateway=127.0.0.1"
-    restart: always
+    restart: on-failure
   zipkin-server:
   zipkin-server:
     image: zipkin-server
     image: zipkin-server
     container_name: zipkin-server
     container_name: zipkin-server
@@ -108,7 +84,7 @@ services:
       - "--zipkin.collector.rabbitmq.password=123456"
       - "--zipkin.collector.rabbitmq.password=123456"
     ports:
     ports:
       - 8402:8402
       - 8402:8402
-    restart: always
+    restart: on-failure
   febs-clou-web:
   febs-clou-web:
     image: febs-cloud-web
     image: febs-cloud-web
     container_name: febs-cloud-web
     container_name: febs-cloud-web
@@ -116,4 +92,4 @@ services:
       - "/febs/log:/log"
       - "/febs/log:/log"
     ports:
     ports:
       - 9527:80
       - 9527:80
-    restart: always
+    restart: on-failure

+ 23 - 0
febs-cloud/docker compose/nacos/docker-compose.yml

@@ -0,0 +1,23 @@
+version: '3'
+
+services:
+  nacos:
+    image: nacos/nacos-server:latest
+    container_name: nacos-standalone-mysql
+    environment:
+      - "PREFER_HOST_MODE=hostname"
+      - "MODE=standalone"
+      - "SPRING_DATASOURCE_PLATFORM=mysql"
+      - "MYSQL_MASTER_SERVICE_HOST=127.0.0.1"
+      - "MYSQL_MASTER_SERVICE_DB_NAME=febs_nacos"
+      - "MYSQL_MASTER_SERVICE_PORT=3306"
+      - "MYSQL_MASTER_SERVICE_USER=root"
+      - "MYSQL_MASTER_SERVICE_PASSWORD=123456"
+      - "MYSQL_SLAVE_SERVICE_HOST=127.0.0.1"
+      - "MYSQL_SLAVE_SERVICE_PORT=3306"
+    volumes:
+      - /febs/nacos/standalone-logs/:/home/nacos/logs
+      - /febs/nacos/custom.properties:/home/nacos/init.d/custom.properties
+    ports:
+      - 8001:8848
+    restart: on-failure