2.1.3[原功能的最后一个版本]

yexuejc-springboot-example/pom.xml

@@ -9,8 +9,27 @@
     <packaging>pom</packaging>
     <name>yexuejc-springboot-example</name>
 
+    <parent>
+        <groupId>com.yexuejc.springboot</groupId>
+        <artifactId>yexuejc-springboot-parent</artifactId>
+        <version>2.1.3</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.verbose>true</maven.compiler.verbose>
+
+        <yexuejc-springboot.version>${parent.version}</yexuejc-springboot.version>
+    </properties>
+
     <modules>
         <module>yexuejc-springboot-simple</module>
         <module>springboot-security-login-simple</module>
     </modules>
+
 </project>

yexuejc-springboot-example/springboot-security-login-simple/pom.xml

@@ -13,14 +13,16 @@
         https://gitee.com/incloudcode/yexuejc-springboot使用例子
     </description>
 
+    <properties>
+        <yexuejc-springboot.version>${parent.version}</yexuejc-springboot.version>
+    </properties>
+
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.3</version>
     </parent>
-    <properties>
-        <yexuejc.base.version>1.3.9</yexuejc.base.version>
-    </properties>
+
     <dependencies>
         <!--base 引用-->
         <dependency>
@@ -32,7 +34,6 @@
         <dependency>
             <groupId>top.yexuejc</groupId>
             <artifactId>yexuejc-base</artifactId>
-            <version>${yexuejc.base.version}</version>
         </dependency>
         <!-- 使用springMVC -->
         <dependency>
@@ -47,7 +48,7 @@
         <!-- JJWT -->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
+            <artifactId>jjwt-api</artifactId>
             <optional>true</optional>
         </dependency>
         <!-- 使用Redis -->
@@ -80,13 +81,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>yexuejc-nexus-public</id>
-            <name>yexuejc-nexus-public</name>
-            <url>https://nexus.yexuejc.club/repository/maven-public/</url>
-        </repository>
-    </repositories>
 
     <build>
         <plugins>

yexuejc-springboot-example/springboot-security-login-simple/src/main/java/com/example/demo/security/domain/Consumer.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.example.demo.mapper.handler.JsonTypeHandler;
 import com.yexuejc.base.util.JsonUtil;
 import com.yexuejc.springboot.base.security.inte.User;
 
