zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/leng_dev' into lei_dev

Browse Source
This commit is contained in:
aeizzz committed 2023-02-24 17:54:18 +08:00
2 parents 3cab378fde fcc20436b7
commit 596bcbc271
45 files changed
+83 -87
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-app-server/pigx-app-server-api/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-app-server</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-app-server-api</artifactId>
pigx-app-server/pigx-app-server-biz/pom.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-app-server</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-app-server-biz</artifactId>
@@ -62,7 +62,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-app-server-api</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</dependency>
<!--必备: log 依赖-->
<dependency>
pigx-app-server/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-app-server</artifactId>
pigx-auth/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-auth</artifactId>
pigx-common/pigx-common-bom/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<description>pigx 公共版本控制</description>
<properties>
<pigx.version>4.6.0</pigx.version>
<pigx.version>5.0.0-SNAPSHOT</pigx.version>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<dynamic-ds.version>3.5.2</dynamic-ds.version>
<druid.version>1.2.9</druid.version>
pigx-common/pigx-common-core/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-core</artifactId>
pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java
-42
View File
@@ -154,11 +154,6 @@ public interface SecurityConstants {
*/
String DING_OLD_GET_TOKEN = "https://oapi.dingtalk.com/gettoken";
/**
* 钉钉同步角色列表
*/
String DING_OLD_ROLE_URL = "https://oapi.dingtalk.com/topapi/role/list";
/**
* 钉钉同步部门列表
*/
@@ -179,28 +174,6 @@ public interface SecurityConstants {
*/
String BCRYPT = "{bcrypt}";
/**
* sys_oauth_client_details 表的字段，不包括client_id、client_secret
*/
String CLIENT_FIELDS = "client_id, CONCAT('{noop}',client_secret) as client_secret, resource_ids, scope, "
+ "authorized_grant_types, web_server_redirect_uri, authorities, access_token_validity, "
+ "refresh_token_validity, additional_information, autoapprove";
/**
* JdbcClientDetailsService 查询语句
*/
String BASE_FIND_STATEMENT = "select " + CLIENT_FIELDS + " from sys_oauth_client_details";
/**
* 按条件client_id 查询
*/
String DEFAULT_SELECT_STATEMENT = BASE_FIND_STATEMENT + " where client_id = ? and del_flag = 0 and tenant_id = %s";
/**
* 资源服务器默认bean名称
*/
String RESOURCE_SERVER_CONFIGURER = "resourceServerConfigurerAdapter";
/**
* 客户端模式
*/
@@ -231,21 +204,6 @@ public interface SecurityConstants {
*/
String NAME = "name";
/**
* 邮箱
*/
String EMAIL = "email";
/**
* 用户部门字段
*/
String DETAILS_DEPT_ID = "deptId";
/**
* 租户ID 字段
*/
String DETAILS_TENANT_ID = "tenantId";
/**
* 协议字段
*/
pigx-common/pigx-common-data/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-data</artifactId>
pigx-common/pigx-common-datasource/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>pigx-common</artifactId>
<groupId>com.pig4cloud</groupId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-common/pigx-common-encrypt-api/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-encrypt-api</artifactId>
pigx-common/pigx-common-excel/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-excel</artifactId>
pigx-common/pigx-common-feign/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-common/pigx-common-gateway/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-gateway</artifactId>
pigx-common/pigx-common-gray/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-gray</artifactId>
pigx-common/pigx-common-idempotent/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-idempotent</artifactId>
pigx-common/pigx-common-job/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-job</artifactId>
pigx-common/pigx-common-log/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-log</artifactId>
pigx-common/pigx-common-oss/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-oss</artifactId>
pigx-common/pigx-common-seata/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-seata</artifactId>
pigx-common/pigx-common-security/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-security</artifactId>
pigx-common/pigx-common-sentinel/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-common/pigx-common-sequence/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-sequence</artifactId>
pigx-common/pigx-common-swagger/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-swagger</artifactId>
pigx-common/pigx-common-websocket/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-websocket</artifactId>
pigx-common/pigx-common-xss/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-xss</artifactId>
pigx-common/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common</artifactId>
pigx-gateway/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-gateway</artifactId>
pigx-register/pom.xml
+3 -1
View File
@@ -18,7 +18,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-register</artifactId>
@@ -100,6 +100,7 @@
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
<exclude>**/*.ttf</exclude>
<exclude>**/*.eot</exclude>
</excludes>
</resource>
<resource>
@@ -109,6 +110,7 @@
<include>**/*.woff</include>
<include>**/*.woff2</include>
<include>**/*.ttf</include>
<include>**/*.eot</include>
</includes>
</resource>
</resources>
pigx-upms/pigx-upms-api/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-upms-api</artifactId>
pigx-upms/pigx-upms-biz/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-upms-biz</artifactId>
pigx-upms/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-upms</artifactId>
pigx-visual/pigx-codegen/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-codegen</artifactId>
pigx-visual/pigx-daemon-elastic-job/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-daemon-elastic-job</artifactId>
pigx-visual/pigx-daemon-quartz/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-visual/pigx-jimu-platform/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-jimu-platform</artifactId>
pigx-visual/pigx-monitor/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-monitor</artifactId>
pigx-visual/pigx-mp-platform/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-mp-platform</artifactId>
pigx-visual/pigx-oa-platform/pom.xml
+7 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-oa-platform</artifactId>
@@ -195,6 +195,9 @@
<filtering>true</filtering>
<excludes>
<exclude>**/*.woff</exclude>
<exclude>**/*.ttf</exclude>
<exclude>**/*.eot</exclude>
<exclude>**/Polyline.js</exclude>
</excludes>
</resource>
<resource>
@@ -202,6 +205,9 @@
<filtering>false</filtering>
<includes>
<include>**/*.woff</include>
<include>**/*.ttf</include>
<include>**/*.eot</include>
<include>**/Polyline.js</include>
</includes>
</resource>
</resources>
pigx-visual/pigx-pay-platform/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-pay-platform</artifactId>
pigx-visual/pigx-report-platform/pom.xml
+5 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-report-platform</artifactId>
@@ -175,6 +175,8 @@
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
<exclude>**/*.ttf</exclude>
<exclude>**/*.otf</exclude>
<exclude>**/*.eot</exclude>
</excludes>
</resource>
<resource>
@@ -184,6 +186,8 @@
<include>**/*.woff</include>
<include>**/*.woff2</include>
<include>**/*.ttf</include>
<include>**/*.otf</include>
<include>**/*.eot</include>
</includes>
</resource>
</resources>
pigx-visual/pigx-seata-server/pom.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pigx-seata-server</artifactId>
pigx-visual/pigx-sentinel-dashboard/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-sentinel-dashboard</artifactId>
pigx-visual/pigx-xxl-job-admin/pom.xml
+27 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-xxl-job-admin</artifactId>
@@ -100,5 +100,31 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
<exclude>**/*.ttf</exclude>
<exclude>**/*.otf</exclude>
<exclude>**/*.eot</exclude>
<exclude>**/*.js</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*.woff</include>
<include>**/*.woff2</include>
<include>**/*.ttf</include>
<include>**/*.otf</include>
<include>**/*.eot</include>
<include>**/*.js</include>
</includes>
</resource>
</resources>
</build>
</project>
pigx-visual/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-visual</artifactId>
pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.6.0</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<organization>