From 243fdc94f213e55ea5488ef8cb40abb394d614e3 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 19 Nov 2021 11:21:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20close=20#3352?= =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=BD=BF=E7=94=A8Oracle?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/data/mybatis/MybatisPlusConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index 19b324694..e832d250f 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -90,7 +90,7 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer { interceptor.addInnerInterceptor(dataScopeInnerInterceptor); // 分页支持 PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); - paginationInnerInterceptor.setDbType(DbType.MYSQL); + paginationInnerInterceptor.setDbType(); paginationInnerInterceptor.setMaxLimit(1000L); interceptor.addInnerInterceptor(paginationInnerInterceptor); return interceptor; From 9d1730d9de40aaa58b294f8144587c8e95c3da11 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 19 Nov 2021 11:54:59 +0800 Subject: [PATCH 2/9] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20close=20#3352?= =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=BD=BF=E7=94=A8Oracle?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/data/mybatis/MybatisPlusConfiguration.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index e832d250f..988b1c33b 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.common.data.mybatis; -import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; @@ -90,7 +89,6 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer { interceptor.addInnerInterceptor(dataScopeInnerInterceptor); // 分页支持 PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); - paginationInnerInterceptor.setDbType(); paginationInnerInterceptor.setMaxLimit(1000L); interceptor.addInnerInterceptor(paginationInnerInterceptor); return interceptor; From 028ffa667ab10d5b6a525871febebeabeb5b913e Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 19 Nov 2021 11:55:11 +0800 Subject: [PATCH 3/9] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20close=20#3355?= =?UTF-8?q?=20Admin=20=E6=A8=A1=E5=9D=97=E5=90=AF=E5=8A=A8=E6=8F=90?= =?UTF-8?q?=E7=A4=BA:=20=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=BD=93=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E9=A2=9D=E5=A4=96=E6=9A=B4=E9=9C=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pig4cloud/pigx/admin/controller/SysFileController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java index 255ce1166..e399d36f8 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java @@ -104,7 +104,7 @@ public class SysFileController { * @param response 本地文件 */ @SneakyThrows - @GetMapping("/local/{fileName}") + @GetMapping("/local/file/{fileName}") public void localFile(@PathVariable String fileName, HttpServletResponse response) { ClassPathResource resource = new ClassPathResource("file/" + fileName); response.setContentType("application/octet-stream; charset=UTF-8"); From 1f01ad0b57a81ede914b1e0e26763002c880054e Mon Sep 17 00:00:00 2001 From: "361243819@qq.com" <7215210> Date: Tue, 30 Nov 2021 11:20:24 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9D=83=E9=99=90=E5=86=99=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/admin/controller/SysUserController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java index c068c81dc..91b2f77ea 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java @@ -188,7 +188,7 @@ public class SysUserController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_log_export')") + @PreAuthorize("@pms.hasPermission('sys_user_export')") public List export(UserDTO userDTO) { return userService.listUser(userDTO); } @@ -200,7 +200,7 @@ public class SysUserController { * @return R */ @PostMapping("/import") - @PreAuthorize("@pms.hasPermission('sys_log_export')") + @PreAuthorize("@pms.hasPermission('sys_user_export')") public R importUser(@RequestExcel List excelVOList, BindingResult bindingResult) { return userService.importUser(excelVOList, bindingResult); } From 61983ec9463130fe7ef128cbd35e99fae5072832 Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 30 Nov 2021 21:48:09 +0800 Subject: [PATCH 5/9] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.?= =?UTF-8?q?=20close=20#3396=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E6=96=87=E6=A1=A3=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-visual/pigx-codegen/pom.xml | 7 +++++ .../controller/GeneratorController.java | 29 +++++++++++++++++++ pom.xml | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 022fa8f91..51e45c7bc 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -15,6 +15,7 @@ 代码生成模块 + 0.0.1 4.0 11.5.0.0 12.1.0.1-atlassian-hosted @@ -123,6 +124,12 @@ org.apache.velocity ${velocity.version} + + + io.springboot.plugin + screw-spring-boot-starter + ${screw.version} + org.springframework.boot diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GeneratorController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GeneratorController.java index 38d7b5d93..c272a0bb3 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GeneratorController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GeneratorController.java @@ -17,18 +17,25 @@ package com.pig4cloud.pigx.codegen.controller; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; +import cn.smallbun.screw.boot.config.Screw; +import cn.smallbun.screw.boot.properties.ScrewProperties; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.codegen.entity.GenConfig; import com.pig4cloud.pigx.codegen.service.GenTableColumnService; import com.pig4cloud.pigx.codegen.service.GeneratorService; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import javax.sql.DataSource; /** * 代码生成器 @@ -41,6 +48,8 @@ import javax.servlet.http.HttpServletResponse; @RequestMapping("/generator") public class GeneratorController { + private final Screw screw; + private final GeneratorService generatorService; private final GenTableColumnService columnService; @@ -94,4 +103,24 @@ public class GeneratorController { IoUtil.write(response.getOutputStream(), Boolean.TRUE, data); } + @SneakyThrows + @GetMapping("/doc") + public void generatorDoc(String[] tableNames, String dsName, HttpServletResponse response) { + // 设置指定的数据源 + DynamicRoutingDataSource dynamicRoutingDataSource = SpringContextHolder.getBean(DynamicRoutingDataSource.class); + DynamicDataSourceContextHolder.push(dsName); + DataSource dataSource = dynamicRoutingDataSource.determineDataSource(); + + // 设置指定的目标表 + ScrewProperties screwProperties = SpringContextHolder.getBean(ScrewProperties.class); + screwProperties.setDesignatedTableName(CollUtil.toList(tableNames)); + + // 生成 + byte[] data = screw.documentGeneration(dataSource, screwProperties).toByteArray(); + response.reset(); + response.addHeader(HttpHeaders.CONTENT_LENGTH, String.valueOf(data.length)); + response.setContentType("application/octet-stream; charset=UTF-8"); + IoUtil.write(response.getOutputStream(), Boolean.TRUE, data); + } + } diff --git a/pom.xml b/pom.xml index ac1a79f27..b6a5d24b0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ - 2.5.6 + 2.5.7 2020.0.4 2021.1 UTF-8 From c7c30c118a1a45bb140abc7686224d9ba4ac0d43 Mon Sep 17 00:00:00 2001 From: lbw Date: Wed, 1 Dec 2021 14:36:34 +0800 Subject: [PATCH 6/9] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20closd=20#3398?= =?UTF-8?q?=20=E3=80=90=E5=A4=A7=E5=B1=8F=E8=AE=BE=E8=AE=A1=E3=80=91?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=B4=E6=8A=A4=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=20maxActive=20can't=20not=20set=20zero?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaea/business/config/DruidProperties.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/DruidProperties.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/DruidProperties.java index 7d901bfea..d7f19289f 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/DruidProperties.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/DruidProperties.java @@ -79,22 +79,6 @@ public class DruidProperties { datasource.setUsername(username); datasource.setPassword(password); datasource.setDriverClassName(driverClassName); - // configuration - datasource.setInitialSize(initialSize); - datasource.setMinIdle(minIdle); - datasource.setMaxActive(maxActive); - datasource.setMaxWait(maxWait); - - datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); - datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis); - datasource.setTestWhileIdle(testWhileIdle); - - datasource.setPoolPreparedStatements(poolPreparedStatements); - datasource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize); - - datasource.setConnectionErrorRetryAttempts(connectionErrorRetryAttempts); - datasource.setBreakAfterAcquireFailure(breakAfterAcquireFailure); - datasource.setTimeBetweenConnectErrorMillis(timeBetweenConnectErrorMillis); return datasource; } From 7feec1b445322f25855ccdef1bb9478e41b88d9d Mon Sep 17 00:00:00 2001 From: dobo <94636829@qq.com> Date: Fri, 3 Dec 2021 10:11:27 +0800 Subject: [PATCH 7/9] =?UTF-8?q?pigx-common-bom=E4=B8=8Bxxljob=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0=E4=B8=BA2.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-common/pigx-common-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 6a962072d..2c3a2c457 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -30,7 +30,7 @@ 0.5.0 2.3.6.RELEASE 1.2.75 - 2.2.0 + 2.3.0 3.0.52.ALL 1.11.543 0.0.23 From d9ef13ae2f99b78aabcf636ab7879a562082e320 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 3 Dec 2021 14:35:49 +0800 Subject: [PATCH 8/9] =?UTF-8?q?:sparkles:=20=20spi=20spring.factories=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ClientDetailsFeignClient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx-upms-api/src/main/resources/META-INF/spring.factories | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories index 6822beadc..b1b94cd3d 100755 --- a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories +++ b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories @@ -1,8 +1,9 @@ # 配置 feignclient 的全类名路径， 避免包名不规范无法扫描问题 com.pig4cloud.pigx.common.feign.PigxFeignAutoConfiguration=\ com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService,\ + com.pig4cloud.pigx.admin.api.feign.RemoteClientDetailsService,\ com.pig4cloud.pigx.admin.api.feign.RemoteLogService,\ com.pig4cloud.pigx.admin.api.feign.RemoteParamService,\ com.pig4cloud.pigx.admin.api.feign.RemoteTenantService,\ com.pig4cloud.pigx.admin.api.feign.RemoteTokenService,\ - com.pig4cloud.pigx.admin.api.feign.RemoteUserService \ No newline at end of file + com.pig4cloud.pigx.admin.api.feign.RemoteUserService From 3b2e6d841b8a8c0c72c7790e989bcbad62feca1e Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 3 Dec 2021 14:39:14 +0800 Subject: [PATCH 9/9] =?UTF-8?q?:memo:=20close=20#3410=20common-test=20?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E6=A8=A1=E5=9D=97=20?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=8F=8A=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pig4cloud/pigx/test/kit/OAuthKit.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/kit/OAuthKit.java b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/kit/OAuthKit.java index ada75a05a..e39879987 100644 --- a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/kit/OAuthKit.java +++ b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/kit/OAuthKit.java @@ -3,6 +3,7 @@ package com.pig4cloud.pigx.test.kit; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import org.springframework.http.HttpHeaders; import org.springframework.security.oauth2.client.OAuth2ClientContext; +import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.test.web.servlet.request.RequestPostProcessor; /** @@ -21,7 +22,8 @@ public class OAuthKit { return mockRequest -> { OAuth2ClientContext clientContext = SpringContextHolder.getBean(OAuth2ClientContext.class); String token = clientContext.getAccessToken().getValue(); - mockRequest.addHeader(HttpHeaders.AUTHORIZATION, String.format("Bearer: %s", token)); + mockRequest.addHeader(HttpHeaders.AUTHORIZATION, + String.format("%s %s", OAuth2AccessToken.BEARER_TYPE, token)); return mockRequest; }; }