@@ -27,7 +28,7 @@ public class Consumer extends Model<Consumer> implements User {
     /**
      * 用户id
      */
-    @TableId(value = "consumer_id", type = IdType.UUID)
+    @TableId(value = "consumer_id", type = IdType.ASSIGN_UUID)
     private String consumerId;
     /**
      * 手机号
@@ -92,7 +93,7 @@ public class Consumer extends Model<Consumer> implements User {
     /**
      * 角色、权限
      */
-    @TableField(value = "roles", el = "roles,typeHandler=com.yexuejc.guansc.core.mybatis.handler.JsonTypeHandler")
+    @TableField(value = "roles", typeHandler = JsonTypeHandler.class)
     private List<String> roles;
     /**
      * 支付密码
@@ -157,19 +158,16 @@ public class Consumer extends Model<Consumer> implements User {
         return this;
     }
 
-
     public Consumer setEnable(boolean enable) {
         this.enable = enable;
         return this;
     }
 
-
     public Consumer setNonExpire(boolean nonExpire) {
         this.nonExpire = nonExpire;
         return this;
     }
 
-
     public Consumer setNonLock(boolean nonLock) {
         this.nonLock = nonLock;
         return this;
@@ -275,7 +273,7 @@ public class Consumer extends Model<Consumer> implements User {
     }
 
     @Override
-    protected Serializable pkVal() {
+    public Serializable pkVal() {
         return this.consumerId;
     }
 }

yexuejc-springboot-example/springboot-security-login-simple/src/main/resources/application.properties

@@ -1,35 +1,36 @@
+server.port=8545
 logging.level.root=info
 
 #========================================================================================================================
 #========================================================================================================================
-#核心
-#开启功能 redis webmvc
+#\u6838\u5FC3
+#\u5F00\u542F\u529F\u80FD redis webmvc
 yexuejc.autoconfigure.redis.enable=true
-#webmvc 包含以下功能
+#webmvc \u5305\u542B\u4EE5\u4E0B\u529F\u80FD
 yexuejc.autoconfigure.webmvc.enable=true
-#全局异常处理
+#\u5168\u5C40\u5F02\u5E38\u5904\u7406
 yexuejc.ssl-ignore.enable=true
-#开启HTTPS（SSL）请求证书验证忽略
+#\u5F00\u542FHTTPS\uFF08SSL\uFF09\u8BF7\u6C42\u8BC1\u4E66\u9A8C\u8BC1\u5FFD\u7565
 yexuejc.global.exception.enable=true
-#开启校验过滤器，目前校验HTTP Header是否符合规范
+#\u5F00\u542F\u6821\u9A8C\u8FC7\u6EE4\u5668\uFF0C\u76EE\u524D\u6821\u9A8CHTTP Header\u662F\u5426\u7B26\u5408\u89C4\u8303
 yexuejc.web.validation-filter.enable=true
-# 拦截类型（请求路径）：0忽略模式，默认拦截全部；1拦截模式，默认一个都不拦截
+# \u62E6\u622A\u7C7B\u578B\uFF08\u8BF7\u6C42\u8DEF\u5F84\uFF09\uFF1A0\u5FFD\u7565\u6A21\u5F0F\uFF0C\u9ED8\u8BA4\u62E6\u622A\u5168\u90E8\uFF1B1\u62E6\u622A\u6A21\u5F0F\uFF0C\u9ED8\u8BA4\u4E00\u4E2A\u90FD\u4E0D\u62E6\u622A
 yexuejc.http.filter=0
-#忽略路径：示例放开swagger
+#\u5FFD\u7565\u8DEF\u5F84\uFF1A\u793A\u4F8B\u653E\u5F00swagger
 yexuejc.http.filter.ignored=/,/swagger/**,/error,/v2/api-docs,/webjars/**
 #========================================================================================================================
 #========================================================================================================================
 #========================================================================================================================
-# security相关
+# security\u76F8\u5173
 #reids
-#开启指定redis库db0默认开启
+#\u5F00\u542F\u6307\u5B9Aredis\u5E93db0\u9ED8\u8BA4\u5F00\u542F
 yexuejc.redis.db1=true
 spring.redis.jedis.pool.max-active=100
 spring.redis.jedis.pool.max-idle=10
 spring.redis.jedis.pool.min-idle=3
-spring.redis.host=121.42.165.89
-spring.redis.password=
-spring.redis.port=16379
+spring.redis.host=192.168.0.107
+spring.redis.password=yexuejc2022
+spring.redis.port=6379
 
 
 #db
@@ -47,19 +48,19 @@ spring.datasource.data=classpath:db/data.sql
 #========================================================================================================================
 #mybatis-plus
 mybatis-plus.mapper-locations=classpath*:mapper/*.xml
-#实体扫描，多个package用逗号或者分号分隔
+#\u5B9E\u4F53\u626B\u63CF\uFF0C\u591A\u4E2Apackage\u7528\u9017\u53F7\u6216\u8005\u5206\u53F7\u5206\u9694
 mybatis-plus.type-aliases-package=com.yexuejc.springboot.base.security.domain
-#主键类型0:"数据库ID自增", 1:"用户输入ID",2:"该类型为未设置主键类型", 3:"全局唯一ID UUID",4:全局唯一ID (UUID),5:字符串全局唯一ID (idWorker 的字符串表示);
+#\u4E3B\u952E\u7C7B\u578B0:"\u6570\u636E\u5E93ID\u81EA\u589E", 1:"\u7528\u6237\u8F93\u5165ID",2:"\u8BE5\u7C7B\u578B\u4E3A\u672A\u8BBE\u7F6E\u4E3B\u952E\u7C7B\u578B", 3:"\u5168\u5C40\u552F\u4E00ID UUID",4:\u5168\u5C40\u552F\u4E00ID (UUID),5:\u5B57\u7B26\u4E32\u5168\u5C40\u552F\u4E00ID (idWorker \u7684\u5B57\u7B26\u4E32\u8868\u793A);
 mybatis-plus.global-config.db-config.id-type=uuid
 mybatis-plus.global-config.db-config.db-type=POSTGRE_SQL
-#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+#\u5B57\u6BB5\u7B56\u7565 0:"\u5FFD\u7565\u5224\u65AD",1:"\u975E NULL \u5224\u65AD"),2:"\u975E\u7A7A\u5224\u65AD"
 mybatis-plus.global-config.db-config.field-strategy=not_empty
-#驼峰下划线转换
+#\u9A7C\u5CF0\u4E0B\u5212\u7EBF\u8F6C\u6362
 mybatis-plus.global-config.db-config.column-underline=true
-#逻辑删除配置（下面3个配置）
+#\u903B\u8F91\u5220\u9664\u914D\u7F6E\uFF08\u4E0B\u97623\u4E2A\u914D\u7F6E\uFF09
 mybatis-plus.global-config.db-config.logic-delete-value=true
 mybatis-plus.global-config.db-config.logic-not-delete-value=false
-#配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
+#\u914D\u7F6E\u8FD4\u56DE\u6570\u636E\u5E93(column\u4E0B\u5212\u7EBF\u547D\u540D&&\u8FD4\u56DEjava\u5B9E\u4F53\u662F\u9A7C\u5CF0\u547D\u540D)\uFF0C\u81EA\u52A8\u5339\u914D\u65E0\u9700as\uFF08\u6CA1\u5F00\u542F\u8FD9\u4E2A\uFF0CSQL\u9700\u8981\u5199as\uFF1A select user_id as userId\uFF09
 mybatis-plus.configuration.map-underscore-to-camel-case=true
 mybatis-plus.configuration.cache-enabled=false
 #========================================================================================================================

yexuejc-springboot-example/springboot-security-login-simple/src/test/java/com/example/demo/DemoApplicationTests.java

@@ -1,11 +1,8 @@
 package com.example.demo;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class DemoApplicationTests {
 

yexuejc-springboot-example/yexuejc-springboot-simple/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.yexuejc.springboot</groupId>
         <artifactId>yexuejc-springboot-parent</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.3</version>
     </parent>
     <groupId>top.yexuejc</groupId>
     <artifactId>yexuejc-springboot-simple</artifactId>
@@ -14,14 +14,13 @@
     <description>测试工程</description>
 
     <properties>
-        <java.version>1.8</java.version>
+        <yexuejc-springboot.version>${parent.version}</yexuejc-springboot.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.yexuejc.springboot</groupId>
             <artifactId>yexuejc-springboot-base</artifactId>
-            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

yexuejc-springboot-example/yexuejc-springboot-simple/src/test/java/top/yexuejc/springboot/simple/YexuejcSpringbootSimpleApplicationTests.java

@@ -1,11 +1,8 @@
 package top.yexuejc.springboot.simple;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class YexuejcSpringbootSimpleApplicationTests {