publish 2.0.18

.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-test2</version>
+    <version>2.0.18</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-test2</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.17-test2</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.17-test2</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.17-test2</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.17-test2</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.17-test2</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.17-test2</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.17-test2</version>
+                <version>2.0.18</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-test2</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.17-test2</version>
+    <version>2.0.18</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.17-test2</version>
+        <version>2.0.18</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-test2</version>
+        <version>2.0.18</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-test2</version>
+        <version>2.0.18</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);
+        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
         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.17-test2</version>
+        <version>2.0.18</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-test2</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

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

@@ -19,7 +19,6 @@ import org.springframework.context.annotation.Configuration;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * @author hao
@@ -123,12 +122,12 @@ public class PlatformWxmpConfig {
      *
      * @return
      */
-    public String buildAuthorizationUrl(String service, String redirectUrl) {
+    public String buildAuthorizationUrl(String service, String redirectUrl, String scope) {
         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=" + configBean.getScope()
+                + "&response_type=code&scope=" + scope
                 + "&state=STATE#wechat_redirect";
     }
 
@@ -142,15 +141,7 @@ 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 = null;
-        if (Objects.equals(configBean.getScope(), "snsapi_userinfo")) {
-            wxUserInfo = WxUserInfo.create(wxOAuth2AccessToken);
-        } else {
-            wxUserInfo = new WxUserInfo();
-            wxUserInfo.setOpenid(wxOAuth2AccessToken.getOpenid());
-            wxUserInfo.setRealUser(wxOAuth2AccessToken.isRealUser());
-        }
+        WxUserInfo wxUserInfo = WxUserInfo.create(wxOAuth2AccessToken);
         wxUserInfo.setAppId(configBean.getAppId());
         return wxUserInfo;
     }
@@ -171,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/WxConfigBean.java

@@ -7,12 +7,10 @@ public class WxConfigBean {
 
     private String appId;
     private String appSecret;
-    private String scope = "snsapi_userinfo";
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-
-    /// ////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
 
     public String getAppId() {
         return appId;
@@ -29,12 +27,4 @@ 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-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);
-        wxUserInfo.setRealUser(oAuth2AccessToken.isRealUser());
-        return wxUserInfo;
+        return JSON.parseObject(s, WxUserInfo.class);
     }
 
 
     ///////////////////////////////////////////////////////////////////////////
     // 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-test2</version>
+        <version>2.0.18</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-test2</version>
+        <version>2.0.18</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.17-test2</version>
+        <version>2.0.18</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());
-        if (configKey == null) {
+        CoreConfigSystem coreConfigSystem = getOneByColumn("config_key", dto.getConfigKey());
+        if (coreConfigSystem == null) {
             throw new ApiException("该配置不存在，请检查");
         }
-        if (configKey.getReadOnly() == 1) {
+        if (coreConfigSystem.getReadOnly() == 1) {
             throw new ApiException("该配置只读，不可修改");
         }
-        configKey.setConfigVal(dto.getConfigVal());
-        configKey.setRemark(dto.getRemark());
-        configKey.setExtra(dto.getExtra());
-        updateById(configKey);
+        coreConfigSystem.setConfigVal(dto.getConfigVal());
+        coreConfigSystem.setRemark(dto.getRemark());
+        coreConfigSystem.setExtra(dto.getExtra());
+        updateById(coreConfigSystem);
 
-        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, configKey, 10 * 60);
+        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + coreConfigSystem.getConfigKey(),
+                coreConfigSystem, 10 * 60);
     }