diff --git a/.github/workflows/build_Stable_1x.yml b/.github/workflows/build_Stable_1x.yml index d99e7af..692419a 100644 --- a/.github/workflows/build_Stable_1x.yml +++ b/.github/workflows/build_Stable_1x.yml @@ -46,8 +46,8 @@ jobs: run: java -version - name: Setup Stable 1.x Nacos Server run: | - wget https://github.com/alibaba/nacos/releases/download/1.4.3/nacos-server-1.4.3.tar.gz - tar -xvf nacos-server-1.4.3.tar.gz + wget https://github.com/alibaba/nacos/releases/download/1.4.4/nacos-server-1.4.4.tar.gz + tar -xvf nacos-server-1.4.4.tar.gz cd nacos/bin # sed -i 's/nacos.core.auth.enabled=false/nacos.core.auth.enabled=true/g' ../conf/application.properties chmod 755 startup.sh diff --git a/.github/workflows/build_Stable_2x.yml b/.github/workflows/build_Stable_2x.yml index f08bc39..ed454fa 100644 --- a/.github/workflows/build_Stable_2x.yml +++ b/.github/workflows/build_Stable_2x.yml @@ -46,8 +46,8 @@ jobs: run: java -version - name: Setup Stable 2.x Nacos Server run: | - wget https://github.com/alibaba/nacos/releases/download/2.0.4/nacos-server-2.0.4.tar.gz - tar -xvf nacos-server-2.0.4.tar.gz + wget https://github.com/alibaba/nacos/releases/download/2.1.0/nacos-server-2.1.0.tar.gz + tar -xvf nacos-server-2.1.0.tar.gz cd nacos/bin # sed -i 's/nacos.core.auth.enabled=false/nacos.core.auth.enabled=true/g' ../conf/application.properties chmod 755 startup.sh diff --git a/.github/workflows/build_Unstable.yml b/.github/workflows/build_Unstable.yml index 6b60a97..f5896a2 100644 --- a/.github/workflows/build_Unstable.yml +++ b/.github/workflows/build_Unstable.yml @@ -28,8 +28,8 @@ jobs: run: java -version - name: Setup Unstable Nacos Server run: | - wget https://github.com/alibaba/nacos/releases/download/2.1.0/nacos-server-2.1.0.tar.gz - tar -xvf nacos-server-2.1.0.tar.gz + wget https://github.com/alibaba/nacos/releases/download/2.1.1/nacos-server-2.1.1.tar.gz + tar -xvf nacos-server-2.1.1.tar.gz cd nacos/bin # sed -i 's/nacos.core.auth.enabled=false/nacos.core.auth.enabled=true/g' ../conf/application.properties sed -i 's/Xms512m/Xms1024m/g' startup.sh diff --git a/README.md b/README.md index 1df8557..4e35b43 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,18 @@ https://nacos-sdk-csharp.readthedocs.io/en/latest/ 1. Configure in `Program.cs` ```cs +// after v1.3.3, we can use UseNacosConfig to simplify +public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .UseNacosConfig(section: "NacosConfig", parser: null logAction: null) + // .UseNacosConfig(section: "NacosConfig", parser: Nacos.YamlParser.YamlConfigurationStringParser.Instance logAction: null) + // .UseNacosConfig(section: "NacosConfig", parser: Nacos.IniParser.IniConfigurationStringParser.Instance logAction: null) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + +// before v1.3.3 public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureAppConfiguration((context, builder) => @@ -55,7 +67,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) => .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); - }) + }); ``` 2. Modify `appsettings.json` diff --git a/README.zh-cn.md b/README.zh-cn.md index ad0339a..96e2583 100644 --- a/README.zh-cn.md +++ b/README.zh-cn.md @@ -41,6 +41,18 @@ https://nacos-sdk-csharp.readthedocs.io/en/latest/ 1. 在 `Program.cs` 进行如下配置 ```cs +// v1.3.3 版本之后, 可以用 UseNacosConfig 来简化 +public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .UseNacosConfig(section: "NacosConfig", parser: null logAction: null) + // .UseNacosConfig(section: "NacosConfig", parser: Nacos.YamlParser.YamlConfigurationStringParser.Instance logAction: null) + // .UseNacosConfig(section: "NacosConfig", parser: Nacos.IniParser.IniConfigurationStringParser.Instance logAction: null) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + +// v1.3.3 版本之前 public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureAppConfiguration((context, builder) => @@ -57,7 +69,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) => .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); - }) + }); ``` 2. 修改 `appsettings.json` diff --git a/docs/guide/faq.rst b/docs/guide/faq.rst index e9d87e4..755e6ba 100644 --- a/docs/guide/faq.rst +++ b/docs/guide/faq.rst @@ -28,3 +28,14 @@ SDK 在 v1.x 版本之后,就是默认用 grpc 的方式和 nacos server 对 针对 b 的情况,需要把 9848 暴露出来。 如果修改了默认端口或者是通过环境变量设置了偏移,自行调整对应端口,参考 https://nacos.io/zh-cn/docs/2.0.0-compatibility.html + +3. nacos-sdk-csharp 版本与 nacos server 版本关系 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +nacos server 目前主要有 1.x 版本和 2.x 版本 + +nacos-sdk-csharp 有 0.x unofficial 版本 和 1.x 版本 + +nacos-sdk-csharp 0.x unofficial 版本 只能应用于 nacos server 1.x 版本 + +nacos-sdk-csharp 1.x 版本 可以同时应用于 nacos server 1.x 版本 和 2.x 版本