publish 2.0.17-scope-0.2-test

- 新增测试用 TokenBean 对象，用于模拟登录成功后的处理
- 修改重定向 URL，增加测试参数

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.15</version>
+    <version>2.0.17-scope-0.2-test</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.15</version>
+                <version>2.0.17-scope-0.2-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.15</version>
+                <version>2.0.17-scope-0.2-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.15</version>
+                <version>2.0.17-scope-0.2-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.15</version>
+                <version>2.0.17-scope-0.2-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.15</version>
+                <version>2.0.17-scope-0.2-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.15</version>
+                <version>2.0.17-scope-0.2-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.15</version>
+                <version>2.0.17-scope-0.2-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.15</version>
+                <version>2.0.17-scope-0.2-test</version>
             </dependency>
 
             <dependency>
@@ -120,8 +120,8 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>kepai-repo-plugin</id>
+            <id>tiesheng-repo-plugin</id>
-            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
         </pluginRepository>
     </pluginRepositories>
 

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.15</version>
+        <version>2.0.17-scope-0.2-test</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.15</version>
+    <version>2.0.17-scope-0.2-test</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.15</version>
+        <version>2.0.17-scope-0.2-test</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.15</version>
+        <version>2.0.17-scope-0.2-test</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.15</version>
+        <version>2.0.17-scope-0.2-test</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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

@@ -170,8 +170,9 @@ 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);
+//        response.sendRedirect(authorizationUrl);
+        response.sendRedirect(configUrl+"&to=mobile&code=200");
     }
 
 
@@ -181,9 +182,13 @@ 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-login/src/main/java/com/tiesheng/login/service/CorePlatformUniqueService.java

@@ -43,9 +43,12 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
      */
     public TokenBean login(DoLoginInfo loginInfo) {
 
-        int loginErrorTimes = coreLogLoginMapper.getLoginErrorTimes(loginInfo.getLoginIp());
+        int loginErrorTimes = tsLoginConfigurer.getLoginErrorTimes();
-        if (loginErrorTimes > 4) {
+        if (loginErrorTimes > 0) {
-            throw new ApiException("登录失败已达5次，请10分钟后再试");
+            int currentErrorTimes = coreLogLoginMapper.getLoginErrorTimes(loginInfo.getLoginIp());
+            if (currentErrorTimes >= loginErrorTimes) {
+                throw new ApiException("登录失败已达" + loginErrorTimes + "次，请10分钟后再试");
+            }
         }
 
         CorePlatformUnique platformUnique = getOneByColumn("unique_id", loginInfo.getUnique());

springboot-login/src/main/java/com/tiesheng/login/service/TsLoginConfigurer.java

@@ -36,7 +36,7 @@ public interface TsLoginConfigurer {
     /**
      * 登录失败的时候
      */
-    default void onLoginError(String to,HttpServletResponse response) {
+    default void onLoginError(String to, HttpServletResponse response) {
         ServletKit.write(response, "404", "text");
     }
 
@@ -66,4 +66,14 @@ public interface TsLoginConfigurer {
      */
     RequestUserInfo getCurrentUserName(TokenBean userId);
 
+
+    /**
+     * 获取登录失败的次数，默认5次
+     *
+     * @return
+     */
+    default int getLoginErrorTimes() {
+        return 0;
+    }
+
 }

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.15</version>
+        <version>2.0.17-scope-0.2-test</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.15</version>
+        <version>2.0.17-scope-0.2-test</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.15</version>
+        <version>2.0.17-scope-0.2-test</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.15</version>
+        <version>2.0.17-scope-0.2-test</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.15</version>
+        <version>2.0.17-scope-0.2-test</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/web/controller/system/ConfigSystemController.java

@@ -9,6 +9,7 @@ import com.tiesheng.util.pojos.PageDTO;
 import com.tiesheng.web.pojos.dao.CoreConfigSystem;
 import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO;
 import com.tiesheng.web.service.CoreConfigService;
+import com.tiesheng.web.service.TieshengWebConfigurer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,6 +25,8 @@ public class ConfigSystemController {
 
     @Autowired
     CoreConfigService coreConfigService;
+    @Autowired
+    TieshengWebConfigurer tieshengWebConfigurer;
 
 
     /**
@@ -53,6 +56,7 @@ public class ConfigSystemController {
      */
     @PostMapping("/system/update")
     public ApiResp<String> systemUpdate(@RequestBody ConfigSystemDTO dto) {
+        tieshengWebConfigurer.configSystemCheck(dto);
         coreConfigService.updateConfigSystem(dto);
         return ApiResp.respOK("");
     }

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

@@ -22,8 +22,7 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
     CoreConfigEnumMapper coreConfigEnumMapper;
     @Resource
     TsCacheService tsCacheService;
-    @Autowired
+
-    TieshengWebConfigurer tieshengWebConfigurer;
 
     private static final String CONFIG_SYSTEM_PREFIX = "CONFIG:SYSTEM:";
 
@@ -79,8 +78,6 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
         configKey.setConfigVal(dto.getConfigVal());
         configKey.setRemark(dto.getRemark());
         configKey.setExtra(dto.getExtra());
-
-        tieshengWebConfigurer.configSystemCheck(configKey);
         updateById(configKey);
 
         tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, configKey, 10 * 60);

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

@@ -5,6 +5,7 @@ import com.tiesheng.login.service.TsLoginConfigurer;
 import com.tiesheng.util.exception.ApiRespEnum;
 import com.tiesheng.util.pojos.ApiResp;
 import com.tiesheng.web.pojos.dao.CoreConfigSystem;
+import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -58,7 +59,7 @@ public interface TieshengWebConfigurer {
      * 系统配置验证
      * 如果不符合规则，可以抛出异常
      */
-    default void configSystemCheck(CoreConfigSystem configSystem) {
+    default void configSystemCheck(ConfigSystemDTO dto) {
     }
 
     ///////////////////////////////////////////////////////////////////////////