diff --git a/docs/03-configuration/03-wfc-quickstart.md b/docs/03-configuration/03-wfc-quickstart.md index 8a75ee8..1bf1269 100644 --- a/docs/03-configuration/03-wfc-quickstart.md +++ b/docs/03-configuration/03-wfc-quickstart.md @@ -19,14 +19,14 @@ Storage: Linux >= Ubuntu 22.04 JDK >= 1.8 (Recommended version 1.8) (用于Omada SDN Controller) docker >= 24.0.7, build 24.0.7-0ubuntu2~22.04.1 -docker-compose >= 1.29.2 +docker-compose >= v2.10.0 ``` * 安装docker和docker-compose ```sh sudo apt-get update sudo apt-get install -y docker.io - sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose + sudo curl -L "https://github.com/docker/compose/releases/download/v2.10.0/docker-compose-$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m)" -o /usr/bin/docker-compose sudo chmod +x /usr/bin/docker-compose ``` @@ -39,11 +39,14 @@ docker-compose >= 1.29.2 ## 获取安装包 安装包名: wfc-1.0.2-20241212.tar.gz + 说明: * 版本号: 1.0.2 * 构建日期:20241212 +根据情况获取最新版本的软件安装包 + ## 安装和配置软件 * 创建安装目录 @@ -127,14 +130,14 @@ docker-compose >= 1.29.2 ```sh cd /opt/wfc/docker 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_PORT=3306 - MYSQL_USER=mysql - MYSQL_PASSWORD=123456 + MYSQL_SERVICE_NAME=wfc-mysql + MYSQL_SERVICE_PORT=3306 + MYSQL_ROOT_PASSWORD=123456 + MYSQL_SERVICE_USER=root + MYSQL_SERVICE_PASSWORD=123456 REDIS_PORT=6379 NACOS_PROFILE_NAME=prod NACOS_NAME_SPACE=wfc-prod @@ -151,10 +154,71 @@ docker-compose >= 1.29.2 WFC_SERVER_IP=192.168.13.128 NACOS_SERVER_IP=${WFC_SERVER_IP} GATEWAY_SERVER_IP=${WFC_SERVER_IP} - AUTH_SERVER_IP=${WFC_SERVER_IP} RESTART_OPTION=on-failure:5 ``` +## 配置整合Omada平台的连接参数 + +* 从Omada服务中获取门户平台整合连接参数,如下图: + +![Omada platform integration configuration screenshot](wfc-omada-integration.png) + +注意:连接的MODE采用Client, 具体的配置方式可参考Omada的相关文档 + +* 修改配置文件 + +修改如下omada的配置项 + +```sh + cd /opt/wfc/conf + cat application-common.yml + spring: + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + mvc: + pathmatch: + matching-strategy: ant_path_matcher + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + + # feign 配置 + feign: + sentinel: + enabled: true + okhttp: + enabled: false + httpclient: + enabled: true + disable-ssl-validation: true + client: + config: + default: + connectTimeout: 60000 + readTimeout: 60000 + compression: + request: + enabled: true + min-request-size: 8192 + response: + enabled: true + + # 暴露监控端点 + management: + endpoints: + web: + exposure: + include: '*' + + # Omada 配置 + omada: + omada-url: 'https://192.168.2.249:8043' + omadac-id: 'f3aa6e479b94222581523710cc2c2a9d' + client-id: '5036e77c81a74008821c694a715fe2b8' + client-secret: '29faa06fb7f244b094377b48eb3083a7 +``` + * 启动/查看/停止/版本软件 ```sh diff --git a/docs/03-configuration/03-wfc-quickstart.pdf b/docs/03-configuration/03-wfc-quickstart.pdf index 0a72e7c..6dd4900 100644 Binary files a/docs/03-configuration/03-wfc-quickstart.pdf and b/docs/03-configuration/03-wfc-quickstart.pdf differ diff --git a/docs/03-configuration/wfc-omada-integration.png b/docs/03-configuration/wfc-omada-integration.png new file mode 100644 index 0000000..e98aa77 Binary files /dev/null and b/docs/03-configuration/wfc-omada-integration.png differ