publish 2.0.17-test

.gitlab-ci.yml

@@ -1,17 +0,0 @@
-stages:
-  - deploy
-
-deploy-jar:
-  stage: deploy
-  tags:
-    - zengos
-  rules:
-    - if: $CI_COMMIT_TAG
-  script:
-    - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:$TAG_REPO_FOLDER
-    - cd $TAG_REPO_FOLDER
-    - git checkout master
-    - git pull
-    - git add .
-    - git commit -m "deploy $CI_PROJECT_NAME $CI_COMMIT_TAG"
-    - git push origin master

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.14</version>
+    <version>2.0.17-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.14</version>
+                <version>2.0.17-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.14</version>
+                <version>2.0.17-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.14</version>
+                <version>2.0.17-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.14</version>
+                <version>2.0.17-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.14</version>
+                <version>2.0.17-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.14</version>
+                <version>2.0.17-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.14</version>
+                <version>2.0.17-test</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.14</version>
+                <version>2.0.17-test</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.14</version>
+        <version>2.0.17-test</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.14</version>
+    <version>2.0.17-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.14</version>
+        <version>2.0.17-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.14</version>
+        <version>2.0.17-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.14</version>
+        <version>2.0.17-test</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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

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

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());
-        if (loginErrorTimes > 4) {
-            throw new ApiException("登录失败已达5次，请10分钟后再试");
+        int loginErrorTimes = tsLoginConfigurer.getLoginErrorTimes();
+        if (loginErrorTimes > 0) {
+            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.14</version>
+        <version>2.0.17-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.14</version>
+        <version>2.0.17-test</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/PlatformWxmpConfig.java

@@ -162,7 +162,8 @@ public class PlatformWxmpConfig {
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     public Map<String, WxConfigBean> getConfigs() {
         return configs;

springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxOAuth2AccessToken.java

@@ -11,6 +11,7 @@ public class WxOAuth2AccessToken {
 
     private String accessToken;
     private String openid;
+    private String isSnapshotuser;
 
     public static WxOAuth2AccessToken create(String appId, String secret, String code) {
         String response = OkHttpUtil.get("https://api.weixin.qq.com/sns/oauth2/access_token" +
@@ -23,10 +24,20 @@ public class WxOAuth2AccessToken {
         return oAuth2AccessToken;
     }
 
+    /**
+     * 是否是真实用户
+     *
+     * @return
+     */
+    public boolean isRealUser() {
+        return !"1".equals(isSnapshotuser);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     public String getAccessToken() {
         return accessToken;
@@ -43,4 +54,12 @@ public class WxOAuth2AccessToken {
     public void setOpenid(String openid) {
         this.openid = openid;
     }
+
+    public String getIsSnapshotuser() {
+        return isSnapshotuser;
+    }
+
+    public void setIsSnapshotuser(String isSnapshotuser) {
+        this.isSnapshotuser = isSnapshotuser;
+    }
 }

springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxUserInfo.java

@@ -17,6 +17,7 @@ public class WxUserInfo {
     private String headimgurl;
     private String openid;
     private String appId;
+    private boolean isRealUser;
 
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法
@@ -33,13 +34,16 @@ public class WxUserInfo {
         String s = OkHttpUtil.get("https://api.weixin.qq.com/sns/userinfo"
                 + "?access_token=" + oAuth2AccessToken.getAccessToken()
                 + "&openid=" + oAuth2AccessToken.getOpenid() + "&lang=zh_CN");
-        return JSON.parseObject(s, WxUserInfo.class);
+        WxUserInfo wxUserInfo = JSON.parseObject(s, WxUserInfo.class);
+        wxUserInfo.setRealUser(oAuth2AccessToken.isRealUser());
+        return wxUserInfo;
     }
 
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     public String getAccessToken() {
         return accessToken;
@@ -112,4 +116,12 @@ public class WxUserInfo {
     public void setAppId(String appId) {
         this.appId = appId;
     }
+
+    public boolean isRealUser() {
+        return isRealUser;
+    }
+
+    public void setRealUser(boolean realUser) {
+        isRealUser = realUser;
+    }
 }

springboot-role/pom.xml

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

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

@@ -4,7 +4,6 @@ package com.tiesheng.web.controller.system;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tiesheng.annotation.role.RoleAuthority;
-import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.pojos.ApiResp;
 import com.tiesheng.util.pojos.PageDTO;
 import com.tiesheng.web.pojos.dao.CoreConfigSystem;
@@ -57,21 +56,8 @@ public class ConfigSystemController {
      */
     @PostMapping("/system/update")
     public ApiResp<String> systemUpdate(@RequestBody ConfigSystemDTO dto) {
-
-        CoreConfigSystem configKey = coreConfigService.getOneByColumn("config_key", dto.getConfigKey());
-        if (configKey == null) {
-            throw new ApiException("该配置不存在，请检查");
-        }
-        if (configKey.getReadOnly() == 1) {
-            throw new ApiException("该配置只读，不可修改");
-        }
-        configKey.setConfigVal(dto.getConfigVal());
-        configKey.setRemark(dto.getRemark());
-        configKey.setExtra(dto.getExtra());
-
-        tieshengWebConfigurer.configSystemCheck(configKey);
-        coreConfigService.updateById(configKey);
-
+        tieshengWebConfigurer.configSystemCheck(dto);
+        coreConfigService.updateConfigSystem(dto);
         return ApiResp.respOK("");
     }
 

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

@@ -1,12 +1,17 @@
 package com.tiesheng.web.service;
 
+import com.tiesheng.util.exception.ApiException;
+import com.tiesheng.util.service.TsCacheService;
+import com.tiesheng.util.service.TsServiceBase;
 import com.tiesheng.web.mapper.CoreConfigEnumMapper;
 import com.tiesheng.web.mapper.CoreConfigSystemMapper;
 import com.tiesheng.web.pojos.dao.CoreConfigSystem;
-import com.tiesheng.util.service.TsServiceBase;
+import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @author hao
  */
@@ -15,6 +20,11 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
 
     @Autowired
     CoreConfigEnumMapper coreConfigEnumMapper;
+    @Resource
+    TsCacheService tsCacheService;
+
+
+    private static final String CONFIG_SYSTEM_PREFIX = "CONFIG:SYSTEM:";
 
     public CoreConfigEnumMapper getEnumMapper() {
         return coreConfigEnumMapper;
@@ -28,7 +38,14 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
      * @return
      */
     public CoreConfigSystem getTextOrCreate(String configKey, String defaultValue) {
-        CoreConfigSystem oneByColumn = getOneByColumn("config_key", configKey);
+        CoreConfigSystem oneByColumn = tsCacheService.getObj(CONFIG_SYSTEM_PREFIX + configKey,
+                CoreConfigSystem.class, -1);
+
+        if (oneByColumn != null) {
+            return oneByColumn;
+        }
+
+        oneByColumn = getOneByColumn("config_key", configKey);
         if (oneByColumn == null) {
             oneByColumn = new CoreConfigSystem();
             oneByColumn.setId(configKey);
@@ -38,7 +55,33 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
             oneByColumn.setConfigType(0);
             save(oneByColumn);
         }
+
+        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, oneByColumn, 10 * 60);
+
         return oneByColumn;
     }
 
+
+    /**
+     * 更新数据
+     *
+     * @param dto
+     */
+    public void updateConfigSystem(ConfigSystemDTO dto) {
+        CoreConfigSystem configKey = getOneByColumn("config_key", dto.getConfigKey());
+        if (configKey == null) {
+            throw new ApiException("该配置不存在，请检查");
+        }
+        if (configKey.getReadOnly() == 1) {
+            throw new ApiException("该配置只读，不可修改");
+        }
+        configKey.setConfigVal(dto.getConfigVal());
+        configKey.setRemark(dto.getRemark());
+        configKey.setExtra(dto.getExtra());
+        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) {
     }
 
     ///////////////////////////////////////////////////////////////////////////