publish 2.0.17-test

2025-08-20 15:29:46 +08:00
parent 2cf88cefa7
commit 411969192f
15 changed files with 56 additions and 41 deletions
--- a/.gitlab-ci.yml
+++ b/.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
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.tiesheng.springboot-parent</groupId>
    <artifactId>springboot-parent</artifactId>
-    <version>2.0.17</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.17</version>
+                <version>2.0.17-test</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-login</artifactId>
-                <version>2.0.17</version>
+                <version>2.0.17-test</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-web</artifactId>
-                <version>2.0.17</version>
+                <version>2.0.17-test</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-util</artifactId>
-                <version>2.0.17</version>
+                <version>2.0.17-test</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-platform</artifactId>
-                <version>2.0.17</version>
+                <version>2.0.17-test</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-message</artifactId>
-                <version>2.0.17</version>
+                <version>2.0.17-test</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-role</artifactId>
-                <version>2.0.17</version>
+                <version>2.0.17-test</version>
            </dependency>

            <dependency>
                <groupId>com.tiesheng.springboot-parent</groupId>
                <artifactId>springboot-annotation</artifactId>
-                <version>2.0.17</version>
+                <version>2.0.17-test</version>
            </dependency>

            <dependency>
--- a/springboot-ademo/pom.xml
+++ b/springboot-ademo/pom.xml
@@ -6,11 +6,11 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-ademo</artifactId>
-    <version>2.0.17</version>
+    <version>2.0.17-test</version>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
--- a/springboot-annotation/pom.xml
+++ b/springboot-annotation/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-annotation</artifactId>
--- a/springboot-database/pom.xml
+++ b/springboot-database/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-database</artifactId>
--- a/springboot-login/pom.xml
+++ b/springboot-login/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-login</artifactId>
--- a/springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java
+++ b/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);
    }

--- a/springboot-message/pom.xml
+++ b/springboot-message/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-message</artifactId>
--- a/springboot-platform/pom.xml
+++ b/springboot-platform/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-platform</artifactId>
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/PlatformWxmpConfig.java
+++ b/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/PlatformWxmpConfig.java
@@ -162,6 +162,7 @@ public class PlatformWxmpConfig {

    ///////////////////////////////////////////////////////////////////////////
    // setter\getter
+
    /// ////////////////////////////////////////////////////////////////////////

    public Map<String, WxConfigBean> getConfigs() {
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxOAuth2AccessToken.java
+++ b/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,9 +24,19 @@ public class WxOAuth2AccessToken {
        return oAuth2AccessToken;
    }

+    /**
+     * 是否是真实用户
+     *
+     * @return
+     */
+    public boolean isRealUser() {
+        return !"1".equals(isSnapshotuser);
+    }
+

    ///////////////////////////////////////////////////////////////////////////
    // setter\getter
+
    /// ////////////////////////////////////////////////////////////////////////

    public String getAccessToken() {
@@ -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;
+    }
 }
--- a/springboot-platform/src/main/java/com/tiesheng/platform/config/wxmp/bean/WxUserInfo.java
+++ b/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,12 +34,15 @@ 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() {
@@ -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;
+    }
 }
--- a/springboot-role/pom.xml
+++ b/springboot-role/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-role</artifactId>
--- a/springboot-util/pom.xml
+++ b/springboot-util/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-util</artifactId>
--- a/springboot-web/pom.xml
+++ b/springboot-web/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.tiesheng.springboot-parent</groupId>
        <artifactId>springboot-parent</artifactId>
-        <version>2.0.17</version>
+        <version>2.0.17-test</version>
    </parent>

    <artifactId>springboot-web</artifactId>