publish 2.0.33

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.28</version>
+    <version>2.0.33</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -59,49 +59,49 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>2.0.28</version>
+                <version>2.0.33</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.28</version>
+                <version>2.0.33</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.28</version>
+                <version>2.0.33</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.28</version>
+                <version>2.0.33</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.28</version>
+                <version>2.0.33</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.28</version>
+                <version>2.0.33</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.28</version>
+                <version>2.0.33</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.28</version>
+                <version>2.0.33</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.28</version>
+        <version>2.0.33</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.28</version>
+    <version>2.0.33</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.28</version>
+        <version>2.0.33</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-chart/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.28</version>
+        <version>2.0.33</version>
     </parent>
 
     <artifactId>springboot-chart</artifactId>

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.28</version>
+        <version>2.0.33</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.28</version>
+        <version>2.0.33</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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

@@ -52,6 +52,8 @@ public class LoginController {
     CorePlatformUniqueService corePlatformUniqueService;
     @Autowired
     GlobalConfig globalConfig;
+    @Autowired
+    TsTokenConfig tsTokenConfig;
 
 
     /**
@@ -62,7 +64,7 @@ public class LoginController {
     @GetMapping("/unique/redirect")
     @OperationIgnore
     public void uniqueIndex(UniqueIndexDTO dto, HttpServletResponse response) {
-        if (!dto.validSign()) {
+        if (tsTokenConfig.isValidLoginSign() && !dto.validSign()) {
             corePlatformUniqueService.redirect(null, dto.getTo(), dto.getExtra(), response);
             return;
         }
@@ -168,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);
         response.sendRedirect(authorizationUrl);
     }
 

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.28</version>
+        <version>2.0.33</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.28</version>
+        <version>2.0.33</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

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

@@ -122,12 +122,12 @@ public class PlatformWxmpConfig {
      *
      * @return
      */
-    public String buildAuthorizationUrl(String service, String redirectUrl, String scope) {
+    public String buildAuthorizationUrl(String service, String redirectUrl) {
         WxConfigBean configBean = getConfigBean(service);
         return "https://open.weixin.qq.com/connect/oauth2/authorize"
                 + "?appid=" + configBean.getAppId()
                 + "&redirect_uri=" + URLUtil.encodeAll(redirectUrl)
-                + "&response_type=code&scope=" + scope
+                + "&response_type=code&scope=" + configBean.getScope()
                 + "&state=STATE#wechat_redirect";
     }
 
@@ -141,7 +141,13 @@ public class PlatformWxmpConfig {
     public WxUserInfo getOAuth2AccessToken(String service, String code) {
         WxConfigBean configBean = getConfigBean(service);
         WxOAuth2AccessToken wxOAuth2AccessToken = WxOAuth2AccessToken.create(configBean.getAppId(), configBean.getAppSecret(), code);
-        WxUserInfo wxUserInfo = WxUserInfo.create(wxOAuth2AccessToken);
+        WxUserInfo wxUserInfo;
+        if (configBean.canUserInfo()) {
+            wxUserInfo = WxUserInfo.create(wxOAuth2AccessToken);
+        } else {
+            wxUserInfo = new WxUserInfo();
+            wxUserInfo.setOpenid(wxOAuth2AccessToken.getOpenid());
+        }
         wxUserInfo.setAppId(configBean.getAppId());
         return wxUserInfo;
     }
@@ -162,7 +168,8 @@ public class PlatformWxmpConfig {
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     public Map<String, WxConfigBean> getConfigs() {
         return configs;

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

@@ -7,10 +7,21 @@ public class WxConfigBean {
 
     private String appId;
     private String appSecret;
+    private String scope = "snsapi_base";
+
+    /**
+     * 是否可以获取用户信息
+     *
+     * @return
+     */
+    public boolean canUserInfo() {
+        return !"snsapi_base".equals(scope);
+    }
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     public String getAppId() {
         return appId;
@@ -27,4 +38,12 @@ public class WxConfigBean {
     public void setAppSecret(String appSecret) {
         this.appSecret = appSecret;
     }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
 }

springboot-role/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.28</version>
+        <version>2.0.33</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.28</version>
+        <version>2.0.33</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

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

@@ -38,6 +38,7 @@ public class TsTokenConfig {
     private String encryptKey = "%kIp9frQCu";
     private Integer expireHours = 48;
     private String[] ignorePaths;
+    private boolean validLoginSign = false;
 
 
     /**
@@ -144,4 +145,12 @@ public class TsTokenConfig {
         this.ignorePaths = ignorePaths;
     }
 
+    public boolean isValidLoginSign() {
+        return validLoginSign;
+    }
+
+    public void setValidLoginSign(boolean validLoginSign) {
+        this.validLoginSign = validLoginSign;
+    }
+
 }

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.28</version>
+        <version>2.0.33</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/web/config/encrypt/EncryptResponseBodyAdvice.java

@@ -27,7 +27,8 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice<ApiResp> {
 
     @Override
     public boolean supports(MethodParameter returnType, Class<? extends HttpMessageConverter<?>> converterType) {
-        return AnnotationUtil.getAnnotation(returnType.getContainingClass(), RestController.class) != null;
+        return AnnotationUtil.getAnnotation(returnType.getContainingClass(), RestController.class) != null
+                && returnType.getParameterType() == ApiResp.class;
     }
 
     @Override