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

pigx-common/pigx-common-bom/pom.xml

@@ -30,7 +30,7 @@
 		<excel.version>0.5.0</excel.version>
 		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
 		<fastjson.version>1.2.75</fastjson.version>
-		<xxl.job.version>2.2.0</xxl.job.version>
+		<xxl.job.version>2.3.0</xxl.job.version>
 		<aliyun.version>3.0.52.ALL</aliyun.version>
 		<aws.version>1.11.543</aws.version>
 		<javaformat.plugin.version>0.0.23</javaformat.plugin.version>

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(DbType.MYSQL);
 		paginationInnerInterceptor.setMaxLimit(1000L);
 		interceptor.addInnerInterceptor(paginationInnerInterceptor);
 		return interceptor;

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;
 		};
 	}

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
+  com.pig4cloud.pigx.admin.api.feign.RemoteUserService

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");

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<UserExcelVO> excelVOList, BindingResult bindingResult) {
 		return userService.importUser(excelVOList, bindingResult);
 	}

pigx-visual/pigx-codegen/pom.xml

@@ -15,6 +15,7 @@
 	<description>代码生成模块</description>
 
 	<properties>
+		<screw.version>0.0.1</screw.version>
 		<sqlserver.version>4.0</sqlserver.version>
 		<db2.version>11.5.0.0</db2.version>
 		<oracle.version>12.1.0.1-atlassian-hosted</oracle.version>
@@ -123,6 +124,12 @@
 			<groupId>org.apache.velocity</groupId>
 			<version>${velocity.version}</version>
 		</dependency>
+		<!--生成文档-->
+		<dependency>
+			<groupId>io.springboot.plugin</groupId>
+			<artifactId>screw-spring-boot-starter</artifactId>
+			<version>${screw.version}</version>
+		</dependency>
 		<!--web 模块-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

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);
+	}
+
 }

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;
 	}
 

pom.xml

@@ -33,7 +33,7 @@
 	</organization>
 
 	<properties>
-		<spring-boot.version>2.5.6</spring-boot.version>
+		<spring-boot.version>2.5.7</spring-boot.version>
 		<spring-cloud.version>2020.0.4</spring-cloud.version>
 		<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>