2
0

feat: build update

This commit is contained in:
simonzhangsz
2024-12-14 11:09:07 +08:00
parent 2e2ef55dc7
commit 11e6631995
6 changed files with 111 additions and 26 deletions

81
README.md Normal file
View File

@@ -0,0 +1,81 @@
# WANFi Controller & Billing System
## 构建目录
```text
build.wfc/
├── bin # build binary file
├── build # build directory
│   ├── bin
│   ├── docker
│   │   ├── mysql
│   │   │   ├── conf
│   │   │   ├── data
│   │   │   ├── db
│   │   │   └── logs
│   │   ├── nacos
│   │   │   ├── conf
│   │   │   └── logs
│   │   ├── nginx
│   │   │   ├── conf
│   │   │   ├── conf.d
│   │   │   ├── html
│   │   │   └── logs
│   │   ├── redis
│   │   │   ├── conf
│   │   │   └── data
│   │   └── wfc
│   │   ├── auth
│   │   │   └── jar
│   │   ├── gateway
│   │   │   └── jar
│   │   ├── modules
│   │   │   ├── file
│   │   │   │   └── jar
│   │   │   ├── gen
│   │   │   │   └── jar
│   │   │   ├── job
│   │   │   │   └── jar
│   │   │   ├── payment
│   │   │   │   └── jar
│   │   │   ├── system
│   │   │   │   └── jar
│   │   │   └── user
│   │   │   └── jar
│   │   ├── upload
│   │   └── visual
│   │   └── monitor
│   │   └── jar
│   └── systemd # system service daemon file saved here
│   └── system
├── debbuild # deb build directory, not ready
│   ├── DEBIAN
│   ├── etc
│   └── opt
│   └── wfc
├── docs
│   ├── 01-requirement
│   ├── 02-design
│   └── 03-configuration
└── release
├── debs # deb package release, n/a
└── tars # tar package release
```
## 准备工作
```text
JDK >= 1.8 (推荐1.8版本)
Mysql >= 5.7.0 (推荐5.7版本) # docker内部构建
Redis >= 3.0 # docker内部构建
Maven >= 3.0
nacos >= 2.0.4
sentinel >= 1.6.0 (optional)
```
## 构建发布包
```sh
cd bin
./build.sh tar
```

View File

@@ -20,10 +20,10 @@ usage() {
}
build-extras(){
echo -n "Begin build extras file ... "
cd ${BuildRootDir}
git pull
cd bin
echo -n "Begin build extras file ... "
cd ${BuildRootDir}/bin
javac printJarVer.java
echo "done"
}

View File

@@ -1,5 +1,8 @@
MYSQL_ROOT_PASSWORD=123456
MYSQL_DATABASE=wfc_system_db
WFC_CONFIG_DATABASE=wfc_config_db
WFC_SYSTEM_DATABASE=wfc_system_db
WFC_USER_DATABASE=wfc_user_db
MYSQL_USER=mysql
MYSQL_PASSWORD=
NACOS_SERVER_ADDR=192.168.13.128:8848

View File

@@ -17,7 +17,7 @@ services:
- "9849:9849"
depends_on:
- wfc-mysql
#restart: always
restart: unless-stopped
wfc-mysql:
container_name: wfc-mysql
image: mysql:5.7
@@ -26,7 +26,7 @@ services:
ports:
- "3306:3306"
volumes:
- ./mysql/db:/docker-entrypoint-initdb.d # 挂载 SQL 文件
- ./mysql/db:/docker-entrypoint-initdb.d
- ./mysql/conf:/etc/mysql/conf.d
- ./mysql/logs:/logs
- ./mysql/data:/var/lib/mysql
@@ -42,7 +42,7 @@ services:
environment:
MYSQL_DATABASE: 'wfc_system_db'
MYSQL_ROOT_PASSWORD: 123456
#restart: always
restart: unless-stopped
wfc-redis:
container_name: wfc-redis
image: redis
@@ -54,7 +54,7 @@ services:
- ./redis/conf/redis.conf:/home/wfc/redis/redis.conf
- ./redis/data:/data
command: redis-server /home/wfc/redis/redis.conf
#restart: always
restart: unless-stopped
wfc-gateway:
container_name: wfc-gateway
build:
@@ -71,7 +71,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-auth:
container_name: wfc-auth
build:
@@ -88,7 +88,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-modules-system:
container_name: wfc-modules-system
build:
@@ -107,7 +107,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-modules-user:
container_name: wfc-modules-user
build:
@@ -126,7 +126,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-modules-gen:
container_name: wfc-modules-gen
build:
@@ -143,7 +143,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-modules-job:
container_name: wfc-modules-job
build:
@@ -160,7 +160,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-modules-file:
container_name: wfc-modules-file
build:
@@ -174,7 +174,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-modules-payment:
container_name: wfc-modules-payment
build:
@@ -191,7 +191,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-visual-monitor:
container_name: wfc-visual-monitor
build:
@@ -204,7 +204,7 @@ services:
environment:
- NACOS_SERVER_ADDR=${NACOS_SERVER_ADDR}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
#restart: always
restart: unless-stopped
wfc-nginx:
container_name: wfc-nginx
image: nginx
@@ -223,4 +223,4 @@ services:
- wfc-gateway
environment:
- GATEWAY_ADDR=${GATEWAY_ADDR}
#restart: always
restart: unless-stopped

View File

@@ -33,17 +33,18 @@ Docker-compose >= 1.29.2
* 修改docker环境参数
修改如下NACOS_SERVER_ADD的IP地址为实际宿主机的IP地址
修改如下NACOS_SERVER_ADD的IP地址为实际宿主机的IP地址
```sh
cat .env
cat .env
MYSQL_ROOT_PASSWORD=123456
MYSQL_DATABASE=wfc_system_db
WFC_CONFIG_DATABASE=wfc_config_db
WFC_SYSTEM_DATABASE=wfc_system_db
WFC_USER_DATABASE=wfc_user_db
MYSQL_USER=mysql
MYSQL_PASSWORD=
NACOS_SERVER_ADDR=192.168.13.128:8848
NACOS_NAME_SPACE=wfc-prod
GATEWAY_ADDR=192.168.13.128:8080
```
* 配置软件