启动放到java类中

build.gradle

@@ -81,32 +81,10 @@ subprojects {
         // Kotlin
         compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
         compile("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
-
-        kapt("org.springframework.boot:spring-boot-configuration-processor")
-        // SpringBoot Starter
-
-        compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-client')
-        compile('org.springframework.cloud:spring-cloud-starter-openfeign')
-//
-
-//        compile('org.springframework.boot:spring-boot-starter-web')
-        compile('org.springframework.boot:spring-boot-starter-webflux')
-
-        compile('org.springframework.boot:spring-boot-starter-jdbc')
-        compile('org.springframework.boot:spring-boot-starter-actuator')
-        compile("de.codecentric:spring-boot-admin-starter-client:${springBootAdminVersion}")
-        compile('org.springframework.boot:spring-boot-starter-undertow')
-
-//        cache
-        compile('org.springframework.boot:spring-boot-starter-cache')
-     
-
-        compile('org.springframework.cloud:spring-cloud-starter-config')
-
+        
         testCompile('org.springframework.boot:spring-boot-starter-test')
         // mq
         compile("io.reactivex.rxjava2:rxjava:$rxJavaVersion")
-        
         compile("com.belerweb:pinyin4j:$pinyin4j_version")
 
         // commons
@@ -114,11 +92,7 @@ subprojects {
         compile("org.apache.commons:commons-lang3:$commons_lang3_version")
         compile("commons-codec:commons-codec:$commons_codec_version")
         compile("javax.servlet:javax.servlet-api:4.0.1")
-        // cache
-        compile("com.github.ben-manes.caffeine:caffeine:$caffeine_version")
-        // db
-        compile("mysql:mysql-connector-java:$mysql_connector_version")
-        compile("com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion")
+      
         // swagger
         compile("io.springfox:springfox-swagger2:$swagger_version")
         compile("io.springfox:springfox-swagger-ui:$swagger_version")

tuon-core/build.gradle

@@ -13,8 +13,23 @@ dependencies {
     compileOnly('org.springframework.boot:spring-boot-starter-webflux')
     compileOnly('org.springframework.boot:spring-boot-starter-web')
     compileOnly 'org.springframework.boot:spring-boot-starter-data-mongodb-reactive'
-    compile("com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion")
+
     compile 'org.springframework.session:spring-session-data-redis'
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.9")
     compile('com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9')
+
+
+    compile('org.springframework.boot:spring-boot-starter-actuator')
+    compile("de.codecentric:spring-boot-admin-starter-client:${springBootAdminVersion}")
+    compile('org.springframework.boot:spring-boot-starter-undertow')
+    compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-client')
+    compile('org.springframework.cloud:spring-cloud-starter-openfeign')
+    //cache
+    compile('org.springframework.boot:spring-boot-starter-cache')
+    compile("com.github.ben-manes.caffeine:caffeine:$caffeine_version")
+
+    // db
+    compile("mysql:mysql-connector-java:$mysql_connector_version")
+    compile("com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion")
+    compile('org.springframework.boot:spring-boot-starter-jdbc')
 }

tuon-core/src/main/java/cn/tonyandmoney/tuon/core/session/SessionUtils.java

@@ -67,6 +67,7 @@ public class SessionUtils {
      * @param exchange 这个
      * @return
      */
+    @SuppressWarnings("all")
     public static <T extends IUser> Mono<T> getUser(ServerWebExchange exchange) {
         return exchange.getSession()
                 .flatMap(webSession -> {

tuon-core/src/main/java/cn/tonyandmoney/tuon/core/user/IUser.java

@@ -1,5 +1,6 @@
 package cn.tonyandmoney.tuon.core.user;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -32,18 +33,32 @@ public interface IUser {
     String getAccount();
 
 
-    List<String> getRoleIdList();
+    default List<String> getRoleIdList() {
+        return Collections.emptyList();
+    }
 
-    List<String> getGroupIdList();
+    default List<String> getGroupIdList() {
+        return Collections.emptyList();
+    }
 
-    List<String> getDeptIdList();
+    default List<String> getDeptIdList() {
+        return Collections.emptyList();
+    }
 
-    List<IDept> getDepts();
+    default List<IDept> getDepts() {
+        return Collections.emptyList();
+    }
 
-    List<IRole> getRoles();
+    default List<IRole> getRoles() {
+        return Collections.emptyList();
+    }
 
-    List<String> getTagList();
+    default List<String> getTagList() {
+        return Collections.emptyList();
+    }
 
-    List<IUserGroup> getUserGroup();
+    default List<IUserGroup> getUserGroup() {
+        return Collections.emptyList();
+    }
 
 }

tuon-qywx/src/main/java/cn/tonyandmoney/tuon/qywx/bean/WxUser.java

@@ -3,6 +3,7 @@ package cn.tonyandmoney.tuon.qywx.bean;
 import cn.tonyandmoney.tuon.core.user.IDept;
 import cn.tonyandmoney.tuon.core.user.IRole;
 import cn.tonyandmoney.tuon.core.user.IUser;
+import cn.tonyandmoney.tuon.core.user.IUserGroup;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.io.Serializable;
@@ -182,13 +183,6 @@ public class WxUser extends WxBaseResult implements Serializable, IUser {
         return userid;
     }
 
-    @Override
-    public List<IDept> getDepts() {
-        return Collections.emptyList();
-    }
 
-    @Override
-    public List<IRole> getRoles() {
-        return Collections.emptyList();
-    }
+
 }

tuon-web/build.gradle

@@ -21,6 +21,7 @@ dependencies {
    compile project(':tuon-core')
    compile project(':tuon-qywx')
    compile project(':tuon-gateway')
+   compile('org.springframework.cloud:spring-cloud-starter-config')
    implementation('org.springframework.boot:spring-boot-starter-webflux')
 }
 

tuon-web/src/main/java/cn/tonyandmoney/tuon/web/MainApplication.java

@@ -0,0 +1,29 @@
+package cn.tonyandmoney.tuon.web;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.session.data.redis.config.annotation.web.server.EnableRedisWebSession;
+
+@EnableAsync
+@EnableEurekaClient
+@EnableDiscoveryClient
+@EnableRedisWebSession
+@MapperScan(basePackages = {"cn.tonyandmoney.tuon.**.dao"})
+@SpringBootApplication(scanBasePackages = {"cn.tonyandmoney.tuon"})
+public class MainApplication extends SpringBootServletInitializer {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MainApplication.class);
+    }
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(MainApplication.class);
+    }
+}

tuon-web/src/main/kotlin/cn/tonyandmoney/tuon/web/MainApplication.kt

@@ -1,32 +0,0 @@
-package cn.tonyandmoney.tuon.web
-
-import org.mybatis.spring.annotation.MapperScan
-import org.springframework.boot.SpringApplication
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.builder.SpringApplicationBuilder
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient
-import org.springframework.scheduling.annotation.EnableAsync
-import org.springframework.session.data.redis.config.annotation.web.server.EnableRedisWebSession
-
-/**
- * 所以这个
- */
-@EnableAsync
-@EnableEurekaClient
-@EnableDiscoveryClient
-@EnableRedisWebSession
-@MapperScan(basePackages = ["cn.tonyandmoney.tuon.**.dao"])
-@SpringBootApplication(scanBasePackages = ["cn.tonyandmoney.tuon"])
-class MainApplication : SpringBootServletInitializer() {
-    override fun configure(builder: SpringApplicationBuilder): SpringApplicationBuilder {
-        return builder.sources(MainApplication::class.java)
-    }
-
-}
-
-
-fun main() {
-    SpringApplication.run(MainApplication::class.java)
-}

tuon-web/src/main/resources/application.yml

@@ -1,4 +1,6 @@
 
+
+# 数据库配置
 spring:
   datasource:
     password: tuonq520

tuon-web/src/main/resources/bootstrap.yml

@@ -8,7 +8,7 @@ spring:
   application:
     name: tuon
   profiles:
-    active: sit
+    active: dev
     include: gateway
   cloud:
     config:
@@ -33,8 +33,6 @@ eureka:
   instance:
     ip-address: 192.168.42.12
 
-
-
 ---
 spring:
   profiles: sit