Skip to content

Commit 23ae865

Browse files
lltxlltx
committed
🎉 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
1 parent e962abf commit 23ae865

357 files changed

Lines changed: 46217 additions & 919 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,18 @@ pig-ui -- https://gitee.com/log4j/pig-ui
5151

5252
pig
5353
├── pig-auth -- 授权服务提供[3000]
54+
├── pig-codegen -- 图形化代码生成[5002]
5455
└── pig-common -- 系统公共模块
5556
├── pig-common-core -- 公共工具类核心包
5657
├── pig-common-log -- 日志服务
5758
├── pig-common-security -- 安全工具类
5859
└── pig-common-swagger -- 接口文档
59-
├── pig-config -- 配置中心[8888]
60-
├── pig-eureka -- 服务注册与发现[8761]
60+
├── pig-register -- Nacos Server[8848]
6161
├── pig-gateway -- Spring Cloud Gateway网关[9999]
62+
├── pig-monitor -- Spring Boot Admin监控 [5001]
6263
└── pig-upms -- 通用用户权限管理模块
6364
└── pig-upms-api -- 通用用户权限管理系统公共api模块
6465
└── pig-upms-biz -- 通用用户权限管理系统业务处理模块[4000]
65-
└── pig-visual -- 图形化模块
66-
├── pig-monitor -- Spring Boot Admin监控 [5001]
67-
├── pig-zipkin -- 链路调用监控 [5002]
68-
└── pig-codegen -- 图形化代码生成[5003]
6966

7067
```
7168
#### 提交反馈

‎db/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ MAINTAINER lengleng(wangiegie@gmail.com)
55
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
66

77
COPY ./db/pig.sql /docker-entrypoint-initdb.d
8+
9+
COPY ./db/pig_config.sql /docker-entrypoint-initdb.d

‎db/pig.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ DROP DATABASE IF EXISTS `pig`;
22

33
CREATE DATABASE `pig` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
44

5-
SET NAMES utf8;
5+
SET NAMES utf8mb4;
66
SET FOREIGN_KEY_CHECKS = 0;
77

88
USE `pig`;

‎db/pig_config.sql‎

Lines changed: 228 additions & 0 deletions
Large diffs are not rendered by default.

‎docker-compose.yml‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,16 @@ services:
2020
container_name: pig-redis
2121
hostname: pig-redis
2222

23-
pig-eureka:
23+
pig-register:
2424
build:
2525
context: ./
26-
dockerfile: ./pig-eureka/Dockerfile
26+
dockerfile: ./pig-register/Dockerfile
2727
restart: always
2828
ports:
29-
- 8761:8761
30-
container_name: pig-eureka
31-
hostname: pig-eureka
32-
image: pig-eureka
33-
34-
pig-config:
35-
build:
36-
context: ./
37-
dockerfile: ./pig-config/Dockerfile
38-
restart: always
39-
container_name: pig-config
40-
hostname: pig-config
41-
image: pig-config
29+
- 8848:8848
30+
container_name: pig-register
31+
hostname: pig-register
32+
image: pig-register
4233

4334
pig-gateway:
4435
build:
@@ -72,7 +63,7 @@ services:
7263
pig-monitor:
7364
build:
7465
context: ./
75-
dockerfile: ./pig-visual/pig-monitor/Dockerfile
66+
dockerfile: ./pig-monitor/Dockerfile
7667
restart: always
7768
ports:
7869
- 5001:5001
@@ -83,7 +74,7 @@ services:
8374
pig-codegen:
8475
build:
8576
context: ./
86-
dockerfile: ./pig-visual/pig-codegen/Dockerfile
77+
dockerfile: ./pig-codegen/Dockerfile
8778
restart: always
8879
container_name: pig-codegen
8980
hostname: pig-codegen

‎pig-auth/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@
3030
<description>pig 认证授权中心，基于 spring security oAuth2</description>
3131

3232
<dependencies>
33+
<!--注册中心客户端-->
34+
<dependency>
35+
<groupId>com.alibaba.cloud</groupId>
36+
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
37+
</dependency>
3338
<!--配置中心客户端-->
3439
<dependency>
35-
<groupId>org.springframework.cloud</groupId>
36-
<artifactId>spring-cloud-starter-config</artifactId>
40+
<groupId>com.alibaba.cloud</groupId>
41+
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
3742
</dependency>
3843
<!--upms api、model 模块-->
3944
<dependency>

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

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,14 @@ server:
33

44
spring:
55
application:
6-
name: pig-auth
7-
profiles:
8-
active: dev
9-
# 配置中心
6+
name: @artifactId@
107
cloud:
11-
config:
12-
fail-fast: true
13-
name: ${spring.application.name}
14-
profile: ${spring.profiles.active}
8+
nacos:
159
discovery:
16-
enabled: true
17-
service-id: pig-config
18-
main:
19-
allow-bean-definition-overriding: true
20-
21-
# 注册中心配置
22-
eureka:
23-
instance:
24-
prefer-ip-address: true
25-
client:
26-
service-url:
27-
defaultZone: http://pig:pig@pig-eureka:8761/eureka
10+
server-addr: ${NACOS-HOST:pig-register}:${NACOS-PORT:8848}
11+
config:
12+
server-addr: ${spring.cloud.nacos.discovery.server-addr}
13+
file-extension: yml
14+
shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
15+
profiles:
16+
active: @profiles.active@

pig-visual/pig-codegen/Dockerfile renamed to pig-codegen/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ WORKDIR /pig-codegen
1010

1111
EXPOSE 5003
1212

13-
ADD ./pig-visual/pig-codegen/target/pig-codegen.jar ./
13+
ADD ./pig-codegen/target/pig-codegen.jar ./
1414

1515
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-codegen.jar

pig-visual/pig-codegen/pom.xml renamed to pig-codegen/pom.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<parent>
2323
<groupId>com.pig4cloud</groupId>
24-
<artifactId>pig-visual</artifactId>
24+
<artifactId>pig</artifactId>
2525
<version>2.6.0</version>
2626
</parent>
2727

@@ -37,10 +37,15 @@
3737
<artifactId>pig-common-swagger</artifactId>
3838
<version>2.6.0</version>
3939
</dependency>
40+
<!--注册中心客户端-->
41+
<dependency>
42+
<groupId>com.alibaba.cloud</groupId>
43+
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
44+
</dependency>
4045
<!--配置中心客户端-->
4146
<dependency>
42-
<groupId>org.springframework.cloud</groupId>
43-
<artifactId>spring-cloud-starter-config</artifactId>
47+
<groupId>com.alibaba.cloud</groupId>
48+
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
4449
</dependency>
4550
<!--mybatis-->
4651
<dependency>

pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java renamed to pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java

File renamed without changes.

0 commit comments

Comments
 (0)