publish 2.0.17-scope-0.2-test

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

CHANGELOG_V1.md

@@ -50,7 +50,7 @@
   <repositories>
         <repository>
             <id>kepai-repo</id>
-            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
+            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
         </repository>
     </repositories>
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.26</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.26</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.26</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.26</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.26</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.26</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.26</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.26</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.26</version>
+                <version>2.0.17-scope-0.2-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.26</version>
+        <version>2.0.17-scope-0.2-test</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.26</version>
+    <version>2.0.17-scope-0.2-test</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -46,8 +46,8 @@
 
     <repositories>
         <repository>
-            <id>tiesheng-repo</id>
+            <id>kepai-repo</id>
-            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
+            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
         </repository>
     </repositories>
 

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

@@ -12,7 +12,6 @@ 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;
@@ -44,6 +43,7 @@ import java.util.function.Consumer;
  */
 @RestController
 @RequestMapping("/test")
+@RoleAuthority(value = "test", group = "test")
 public class TestController {
 
     @Autowired
@@ -65,6 +65,7 @@ public class TestController {
 
 
     @RequestMapping("/index")
+    @TokenIgnore
     public void index(HttpServletResponse response) {
         globalConfig.redirectWithVer("mobile", "/test", response);
     }
@@ -112,9 +113,8 @@ public class TestController {
 
 
     @GetMapping("/send")
-    public ApiResp<String> sendMessage(CustTokenBean tokenBean) {
+    @TokenIgnore
-
+    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

@@ -1,12 +0,0 @@
-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.26</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.26</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.26</version>
+        <version>2.0.17-scope-0.2-test</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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

@@ -1,6 +1,5 @@
 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;
@@ -41,7 +40,7 @@ public class TokenWebMvcConfigurer implements WebMvcConfigurer {
         resolvers.add(new HandlerMethodArgumentResolver() {
             @Override
             public boolean supportsParameter(MethodParameter parameter) {
-                return TokenBean.class.isAssignableFrom(parameter.getParameterType());
+                return parameter.getParameterType().isAssignableFrom(TokenBean.class);
             }
 
             @Override
@@ -55,9 +54,7 @@ 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,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/TsLoginConfigurer.java

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

springboot-message/pom.xml

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

springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java

@@ -13,7 +13,6 @@ import com.tiesheng.role.pojos.vo.GroupTypeDTO;
 import com.tiesheng.role.pojos.vo.ServiceMenuVO;
 import com.tiesheng.role.service.CoreRoleService;
 import com.tiesheng.util.pojos.ApiResp;
-import com.tiesheng.util.pojos.DaoBase;
 import com.tiesheng.util.pojos.TokenBean;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,14 +43,6 @@ public class CommRoleController {
         List<CoreRoleAuthority> allOwnerMenus = coreRoleService.getOwnerAuthorityLeafList(tokenBean.getId(), tokenBean.getRoleId());
         List<String> list = allOwnerMenus.stream().map(CoreRoleAuthority::getService).collect(Collectors.toList());
 
-        // 添加公开服务
-        list.addAll(coreRoleService.getServerMapper().selectList(new QueryWrapper<CoreRoleServer>()
-                .eq("is_public", 1).eq("is_deleted", 0).eq("is_open", 1)
-        ).stream().map(DaoBase::getId).collect(Collectors.toList()));
-
-        // 去除重复
-        list = CollUtil.distinct(list);
-
         List<CoreRoleServer> roleServerList = new ArrayList<>();
         if (CollUtil.isNotEmpty(list)) {
             roleServerList = coreRoleService.getServerMapper().selectList(new QueryWrapper<CoreRoleServer>()

springboot-role/src/main/java/com/tiesheng/role/pojos/dao/CoreRoleServer.java

@@ -66,12 +66,6 @@ public class CoreRoleServer extends DaoBase {
     @TableField(value = "ext3")
     private String ext3;
 
-    /**
-     * 是否公开
-     */
-    @TableField(value = "is_public")
-    private Integer isPublic;
-
     /**
      * 获取名称
      *
@@ -233,22 +227,4 @@ public class CoreRoleServer extends DaoBase {
     public void setExt3(String ext3) {
         this.ext3 = ext3;
     }
-
-    /**
-     * 获取是否公开
-     *
-     * @return is_public - 是否公开
-     */
-    public Integer getIsPublic() {
-        return isPublic;
-    }
-
-    /**
-     * 设置是否公开
-     *
-     * @param isPublic 是否公开
-     */
-    public void setIsPublic(Integer isPublic) {
-        this.isPublic = isPublic;
-    }
 }

springboot-role/src/main/resources/db/migration/tiesheng_v2.0.22.sql

@@ -1,3 +0,0 @@
-alter table core_role_server
-    add is_public int default 0 null comment '是否公开';
-

springboot-role/src/main/resources/mapper/CoreRoleServerMapper.xml

@@ -17,11 +17,10 @@
     <result column="ext1" jdbcType="VARCHAR" property="ext1" />
     <result column="ext2" jdbcType="VARCHAR" property="ext2" />
     <result column="ext3" jdbcType="VARCHAR" property="ext3" />
-    <result column="is_public" jdbcType="INTEGER" property="isPublic" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, create_time, update_time, is_deleted, `name`, remark, logo, sort, is_open, link, 
-    ext1, ext2, ext3, is_public
+    ext1, ext2, ext3
   </sql>
 </mapper>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.26</version>
+        <version>2.0.17-scope-0.2-test</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 = "https://git.tieshengkeji.com/tieshengkeji/Ip2region/raw/branch/main/ip2region.xdb";
+    private String dbUrl = "http://git.kepai365.com/tiesheng/repository/raw/master/ipdb/ip2region.xdb";
     private String dbPath = System.getProperty("user.dir") + "/runtime/ip2region/ip2region.xdb";
 
     ///////////////////////////////////////////////////////////////////////////

springboot-util/src/main/java/com/tiesheng/util/service/TsCacheService.java

@@ -1,6 +1,7 @@
 package com.tiesheng.util.service;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.tiesheng.util.ServletKit;
@@ -9,7 +10,6 @@ import com.tiesheng.util.service.cache.TsCacheHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Objects;
 import java.util.Set;
 
 @Service
@@ -92,20 +92,4 @@ public class TsCacheService {
         remove(captchaKey);
     }
 
-
-    /**
-     * 验证是否重复操作
-     *
-     * @param key
-     * @param value
-     * @param seconds
-     */
-    public void checkRepeat(String key, String value, int seconds) {
-        String s = get(key);
-        if (StrUtil.isNotEmpty(s) && Objects.equals(s, value)) {
-            throw new ApiException("操作频繁，请稍后再试");
-        }
-        put(key, value, seconds);
-    }
-
 }

springboot-web/pom.xml

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

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

@@ -1,6 +1,5 @@
 package com.tiesheng.web.service;
 
-import cn.hutool.core.util.StrUtil;
 import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.service.TsCacheService;
 import com.tiesheng.util.service.TsServiceBase;
@@ -42,7 +41,7 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
         CoreConfigSystem oneByColumn = tsCacheService.getObj(CONFIG_SYSTEM_PREFIX + configKey,
                 CoreConfigSystem.class, -1);
 
-        if (oneByColumn != null && StrUtil.isNotEmpty(oneByColumn.getConfigVal())) {
+        if (oneByColumn != null) {
             return oneByColumn;
         }
 
@@ -52,7 +51,7 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
             oneByColumn.setId(configKey);
             oneByColumn.setConfigKey(configKey);
             oneByColumn.setConfigVal(defaultValue);
-            oneByColumn.setRemark(configKey);
+            oneByColumn.setRemark(defaultValue);
             oneByColumn.setConfigType(0);
             save(oneByColumn);
         }
@@ -69,20 +68,19 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
      * @param dto
      */
     public void updateConfigSystem(ConfigSystemDTO dto) {
-        CoreConfigSystem coreConfigSystem = getOneByColumn("config_key", dto.getConfigKey());
+        CoreConfigSystem configKey = getOneByColumn("config_key", dto.getConfigKey());
-        if (coreConfigSystem == null) {
+        if (configKey == null) {
             throw new ApiException("该配置不存在，请检查");
         }
-        if (coreConfigSystem.getReadOnly() == 1) {
+        if (configKey.getReadOnly() == 1) {
             throw new ApiException("该配置只读，不可修改");
         }
-        coreConfigSystem.setConfigVal(dto.getConfigVal());
+        configKey.setConfigVal(dto.getConfigVal());
-        coreConfigSystem.setRemark(dto.getRemark());
+        configKey.setRemark(dto.getRemark());
-        coreConfigSystem.setExtra(dto.getExtra());
+        configKey.setExtra(dto.getExtra());
-        updateById(coreConfigSystem);
+        updateById(configKey);
 
-        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + coreConfigSystem.getConfigKey(),
+        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, configKey, 10 * 60);
-                coreConfigSystem, 10 * 60);
     }
 
 

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

@@ -2,6 +2,7 @@ package com.tiesheng.web.service;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.tiesheng.web.mapper.CoreLogApiMapper;
 import com.tiesheng.web.pojos.dao.CoreLogApi;
@@ -11,8 +12,6 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
-import java.io.IOException;
-import java.util.Objects;
 
 @Component
 public class OkHttpLogInterceptor implements Interceptor {
@@ -23,14 +22,11 @@ public class OkHttpLogInterceptor implements Interceptor {
 
     @NotNull
     @Override
-    public Response intercept(@NotNull Chain chain) throws IOException {
+    public Response intercept(@NotNull Chain chain) {
-
-        Request request = chain.request();
-        if (Objects.equals(request.header("skipApiLog"), "true")) {
-            return chain.proceed(request);
-        }
 
         CoreLogApi logApi = new CoreLogApi();
+
+        Request request = chain.request();
         logApi.setUrl(request.url().toString());
         logApi.setContent(requestBody2String(request));
 
@@ -51,29 +47,10 @@ public class OkHttpLogInterceptor implements Interceptor {
             }
         } catch (Exception e) {
             JSONObject object = new JSONObject();
-            object.put("code", 500);
+            object.put("code", -1);
-            object.put("message", e.getMessage());
+            object.put("message", JSON.toJSONString(e));
             object.put("exception", e);
             logApi.setRespBody(object.toJSONString());
-
-            response = new Response.Builder()
-
-                    // 必须设置请求对象
-                    .request(chain.request())
-
-                    // 指定协议版本
-                    .protocol(Protocol.HTTP_1_1)
-
-                    // 设置HTTP状态码
-                    .code(object.getInteger("code"))
-
-                    // 状态信息
-                    .message(object.getString("message"))
-
-                    // 设置响应体
-                    .body(ResponseBody.create(MediaType.parse("application/json"), object.toJSONString()))
-                    .headers(new Headers.Builder().build()) // 可选：设置响应头
-                    .build();
         }
 
         ThreadUtil.execute(() -> coreLogApiMapper.insert(logApi));