publish 2.0.27-sb1

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.27-scope-0.2-test</version>
+    <version>2.0.27-sb1</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-scope-0.2-test</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.27-scope-0.2-test</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.27-scope-0.2-test</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.27-scope-0.2-test</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.27-scope-0.2-test</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.27-scope-0.2-test</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.27-scope-0.2-test</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.27-scope-0.2-test</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

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

springboot-annotation/pom.xml

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

springboot-database/pom.xml

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

springboot-login/pom.xml

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

springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java

@@ -170,9 +170,8 @@ public class LoginController {
             extra = "";
         }
         String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra);
-//        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_base");
+        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
-//        response.sendRedirect(authorizationUrl);
+        response.sendRedirect(authorizationUrl);
-        response.sendRedirect(configUrl+"&to=mobile&code=200");
     }
 
 
@@ -182,13 +181,9 @@ public class LoginController {
     @RequestMapping("/wxmp/oauth2/{service}")
     @OperationIgnore
     public void wxmpOauth2(@PathVariable String service, CodeExtraDTO dto, HttpServletResponse response) {
-//        WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
+        WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
-//        TokenBean tokenBean = corePlatformUniqueService.login(new DoLoginInfo(wxUserInfo.getAppId(),
+        TokenBean tokenBean = corePlatformUniqueService.login(new DoLoginInfo(wxUserInfo.getAppId(),
-//                wxUserInfo.getOpenid(), "wxmp", JSON.toJSONString(wxUserInfo)));
+                wxUserInfo.getOpenid(), "wxmp", JSON.toJSONString(wxUserInfo)));
-        TokenBean tokenBean = new TokenBean();
-        tokenBean.setId("testid");
-        tokenBean.setRoleId("testroleid");
-        tokenBean.setExtra("testextra");
         corePlatformUniqueService.redirect(tokenBean, dto.getTo(), dto.getExtra(), response);
     }
 

springboot-message/pom.xml

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

springboot-platform/pom.xml

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

springboot-role/pom.xml

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

springboot-util/pom.xml

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

springboot-web/pom.xml

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

springboot-web/src/main/java/com/tiesheng/web/controller/comm/ToolController.java

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

springboot-web/src/main/java/com/tiesheng/web/service/FileUploadService.java

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