tina 6 年之前
父节点
当前提交
3511e6f943

+ 9 - 20
build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.2.61'
+        kotlin_version = '1.2.51'
         springBootVersion = '2.0.1.RELEASE'
         springCloudVersion = 'Finchley.SR1'
         mybatisPlusVersion = '3.0.3'
@@ -85,7 +85,7 @@ subprojects {
 
         compile('org.springframework.cloud:spring-cloud-config-server')
         compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-server')
-        compile('org.springframework.cloud:spring-cloud-starter-openfeign')
+//        compile('org.springframework.cloud:spring-cloud-starter-openfeign')
 //
         compile('org.springframework.boot:spring-boot-starter')
         compile('org.springframework.boot:spring-boot-starter-web')
@@ -96,15 +96,11 @@ subprojects {
 
 //        cache
         compile('org.springframework.boot:spring-boot-starter-cache')
-        compile('org.springframework.boot:spring-boot-starter-data-redis')
-        compile('redis.clients:jedis:2.9.0')
-
-
+        
         testCompile('org.springframework.boot:spring-boot-starter-test')
         // mq
 
-        // shiro
-        compile("org.apache.shiro:shiro-spring:$shiro_version")
+       
 
         compile group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: '2.9.6'
 
@@ -120,29 +116,22 @@ subprojects {
         compile("javax.servlet:javax.servlet-api:3.1.0")
         compile("javax.servlet:servlet-api:2.5")
 
-        // 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")
-        // job
-        compile("com.xuxueli:xxl-job-core:$xxljob_version")
+        
+       
 
         // swagger
         compile("io.springfox:springfox-swagger2:$swagger_version")
         compile("io.springfox:springfox-swagger-ui:$swagger_version")
-
-        // utils
-        compile("org.projectlombok:lombok:1.18.2")
-        compile("com.alibaba:fastjson:$fastjson_version")
-        compile("com.belerweb:pinyin4j:$pinyin4j_version")
+        
 
 
         compile("org.apache.velocity:velocity-engine-core:2.0")
         // sql parser
         compile("com.github.jsqlparser:jsqlparser:$jsqlparser_version")
-        // fastdfs
-        compile("com.github.tobato:fastdfs-client:$fastdfs_client_version")
+
 
         ext.jarTree = fileTree(dir: 'libs', include: '**/*.jar')
         compile jarTree

+ 3 - 0
zen-api/build.gradle

@@ -15,4 +15,7 @@ dependencies {
     runtime 'io.jsonwebtoken:jjwt-impl:0.10.5',
             'io.jsonwebtoken:jjwt-jackson:0.10.5'
     compile project(":zen-core")
+
+    // shiro
+    compile("org.apache.shiro:shiro-spring:$shiro_version")
 }

+ 7 - 4
zen-core/build.gradle

@@ -10,8 +10,11 @@ buildscript {
 }
 
 dependencies {
-}
+    compile("com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion")
+    compile('org.springframework.boot:spring-boot-starter-data-redis')
+    compile('redis.clients:jedis:2.9.0')
+    // cache
+    compile("com.github.ben-manes.caffeine:caffeine:$caffeine_version")
+
 
-//bootRepackage {
-//    enabled = false
-//}
+}

+ 2 - 0
zen-job/build.gradle

@@ -11,6 +11,8 @@ buildscript {
 
 dependencies {
     compile project(":zen-api")
+    // job
+    compile("com.xuxueli:xxl-job-core:$xxljob_version")
 }
 
 //bootRepackage {

+ 1 - 1
zen-web/build.gradle

@@ -13,5 +13,5 @@ buildscript {
 }
 
 dependencies {
-    compile project(":zen-api")
+//    compile project(":zen-api")
 }

+ 1 - 3
zen-web/src/main/kotlin/cn/gygxzc/envir/MainApplication.kt

@@ -1,6 +1,5 @@
 package cn.gygxzc.envir
 
-import org.mybatis.spring.annotation.MapperScan
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.builder.SpringApplicationBuilder
@@ -11,8 +10,7 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer
  * 注解配置
  */
 @EnableEurekaServer
-@SpringBootApplication(scanBasePackages = ["com.gxzc", "cn.gygxzc"])
-@MapperScan(basePackages = ["com.gxzc", "cn.gygxzc"])
+@SpringBootApplication(scanBasePackages = ["cn.gygxzc"])
 class MainApplication : SpringBootServletInitializer() {
     override fun configure(builder: SpringApplicationBuilder?): SpringApplicationBuilder? {
         return builder?.sources(MainApplication::class.java)

+ 1 - 6
zen-web/src/main/kotlin/cn/gygxzc/envir/api/sys/controller/LoginController.kt

@@ -1,11 +1,8 @@
 package cn.gygxzc.envir.api.sys.controller
 
 import cn.gygxzc.envir.api.sys.dto.LoginDto
-import cn.gygxzc.envir.sys.service.ILoginService
-import com.gxzc.zen.common.dto.ResponseDto
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
@@ -25,8 +22,6 @@ import org.springframework.web.bind.annotation.RestController
 @Api(tags = ["登陆API"])
 class LoginController {
 
-    @Autowired
-    private lateinit var loginService: ILoginService
 
     /**
      * 登陆成功之后,签发jwt凭证
@@ -34,7 +29,7 @@ class LoginController {
     @PostMapping("/app")
     @ApiOperation("用户登陆,返回jwt token")
     fun loginForJwt(@RequestBody dto: LoginDto): Any {
-        return ResponseDto().data(loginService.login(dto.username, dto.password))
+        throw RuntimeException("not support! ")
     }
 
 }

+ 1 - 2
zen-web/src/main/kotlin/cn/gygxzc/envir/api/sys/controller/SysController.kt

@@ -1,6 +1,5 @@
 package cn.gygxzc.envir.api.sys.controller
 
-import com.gxzc.zen.common.dto.ResponseDto
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.springframework.web.bind.annotation.GetMapping
@@ -18,6 +17,6 @@ class SysController {
     @GetMapping
     @ApiOperation("获取")
     fun info(): Any {
-        return ResponseDto().data("this is registry server !! ")
+        return "this is registry server !! "
     }
 }

+ 1 - 4
zen-web/src/main/kotlin/cn/gygxzc/envir/api/sys/controller/UserController.kt

@@ -1,7 +1,5 @@
 package cn.gygxzc.envir.api.sys.controller
 
-import cn.gygxzc.envir.config.shiro.utils.ShiroUtils
-import com.gxzc.zen.common.dto.ResponseDto
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.springframework.web.bind.annotation.GetMapping
@@ -20,7 +18,6 @@ class UserController {
     @GetMapping("/info")
     @ApiOperation("获取用户个人信息")
     fun userInfo(): Any {
-        val user = ShiroUtils.getUser()
-        return ResponseDto().data(user)
+        throw RuntimeException("not support !!!")
     }
 }