From 4a47c492ada6958709f2fb513dbb31ceb8d56737 Mon Sep 17 00:00:00 2001 From: wjie <382170521@qq.com> Date: Sat, 11 Sep 2021 13:42:11 +0800 Subject: [PATCH] =?UTF-8?q?:apple:=20Fixing=20something=20on=20macOS.=20M1?= =?UTF-8?q?=20=EF=BC=8Cnacos=20support=20zulu=20M1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 +- README.md | 2 +- pig-auth/pom.xml | 8 ++++---- pig-common/pig-common-bom/pom.xml | 11 ++--------- pig-common/pig-common-core/pom.xml | 2 +- pig-common/pig-common-datasource/pom.xml | 2 +- pig-common/pig-common-feign/pom.xml | 4 ++-- pig-common/pig-common-job/pom.xml | 2 +- pig-common/pig-common-log/pom.xml | 6 +++--- pig-common/pig-common-mybatis/pom.xml | 2 +- pig-common/pig-common-security/pom.xml | 6 +++--- pig-common/pig-common-swagger/pom.xml | 2 +- pig-common/pig-common-test/pom.xml | 4 ++-- pig-common/pom.xml | 2 +- pig-gateway/pom.xml | 2 +- pig-register/pom.xml | 4 ++-- .../java/com/alibaba/nacos/PigNacosApplication.java | 11 +---------- pig-upms/pig-upms-api/pom.xml | 2 +- pig-upms/pig-upms-biz/pom.xml | 2 +- pig-upms/pom.xml | 2 +- pig-visual/pig-codegen/pom.xml | 2 +- pig-visual/pig-monitor/pom.xml | 2 +- pig-visual/pig-sentinel-dashboard/pom.xml | 2 +- pig-visual/pig-xxl-job-admin/pom.xml | 2 +- pig-visual/pom.xml | 2 +- pom.xml | 4 ++-- 26 files changed, 38 insertions(+), 54 deletions(-) diff --git a/.editorconfig b/.editorconfig index 48a40c43..0144009d 100755 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -root=true +root = true [*.{groovy,java,kt,xml}] indent_style = tab diff --git a/README.md b/README.md index 08583b7f..30ef7339 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ pig 开源软件遵循 [Apache 2.0 协议](https://www.apache.org/licenses/LICEN ### 其他说明 -1. 欢迎提交 [PR](https://dwz.cn/2KURd5Vf)，注意对应提交对应 `dev` 分支 +1. 欢迎提交 [PR](https://dwz.cn/2KURd5Vf)，注意对应提交对应 `dev` 分支 代码规范 [spring-javaformat](https://github.com/spring-io/spring-javaformat) 2. 欢迎提交 [issue](https://gitee.com/log4j/pig/issues)，请写清楚遇到问题的原因、开发环境、复显步骤。 diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml index 60d590dd..f75b25f9 100755 --- a/pig-auth/pom.xml +++ b/pig-auth/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.3 + 3.3.4 pig-auth @@ -44,19 +44,19 @@ com.pig4cloud pig-common-feign - 3.3.3 + 3.3.4 com.pig4cloud pig-upms-api - 3.3.3 + 3.3.4 com.pig4cloud pig-common-security - 3.3.3 + 3.3.4 diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml index c3702648..7833c28d 100644 --- a/pig-common/pig-common-bom/pom.xml +++ b/pig-common/pig-common-bom/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-common-bom - 3.3.3 + 3.3.4 pom pig-common-bom @@ -24,8 +24,7 @@ 0.0.28 1.2.75 1.5.24 - 3.4.3.2 - 5.18.3 + 3.4.3.3 2.0.3 1.0.0 @@ -106,12 +105,6 @@ fastjson ${fastjson.version} - - - org.rocksdb - rocksdbjni - ${rocksdbjni.version} - com.alibaba.nacos nacos-client diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml index 0d821013..6e92240d 100755 --- a/pig-common/pig-common-core/pom.xml +++ b/pig-common/pig-common-core/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.3 + 3.3.4 pig-common-core diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml index 7e533d7c..bc0bfa56 100644 --- a/pig-common/pig-common-datasource/pom.xml +++ b/pig-common/pig-common-datasource/pom.xml @@ -21,7 +21,7 @@ pig-common com.pig4cloud - 3.3.3 + 3.3.4 4.0.0 diff --git a/pig-common/pig-common-feign/pom.xml b/pig-common/pig-common-feign/pom.xml index 821e1c06..4bf1f729 100755 --- a/pig-common/pig-common-feign/pom.xml +++ b/pig-common/pig-common-feign/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.3 + 3.3.4 4.0.0 @@ -33,7 +33,7 @@ com.pig4cloud pig-common-core - 3.3.3 + 3.3.4 com.alibaba.cloud diff --git a/pig-common/pig-common-job/pom.xml b/pig-common/pig-common-job/pom.xml index fa7db5dc..09251273 100755 --- a/pig-common/pig-common-job/pom.xml +++ b/pig-common/pig-common-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pig-common - 3.3.3 + 3.3.4 pig-common-job diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml index c31d3b75..bdda50d2 100755 --- a/pig-common/pig-common-log/pom.xml +++ b/pig-common/pig-common-log/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.3 + 3.3.4 pig-common-log @@ -35,13 +35,13 @@ com.pig4cloud pig-common-core - 3.3.3 + 3.3.4 com.pig4cloud pig-upms-api - 3.3.3 + 3.3.4 diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml index dc75ddd5..b0f1cc86 100755 --- a/pig-common/pig-common-mybatis/pom.xml +++ b/pig-common/pig-common-mybatis/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.3 + 3.3.4 pig-common-mybatis diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml index 96bd06ef..3e35a521 100755 --- a/pig-common/pig-common-security/pom.xml +++ b/pig-common/pig-common-security/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.3 + 3.3.4 pig-common-security @@ -35,7 +35,7 @@ com.pig4cloud pig-common-core - 3.3.3 + 3.3.4 @@ -46,7 +46,7 @@ com.pig4cloud pig-upms-api - 3.3.3 + 3.3.4 diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml index fd92fd98..a12419cb 100644 --- a/pig-common/pig-common-swagger/pom.xml +++ b/pig-common/pig-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pig-common - 3.3.3 + 3.3.4 pig-common-swagger diff --git a/pig-common/pig-common-test/pom.xml b/pig-common/pig-common-test/pom.xml index 27c64bba..019e2649 100755 --- a/pig-common/pig-common-test/pom.xml +++ b/pig-common/pig-common-test/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-common - 3.3.3 + 3.3.4 pig-common-test @@ -18,7 +18,7 @@ com.pig4cloud pig-common-security - 3.3.3 + 3.3.4 org.springframework.security diff --git a/pig-common/pom.xml b/pig-common/pom.xml index c16a61e2..4ce58afd 100755 --- a/pig-common/pom.xml +++ b/pig-common/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.3 + 3.3.4 pig-common diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index 18e9d35b..d6f22253 100755 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.3 + 3.3.4 pig-gateway diff --git a/pig-register/pom.xml b/pig-register/pom.xml index 06266cef..a82ba8bd 100755 --- a/pig-register/pom.xml +++ b/pig-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pig - 3.3.3 + 3.3.4 pig-register @@ -27,7 +27,7 @@ nacos 注册配置中心 - 2.0.3 + 2.0.3.1 diff --git a/pig-register/src/main/java/com/alibaba/nacos/PigNacosApplication.java b/pig-register/src/main/java/com/alibaba/nacos/PigNacosApplication.java index 782c98f3..c22741c0 100755 --- a/pig-register/src/main/java/com/alibaba/nacos/PigNacosApplication.java +++ b/pig-register/src/main/java/com/alibaba/nacos/PigNacosApplication.java @@ -16,8 +16,6 @@ package com.alibaba.nacos; -import cn.hutool.core.lang.Validator; -import cn.hutool.system.SystemUtil; import com.alibaba.nacos.config.ConfigConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; @@ -27,7 +25,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; /** * @author nacos *

- * nacos console 源码运行，方便开发 生产建议从官网下载最新版配置运行 + * nacos console 源码运行，方便开发 生产从官网下载zip最新版集群配置运行 */ @Slf4j @EnableScheduling @@ -44,13 +42,6 @@ public class PigNacosApplication { * 初始化运行环境 */ private static boolean initEnv() { - // 特殊处理 window 且用户名包含中文的用户，避免RocksDB 初始化失败 - // System.setProperty(SystemUtil.USER_HOME, "/nacos-path/"); - if (SystemUtil.getOsInfo().isWindows() && Validator.hasChinese(SystemUtil.getUserInfo().getHomeDir())) { - log.error("路径包含中文,需要打开以上注释配置指定不包含中文目录"); - return false; - } - System.setProperty(ConfigConstants.STANDALONE_MODE, "true"); System.setProperty(ConfigConstants.AUTH_ENABLED, "false"); System.setProperty(ConfigConstants.LOG_BASEDIR, "logs"); diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml index ca24096b..fa1b35c7 100755 --- a/pig-upms/pig-upms-api/pom.xml +++ b/pig-upms/pig-upms-api/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 3.3.3 + 3.3.4 pig-upms-api diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml index 74f22d87..46ceeb7f 100644 --- a/pig-upms/pig-upms-biz/pom.xml +++ b/pig-upms/pig-upms-biz/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 3.3.3 + 3.3.4 pig-upms-biz diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml index bf60a9fd..09bf75b1 100755 --- a/pig-upms/pom.xml +++ b/pig-upms/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.3 + 3.3.4 pig-upms diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml index 2cffd5b5..626774ce 100755 --- a/pig-visual/pig-codegen/pom.xml +++ b/pig-visual/pig-codegen/pom.xml @@ -22,7 +22,7 @@ com.pig4cloud pig-visual - 3.3.3 + 3.3.4 pig-codegen diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml index 90638c4a..0a0524d1 100755 --- a/pig-visual/pig-monitor/pom.xml +++ b/pig-visual/pig-monitor/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-visual - 3.3.3 + 3.3.4 pig-monitor diff --git a/pig-visual/pig-sentinel-dashboard/pom.xml b/pig-visual/pig-sentinel-dashboard/pom.xml index 18b4f7bf..5bfafa87 100755 --- a/pig-visual/pig-sentinel-dashboard/pom.xml +++ b/pig-visual/pig-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-visual - 3.3.3 + 3.3.4 pig-sentinel-dashboard diff --git a/pig-visual/pig-xxl-job-admin/pom.xml b/pig-visual/pig-xxl-job-admin/pom.xml index b894d181..ae823f14 100644 --- a/pig-visual/pig-xxl-job-admin/pom.xml +++ b/pig-visual/pig-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.pig4cloud pig-visual - 3.3.3 + 3.3.4 pig-xxl-job-admin diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml index cf09152f..fbcf1b07 100755 --- a/pig-visual/pom.xml +++ b/pig-visual/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.3 + 3.3.4 pig-visual diff --git a/pom.xml b/pom.xml index 59dbe438..ab829866 100755 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.pig4cloud pig ${project.artifactId} - 3.3.3 + 3.3.4 pom https://www.pig4cloud.com @@ -34,7 +34,7 @@ 1.8 1.8 2.5.1 - 5.7.9 + 5.7.12 3.4.1 2.2.0 1.7