publish 2.0.20

.gitlab-ci.yml

@@ -0,0 +1,17 @@
+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.17-test</version>
+    <version>2.0.20</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.17-test</version>
+                <version>2.0.20</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.20</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.20</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.20</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.20</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.20</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.20</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.17-test</version>
+                <version>2.0.20</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.17-test</version>
+        <version>2.0.20</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.17-test</version>
+    <version>2.0.20</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.tiesheng.annotation.role.RoleAuthority;
 import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.database.config.DbBackupConfig;
+import com.tiesheng.demo.pojos.CustTokenBean;
 import com.tiesheng.demo.pojos.JsonTest;
 import com.tiesheng.demo.pojos.PoiBean;
 import com.tiesheng.platform.config.ding.PlatformDingConfig;
@@ -43,7 +44,6 @@ import java.util.function.Consumer;
  */
 @RestController
 @RequestMapping("/test")
-@RoleAuthority(value = "test", group = "test")
 public class TestController {
 
     @Autowired
@@ -65,7 +65,6 @@ public class TestController {
 
 
     @RequestMapping("/index")
-    @TokenIgnore
     public void index(HttpServletResponse response) {
         globalConfig.redirectWithVer("mobile", "/test", response);
     }
@@ -113,8 +112,9 @@ public class TestController {
 
 
     @GetMapping("/send")
-    @TokenIgnore
+    public ApiResp<String> sendMessage(CustTokenBean tokenBean) {
-    public ApiResp<String> sendMessage() {
+
+        tokenBean.test();
 
 //        MessageReqResp reqResp = coreMessageService.send(new UserChannel("13567116463", "sms"),
 //                JSONUtil.createObj().putOpt("action", "sms-visitor-invite"));

springboot-ademo/src/main/java/com/tiesheng/demo/pojos/CustTokenBean.java

@@ -0,0 +1,12 @@
+package com.tiesheng.demo.pojos;
+
+import com.tiesheng.util.pojos.TokenBean;
+
+public class CustTokenBean extends TokenBean {
+
+
+    public void test() {
+        System.out.println("test: " + getId());
+    }
+
+}

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.20</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.17-test</version>
+        <version>2.0.20</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.17-test</version>
+        <version>2.0.20</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-login/src/main/java/com/tiesheng/login/config/TokenWebMvcConfigurer.java

@@ -1,5 +1,6 @@
 package com.tiesheng.login.config;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.tiesheng.annotation.token.TokenIgnore;
@@ -40,7 +41,7 @@ public class TokenWebMvcConfigurer implements WebMvcConfigurer {
         resolvers.add(new HandlerMethodArgumentResolver() {
             @Override
             public boolean supportsParameter(MethodParameter parameter) {
-                return parameter.getParameterType().isAssignableFrom(TokenBean.class);
+                return TokenBean.class.isAssignableFrom(parameter.getParameterType());
             }
 
             @Override
@@ -54,7 +55,9 @@ public class TokenWebMvcConfigurer implements WebMvcConfigurer {
                     TokenIgnore annotation = method.getAnnotation(TokenIgnore.class);
                     thrExp = annotation == null;
                 }
-                return tsTokenConfig.validToken(header, thrExp);
+
+                TokenBean tokenBean = tsTokenConfig.validToken(header, thrExp);
+                return BeanUtil.copyProperties(tokenBean, parameter.getParameterType());
             }
         });
     }

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_base");
+        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
         response.sendRedirect(authorizationUrl);
     }
 

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

@@ -68,7 +68,7 @@ public interface TsLoginConfigurer {
 
 
     /**
-     * 获取登录失败的次数，默认5次
+     * 获取登录失败的次数，默认0次，不校验
      *
      * @return
      */

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.20</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.17-test</version>
+        <version>2.0.20</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

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

@@ -162,8 +162,7 @@ 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,7 +11,6 @@ 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" +
@@ -24,20 +23,10 @@ public class WxOAuth2AccessToken {
         return oAuth2AccessToken;
     }
 
-    /**
-     * 是否是真实用户
-     *
-     * @return
-     */
-    public boolean isRealUser() {
-        return !"1".equals(isSnapshotuser);
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-
+    ///////////////////////////////////////////////////////////////////////////
-    /// ////////////////////////////////////////////////////////////////////////
 
     public String getAccessToken() {
         return accessToken;
@@ -54,12 +43,4 @@ 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,7 +17,6 @@ public class WxUserInfo {
     private String headimgurl;
     private String openid;
     private String appId;
-    private boolean isRealUser;
 
     ///////////////////////////////////////////////////////////////////////////
     // 逻辑方法
@@ -34,16 +33,13 @@ public class WxUserInfo {
         String s = OkHttpUtil.get("https://api.weixin.qq.com/sns/userinfo"
                 + "?access_token=" + oAuth2AccessToken.getAccessToken()
                 + "&openid=" + oAuth2AccessToken.getOpenid() + "&lang=zh_CN");
-        WxUserInfo wxUserInfo = JSON.parseObject(s, WxUserInfo.class);
+        return JSON.parseObject(s, WxUserInfo.class);
-        wxUserInfo.setRealUser(oAuth2AccessToken.isRealUser());
-        return wxUserInfo;
     }
 
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-
+    ///////////////////////////////////////////////////////////////////////////
-    /// ////////////////////////////////////////////////////////////////////////
 
     public String getAccessToken() {
         return accessToken;
@@ -116,12 +112,4 @@ 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.17-test</version>
+        <version>2.0.20</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.17-test</version>
+        <version>2.0.20</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-util/src/main/java/com/tiesheng/util/config/Ip2regionConfig.java

@@ -16,7 +16,7 @@ import javax.annotation.PostConstruct;
 @ConfigurationProperties(prefix = "tiesheng.ip2region")
 public class Ip2regionConfig {
 
-    private String dbUrl = "http://git.kepai365.com/tiesheng/repository/raw/master/ipdb/ip2region.xdb";
+    private String dbUrl = "https://git.tieshengkeji.com/tieshengkeji/Ip2region/raw/branch/main/ip2region.xdb";
     private String dbPath = System.getProperty("user.dir") + "/runtime/ip2region/ip2region.xdb";
 
     ///////////////////////////////////////////////////////////////////////////

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-test</version>
+        <version>2.0.20</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

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

@@ -68,19 +68,20 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
      * @param dto
      */
     public void updateConfigSystem(ConfigSystemDTO dto) {
-        CoreConfigSystem configKey = getOneByColumn("config_key", dto.getConfigKey());
+        CoreConfigSystem coreConfigSystem = getOneByColumn("config_key", dto.getConfigKey());
-        if (configKey == null) {
+        if (coreConfigSystem == null) {
             throw new ApiException("该配置不存在，请检查");
         }
-        if (configKey.getReadOnly() == 1) {
+        if (coreConfigSystem.getReadOnly() == 1) {
             throw new ApiException("该配置只读，不可修改");
         }
-        configKey.setConfigVal(dto.getConfigVal());
+        coreConfigSystem.setConfigVal(dto.getConfigVal());
-        configKey.setRemark(dto.getRemark());
+        coreConfigSystem.setRemark(dto.getRemark());
-        configKey.setExtra(dto.getExtra());
+        coreConfigSystem.setExtra(dto.getExtra());
-        updateById(configKey);
+        updateById(coreConfigSystem);
 
-        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, configKey, 10 * 60);
+        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + coreConfigSystem.getConfigKey(),
+                coreConfigSystem, 10 * 60);
     }