mirrors/pig
1
0
Fork 0
mirror of https://gitee.com/log4j/pig.git synced 2024-12-21 20:37:10 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

🍎 Fixing something on macOS. M1 ，nacos support zulu M1

Browse Source
This commit is contained in:
wjie 2021-09-11 13:42:11 +08:00
parent 40ea99f8a0
commit 4a47c492ad
26 changed files with 38 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -1,4 +1,4 @@
root=true
root = true
[*.{groovy,java,kt,xml}]
indent_style = tab

2
README.md
View File

@ -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)，请写清楚遇到问题的原因、开发环境、复显步骤。

8
pig-auth/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-auth</artifactId>
@ -44,19 +44,19 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-feign</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
<!--upms api、model 模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
<!--security-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
<!--JDBC相关-->
<dependency>

11
pig-common/pig-common-bom/pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-bom</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
<packaging>pom</packaging>
<name>pig-common-bom</name>
@ -24,8 +24,7 @@
<spring.checkstyle.plugin>0.0.28</spring.checkstyle.plugin>
<fastjson.version>1.2.75</fastjson.version>
<swagger.core.version>1.5.24</swagger.core.version>
<mybatis-plus.version>3.4.3.2</mybatis-plus.version>
<rocksdbjni.version>5.18.3</rocksdbjni.version>
<mybatis-plus.version>3.4.3.3</mybatis-plus.version>
<nacos.version>2.0.3</nacos.version>
<excel.version>1.0.0</excel.version>
</properties>
@ -106,12 +105,6 @@
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!--nacos 2.0 -->
<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
<version>${rocksdbjni.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>

2
pig-common/pig-common-core/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-common-core</artifactId>

2
pig-common/pig-common-datasource/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>pig-common</artifactId>
<groupId>com.pig4cloud</groupId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
pig-common/pig-common-feign/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -33,7 +33,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>

2
pig-common/pig-common-job/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-common-job</artifactId>

6
pig-common/pig-common-log/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-common-log</artifactId>
@ -35,13 +35,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
<!--UPMS接口模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
<!--安全依赖获取上下文信息-->
<dependency>

2
pig-common/pig-common-mybatis/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-common-mybatis</artifactId>

6
pig-common/pig-common-security/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-common-security</artifactId>
@ -35,7 +35,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
<!--安全模块-->
<dependency>
@ -46,7 +46,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
</dependencies>
</project>

2
pig-common/pig-common-swagger/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-common-swagger</artifactId>

4
pig-common/pig-common-test/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-common-test</artifactId>
@ -18,7 +18,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>

2
pig-common/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-common</artifactId>

2
pig-gateway/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-gateway</artifactId>

4
pig-register/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-register</artifactId>
@ -27,7 +27,7 @@
<description>nacos 注册配置中心</description>
<properties>
<nacos.version>2.0.3</nacos.version>
<nacos.version>2.0.3.1</nacos.version>
</properties>
<dependencies>

11
pig-register/src/main/java/com/alibaba/nacos/PigNacosApplication.java
View File

@ -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
* <p>
* 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");

2
pig-upms/pig-upms-api/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-upms-api</artifactId>

2
pig-upms/pig-upms-biz/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-upms-biz</artifactId>

2
pig-upms/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-upms</artifactId>

2
pig-visual/pig-codegen/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-codegen</artifactId>

2
pig-visual/pig-monitor/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-monitor</artifactId>

2
pig-visual/pig-sentinel-dashboard/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-sentinel-dashboard</artifactId>

2
pig-visual/pig-xxl-job-admin/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-xxl-job-admin</artifactId>

2
pig-visual/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</parent>
<artifactId>pig-visual</artifactId>

4
pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<name>${project.artifactId}</name>
<version>3.3.3</version>
<version>3.3.4</version>
<packaging>pom</packaging>
<url>https://www.pig4cloud.com</url>
@ -34,7 +34,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-boot-admin.version>2.5.1</spring-boot-admin.version>
<hutool.version>5.7.9</hutool.version>
<hutool.version>5.7.12</hutool.version>
<dynamic-ds.version>3.4.1</dynamic-ds.version>
<captcha.version>2.2.0</captcha.version>
<velocity.version>1.7</velocity.version>