publish 2.0.17-test

.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

pom.xml

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

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

@@ -162,7 +162,8 @@ 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,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,10 +24,20 @@ public class WxOAuth2AccessToken {
         return oAuth2AccessToken;
     }
 
+    /**
+     * 是否是真实用户
+     *
+     * @return
+     */
+    public boolean isRealUser() {
+        return !"1".equals(isSnapshotuser);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     public String getAccessToken() {
         return accessToken;
@@ -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;
+    }
 }

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,13 +34,16 @@ 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() {
         return accessToken;
@@ -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;
+    }
 }

springboot-role/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.18</version>
+        <version>2.0.17-test</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.18</version>
+        <version>2.0.17-test</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.18</version>
+        <version>2.0.17-test</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java

@@ -1,7 +1,6 @@
 package com.tiesheng.web.config.operation;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
-import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -102,18 +100,6 @@ public class OperationAspect {
                 subject = (StrUtil.isEmpty(insertVal) ? "添加" : "编辑") + subject;
             }
 
-            for (String key : allParams.keySet()) {
-                Object value = allParams.get(key);
-                if (value == null || StrUtil.isEmpty(value.toString())) {
-                    // 移除占位符对应的值为空或null的占位符
-                    String placeholder = "{" + key + "}";
-                    subject = subject.replace(placeholder, "");
-                } else if (value instanceof Date) {
-                    //日期格式化
-                    allParams.put(key, DateUtil.format((Date) value,"yyyy-MM-dd HH:mm:ss"));
-                }
-            }
-
             // 占位符处理
             subject = StrUtil.format(subject, allParams);
         } else {

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

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