publish 2.0.18

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.17-scope-0.2-test</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-scope-0.2-test</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.17-scope-0.2-test</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.17-scope-0.2-test</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.17-scope-0.2-test</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.17-scope-0.2-test</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.17-scope-0.2-test</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.17-scope-0.2-test</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.17-scope-0.2-test</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
@@ -120,8 +120,8 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>tiesheng-repo-plugin</id>
-            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
+            <id>kepai-repo-plugin</id>
+            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
         </pluginRepository>
     </pluginRepositories>
 

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-scope-0.2-test</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.17-scope-0.2-test</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-scope-0.2-test</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-scope-0.2-test</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-scope-0.2-test</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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

@@ -170,9 +170,8 @@ public class LoginController {
             extra = "";
         }
         String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra);
-//        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_base");
-//        response.sendRedirect(authorizationUrl);
-        response.sendRedirect(configUrl+"&to=mobile&code=200");
+        String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
+        response.sendRedirect(authorizationUrl);
     }
 
 
@@ -182,13 +181,9 @@ 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());
-//        TokenBean tokenBean = corePlatformUniqueService.login(new DoLoginInfo(wxUserInfo.getAppId(),
-//                wxUserInfo.getOpenid(), "wxmp", JSON.toJSONString(wxUserInfo)));
-        TokenBean tokenBean = new TokenBean();
-        tokenBean.setId("testid");
-        tokenBean.setRoleId("testroleid");
-        tokenBean.setExtra("testextra");
+        WxUserInfo wxUserInfo = platformWxmpConfig.getOAuth2AccessToken(service, dto.getCode());
+        TokenBean tokenBean = corePlatformUniqueService.login(new DoLoginInfo(wxUserInfo.getAppId(),
+                wxUserInfo.getOpenid(), "wxmp", JSON.toJSONString(wxUserInfo)));
         corePlatformUniqueService.redirect(tokenBean, dto.getTo(), dto.getExtra(), response);
     }
 

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.17-scope-0.2-test</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-scope-0.2-test</version>
+        <version>2.0.18</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.17-scope-0.2-test</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-scope-0.2-test</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-scope-0.2-test</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);
     }