🎉 Hoxton.RELEASE、Nacos Server

🎉 Hoxton.RELEASE、Nacos Server

🎉 Hoxton.RELEASE、Nacos Server

🎉 Hoxton.RELEASE、Nacos Server

🎉 Hoxton.RELEASE、Nacos Server

🎉 Hoxton.RELEASE、Nacos Server

🎉 Hoxton.RELEASE、Nacos Server

README.md

@@ -51,21 +51,18 @@ pig-ui  -- https://gitee.com/log4j/pig-ui
 
 pig
 ├── pig-auth -- 授权服务提供[3000]
+├── pig-codegen -- 图形化代码生成[5002]
 └── pig-common -- 系统公共模块 
      ├── pig-common-core -- 公共工具类核心包
      ├── pig-common-log -- 日志服务
      ├── pig-common-security -- 安全工具类
      └── pig-common-swagger -- 接口文档
-├── pig-config -- 配置中心[8888]
-├── pig-eureka -- 服务注册与发现[8761]
+├── pig-register -- Nacos Server[8848]
 ├── pig-gateway -- Spring Cloud Gateway网关[9999]
+├── pig-monitor -- Spring Boot Admin监控 [5001]
 └── pig-upms -- 通用用户权限管理模块
      └── pig-upms-api -- 通用用户权限管理系统公共api模块
      └── pig-upms-biz -- 通用用户权限管理系统业务处理模块[4000]
-└── pig-visual  -- 图形化模块 
-     ├── pig-monitor -- Spring Boot Admin监控 [5001]
-     ├── pig-zipkin -- 链路调用监控 [5002]
-     └── pig-codegen -- 图形化代码生成[5003]
 
 ```
 #### 提交反馈

db/Dockerfile

@@ -5,3 +5,5 @@ MAINTAINER lengleng(wangiegie@gmail.com)
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
 COPY ./db/pig.sql /docker-entrypoint-initdb.d
+
+COPY ./db/pig_config.sql /docker-entrypoint-initdb.d

db/pig.sql

@@ -2,7 +2,7 @@ DROP DATABASE IF EXISTS `pig`;
 
 CREATE DATABASE  `pig` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
 
-SET NAMES utf8;
+SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 USE `pig`;

docker-compose.yml

@@ -20,25 +20,16 @@ services:
     container_name: pig-redis
     hostname: pig-redis
 
-  pig-eureka:
+  pig-register:
     build:
       context: ./
-      dockerfile: ./pig-eureka/Dockerfile
+      dockerfile: ./pig-register/Dockerfile
     restart: always
     ports:
-      - 8761:8761
-    container_name: pig-eureka
-    hostname: pig-eureka
-    image: pig-eureka
-
-  pig-config:
-    build:
-      context: ./
-      dockerfile: ./pig-config/Dockerfile
-    restart: always
-    container_name: pig-config
-    hostname: pig-config
-    image: pig-config
+      - 8848:8848
+    container_name: pig-register
+    hostname: pig-register
+    image: pig-register
 
   pig-gateway:
     build:
@@ -72,7 +63,7 @@ services:
   pig-monitor:
     build:
       context: ./
-      dockerfile: ./pig-visual/pig-monitor/Dockerfile
+      dockerfile: ./pig-monitor/Dockerfile
     restart: always
     ports:
       - 5001:5001
@@ -83,7 +74,7 @@ services:
   pig-codegen:
     build:
       context: ./
-      dockerfile: ./pig-visual/pig-codegen/Dockerfile
+      dockerfile: ./pig-codegen/Dockerfile
     restart: always
     container_name: pig-codegen
     hostname: pig-codegen

pig-auth/pom.xml

@@ -30,10 +30,15 @@
 	<description>pig 认证授权中心，基于 spring security oAuth2</description>
 
 	<dependencies>
+		<!--注册中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
 		<!--配置中心客户端-->
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
 		</dependency>
 		<!--upms api、model 模块-->
 		<dependency>

pig-auth/src/main/resources/bootstrap.yml

@@ -3,25 +3,14 @@ server:
 
 spring:
   application:
-    name: pig-auth
-  profiles:
-    active: dev
-  # 配置中心
+    name: @artifactId@
   cloud:
-    config:
-      fail-fast: true
-      name: ${spring.application.name}
-      profile: ${spring.profiles.active}
+    nacos:
       discovery:
-        enabled: true
-        service-id: pig-config
-  main:
-    allow-bean-definition-overriding: true
-
-# 注册中心配置
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    service-url:
-      defaultZone: http://pig:pig@pig-eureka:8761/eureka
+        server-addr: ${NACOS-HOST:pig-register}:${NACOS-PORT:8848}
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+        file-extension: yml
+        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  profiles:
+    active: @profiles.active@

pig-visual/pig-codegen/Dockerfile → pig-codegen/Dockerfile

@@ -10,6 +10,6 @@ WORKDIR /pig-codegen
 
 EXPOSE 5003
 
-ADD ./pig-visual/pig-codegen/target/pig-codegen.jar ./
+ADD ./pig-codegen/target/pig-codegen.jar ./
 
 CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-codegen.jar

pig-visual/pig-codegen/pom.xml → pig-codegen/pom.xml

@@ -21,7 +21,7 @@
 
 	<parent>
 		<groupId>com.pig4cloud</groupId>
-		<artifactId>pig-visual</artifactId>
+		<artifactId>pig</artifactId>
 		<version>2.6.0</version>
 	</parent>
 
@@ -37,10 +37,15 @@
 			<artifactId>pig-common-swagger</artifactId>
 			<version>2.6.0</version>
 		</dependency>
+		<!--注册中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
 		<!--配置中心客户端-->
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
 		</dependency>
 		<!--mybatis-->
 		<dependency>

pig-codegen/src/main/resources/bootstrap.yml

@@ -0,0 +1,16 @@
+server:
+  port: 5002
+
+spring:
+  application:
+    name: @artifactId@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: ${NACOS-HOST:pig-register}:${NACOS-PORT:8848}
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+        file-extension: yml
+        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  profiles:
+    active: @profiles.active@

pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/ServiceNameConstants.java

@@ -30,6 +30,6 @@ public interface ServiceNameConstants {
 	/**
 	 * UMPS模块
 	 */
-	String UMPS_SERVICE = "pig-upms";
+	String UMPS_SERVICE = "pig-upms-biz";
 
 }