Compare commits

..

2 Commits

Author SHA1 Message Date
丁磊
bd70fdc498 publish 2.0.27-scope-0.1
All checks were successful
/ local-deploy (push) Successful in 19s
2025-06-09 18:32:26 +08:00
丁磊
ceef7180f7 fix(login): 修改微信公众号登录授权级别
- 将 snsapi_userinfo 修改为 snsapi_base,以解决普通网页授权问题
2025-06-09 18:32:06 +08:00
13 changed files with 24 additions and 32 deletions

18
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
<packaging>pom</packaging>
<name>springboot-parent</name>
<description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,49 +58,49 @@
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-database</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-role</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</dependency>
<dependency>

View File

@@ -6,11 +6,11 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-ademo</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-annotation</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-database</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-login</artifactId>

View File

@@ -170,7 +170,7 @@ public class LoginController {
extra = "";
}
String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra);
String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_base");
response.sendRedirect(authorizationUrl);
}

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-message</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-platform</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-role</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-util</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.27-sb1</version>
<version>2.0.27-scope-0.1</version>
</parent>
<artifactId>springboot-web</artifactId>

View File

@@ -122,10 +122,8 @@ public class ToolController {
*/
@TokenIgnore
@PostMapping("/file/chunk_upload")
public ApiResp<String> fileChunkUpload(@RequestParam("file") MultipartFile file,
String fileMd5, Integer chunk,
String flowFilename) {
fileUploadService.chunkUpload(file, fileMd5, chunk, flowFilename);
public ApiResp<String> fileChunkUpload(@RequestParam("file") MultipartFile file, String fileMd5, Integer chunk) {
fileUploadService.chunkUpload(file, fileMd5, chunk);
return ApiResp.respOK("");
}
@@ -213,8 +211,7 @@ public class ToolController {
///////////////////////////////////////////////////////////////////////////
// export
/// ////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
@TokenIgnore
@OperationIgnore

View File

@@ -92,14 +92,11 @@ public class FileUploadService {
* @param fileMd5
* @param chunk
*/
public void chunkUpload(MultipartFile file, String fileMd5, Integer chunk, String flowFilename) {
public void chunkUpload(MultipartFile file, String fileMd5, Integer chunk) {
if (file == null) {
throw new ApiException("请选择文件后上传");
}
String fileType = FileUtil.extName(flowFilename);
tieshengWebConfigurer.uploadFileCheck(fileType);
try {
// 块文件
FileUploadPath folder = FileUploadPath.folder(fileMd5);
@@ -119,8 +116,6 @@ public class FileUploadService {
*/
public String chunkMerge(String fileMd5, String fileExt) {
tieshengWebConfigurer.uploadFileCheck(fileExt);
// 1获取文件块的目录
FileUploadPath folder = FileUploadPath.folder(fileMd5);