diff --git a/cskefu-auth/pom.xml b/cskefu-auth/pom.xml index 2649002d..8a3b922b 100644 --- a/cskefu-auth/pom.xml +++ b/cskefu-auth/pom.xml @@ -20,6 +20,8 @@ 8.0.30 3.17.7 3.0.0 + 0.11.5 + 0.0.9 @@ -35,10 +37,10 @@ org.springframework.boot spring-boot-starter-security - - org.springframework.boot - spring-boot-starter-data-redis - + + + + org.springframework.boot spring-boot-starter-validation @@ -59,21 +61,41 @@ --> - org.redisson - redisson-spring-boot-starter - ${redisson-spring.version} + com.github.axet + kaptcha + ${kaptcha.version} - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring.version} + io.jsonwebtoken + jjwt-api + ${jsonwebtoken.version} - mysql - mysql-connector-java - ${mysql-connector.version} - runtime + io.jsonwebtoken + jjwt-impl + ${jsonwebtoken.version} + + io.jsonwebtoken + jjwt-jackson + ${jsonwebtoken.version} + + + + + + + + + + + + + + + + + io.springfox springfox-swagger2 diff --git a/cskefu-auth/src/main/resources/application.yml b/cskefu-auth/src/main/resources/application.yml index c2221f85..b3a925ac 100644 --- a/cskefu-auth/src/main/resources/application.yml +++ b/cskefu-auth/src/main/resources/application.yml @@ -1,6 +1,8 @@ +server: + port: 8000 spring: application: - name: cskefu + name: cskefu-auth profiles: active: dev datasource: @@ -26,3 +28,8 @@ spring: max-idle: 8 min-idle: 0 max-wait: -1ms + +cskefu: + cskefu: + private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8TSxdMp76dZS2L8DpvJOgHNJmeI8PM30CFSeVMCHV5dEjtixipsMsSQu0ariAtVfA5M/ma1wcqEpsDO9nVQRsmsJCKMIWOcR6yBQU9f0T7Hkmil4Ckf61C1R7wLrynOjCeUCneQ7R0+dg9K25CymclPnK4ym2GInmuUjdbyQQcX4QBuIbmuY10MG8nW9ovhFML85KoBk5yxV4zVwLGP4TFJVnBmiNO3XSKL2XsX7wFFO93O8jmAnzgpWj8khsZAYG4nijIz2BciS9uQFa/lUX6yD50ykjNklbhCBIMGaQ6rr1WjnwLHDZU9sLvcYMboKPJHWz1FttvxuKSLYbf7j/AgMBAAECggEAEH1rPSrwF47kdW/vibu+uDuat7Tz3w9RpM6lc/Mn6ctoA6PLqN5hvFpJPbhHoAqn1kSZ0EJNA4imIjNsluf8rMyAs1QbN+CnMpMC7zL7jrS1IO+ze+LwVnpyufbbm3nfCE85OKSC7IbAfhHvUYOHIvQI5Zn76FTamFHxh5klpCrY1h8gcVWdRxiK0Q8AQP7KD0QnkzgROhkRmdI01639VyTCTc6Rtv5puU6J6idJwTd3JAiJXZ2qcoAwhnkSHnVnP5ktFxl66eHGJKeol6bGcJIFQRGLVmh78x6MXoqkJ2M7DRntL38TLKT5KCYViGxUpO0gED/HQBhDALyNevJZQQKBgQDr+pZDtRIQ6mMZMswKTo2+zIFEUFES2sR/bunEW5snPR3krKdgzJoEg7WERkMviSlvW6K7a6VeJ9KKO/iE07lcRkN2NQZUkBDsrNRgoOwB17hHJqrMyZ1It+hZmPQTkeyJu/BCxDkIMwbQYXxIe8J/dVYjHJVXZgzPqEXKYqeViwKBgQDMRwr7ceW+9c/GzHd7p6849s3+MbT0kzyXDTdeJkQFSDPufYapTCan/MrdJmnIRz8pq2URZrO4kDDxxeWu2Vkekv9cxVFrQVFfvuq+4BFpQvYkRHk9PDzCmgFJD/wLG8gzNTH7UahaNb7m0tPB3D1g5Q6LzZCc1h3s2K6SLS7g3QKBgE41Bof6ArrIc39ubmEcF64caNsTI0t0ZZs2TxNcqNcgUj/vWKmkJYdJf2cPQkUG2Eynug8TZgMGf6iAp6Sd5tjGEKWkfSyZcoJ95QUBUDZsIA60qfak+xOWn9LR9lJmElazirUWAzDMeH2nUWFUYumLIbkRSA1nLOfFhRvGBnRxAoGBAJvDAAjCzGBTpt77QZA0SFOzPVc6J7TmICk9lp5fpzYv3AlaBbhJrKAjDbybccWZLfxkCGjAWwG8UNXKBFzStjWt+LGQc4jJAXd0aCKrUBtnR7BX1epvaBUqwRgo7BK8WGdThI0RssE2gh4XXAhSGysq/XB0inRMf/z9K/+iHECxAoGAFlcIZ4/xXhbObUPU05hZFoj+zN5obaOLefRJn4uqjD9/VSRnI2bBv7vXKoLX6BwFF/PWvg1hzGy3O9TQ4XYPOqNGcBFDOqwxmVVevzXgRInoiRNP3xZXcqswppEbqORGbRoPLQBqLnPx1GKwbo7Fp9O5ywARVZtf4STt3pRK8PY= + public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvE0sXTKe+nWUti/A6byToBzSZniPDzN9AhUnlTAh1eXRI7YsYqbDLEkLtGq4gLVXwOTP5mtcHKhKbAzvZ1UEbJrCQijCFjnEesgUFPX9E+x5JopeApH+tQtUe8C68pzownlAp3kO0dPnYPStuQspnJT5yuMpthiJ5rlI3W8kEHF+EAbiG5rmNdDBvJ1vaL4RTC/OSqAZOcsVeM1cCxj+ExSVZwZojTt10ii9l7F+8BRTvdzvI5gJ84KVo/JIbGQGBuJ4oyM9gXIkvbkBWv5VF+sg+dMpIzZJW4QgSDBmkOq69Vo58Cxw2VPbC73GDG6CjyR1s9Rbbb8biki2G3+4/wIDAQAB diff --git a/cskefu-biz/src/main/resources/application.yml b/cskefu-biz/src/main/resources/application.yml index c2221f85..d078a64e 100644 --- a/cskefu-biz/src/main/resources/application.yml +++ b/cskefu-biz/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: application: - name: cskefu + name: cskefu-biz profiles: active: dev datasource: diff --git a/cskefu-common/pom.xml b/cskefu-common/pom.xml index ebb66bc4..28dcca1f 100644 --- a/cskefu-common/pom.xml +++ b/cskefu-common/pom.xml @@ -20,12 +20,24 @@ 8.0.30 3.17.7 3.0.0 + 2.13.4 org.projectlombok lombok - ${lombok.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind diff --git a/cskefu-common/src/main/java/com/cskefu/common/Result.java b/cskefu-common/src/main/java/com/cskefu/common/Result.java index 4bad9023..676f31e3 100644 --- a/cskefu-common/src/main/java/com/cskefu/common/Result.java +++ b/cskefu-common/src/main/java/com/cskefu/common/Result.java @@ -4,10 +4,6 @@ import lombok.Getter; @Getter public class Result { - - public interface View { - } - private final boolean success; private final int code; private final T data; @@ -71,7 +67,7 @@ public class Result { } public Result build() { - return new Result<>(this.success, this.code, this.data, this.message); + return new Result(this.success, this.code, this.data, this.message); } @Override diff --git a/cskefu-session/pom.xml b/cskefu-conversation/pom.xml similarity index 97% rename from cskefu-session/pom.xml rename to cskefu-conversation/pom.xml index 1764c626..672e1349 100644 --- a/cskefu-session/pom.xml +++ b/cskefu-conversation/pom.xml @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.cskefu - cskefu-session + cskefu-conversation 0.0.1-SNAPSHOT 4.0.0 - cskefu-session + cskefu-conversation https://www.cskefu.com/ UTF-8 diff --git a/cskefu-session/src/main/java/com/cskefu/io/CskefuSessionApplication.java b/cskefu-conversation/src/main/java/com/cskefu/io/CskefuConversationApplication.java similarity index 86% rename from cskefu-session/src/main/java/com/cskefu/io/CskefuSessionApplication.java rename to cskefu-conversation/src/main/java/com/cskefu/io/CskefuConversationApplication.java index c91577e7..36e98d2c 100644 --- a/cskefu-session/src/main/java/com/cskefu/io/CskefuSessionApplication.java +++ b/cskefu-conversation/src/main/java/com/cskefu/io/CskefuConversationApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class CskefuSessionApplication { +public class CskefuConversationApplication { public static void main(String[] args) { SpringApplication.run(CskefuSessionApplication.class, args); } diff --git a/cskefu-session/src/main/java/com/cskefu/io/swagger/SwaggerConfiguration.java b/cskefu-conversation/src/main/java/com/cskefu/io/swagger/SwaggerConfiguration.java similarity index 100% rename from cskefu-session/src/main/java/com/cskefu/io/swagger/SwaggerConfiguration.java rename to cskefu-conversation/src/main/java/com/cskefu/io/swagger/SwaggerConfiguration.java diff --git a/cskefu-session/src/main/resources/application-dev.yml b/cskefu-conversation/src/main/resources/application-dev.yml similarity index 100% rename from cskefu-session/src/main/resources/application-dev.yml rename to cskefu-conversation/src/main/resources/application-dev.yml diff --git a/cskefu-session/src/main/resources/application-pro.yml b/cskefu-conversation/src/main/resources/application-pro.yml similarity index 100% rename from cskefu-session/src/main/resources/application-pro.yml rename to cskefu-conversation/src/main/resources/application-pro.yml diff --git a/cskefu-session/src/main/resources/application.yml b/cskefu-conversation/src/main/resources/application.yml similarity index 95% rename from cskefu-session/src/main/resources/application.yml rename to cskefu-conversation/src/main/resources/application.yml index c2221f85..98a843c2 100644 --- a/cskefu-session/src/main/resources/application.yml +++ b/cskefu-conversation/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: application: - name: cskefu + name: cskefu-conversation profiles: active: dev datasource: