From 25062a913521fa642b01d33f82cf116b8c6ee21e Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 30 Sep 2024 22:57:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.0.0=20=E9=87=8D=E6=9E=84gaea=E5=BC=95?= =?UTF-8?q?=E7=94=A8;=20=E5=A2=9E=E5=8A=A0docker=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + Dockerfile | 13 ++++++ build.gradle | 30 ++++++++----- doc/db-init.js | 43 ++++++++---------- docker-compose.yml | 45 +++++++++++++++++++ .../com/synebula/zeus/app/config/ZeusBeans.kt | 11 +++-- .../synebula/zeus/app/config/ZeusServices.kt | 4 +- .../zeus/app/controller/SignInOutApp.kt | 3 +- .../zeus/app/controller/rbac/AuthorityApp.kt | 6 +-- .../zeus/app/controller/rbac/GroupApp.kt | 10 ++--- .../zeus/app/controller/rbac/RoleApp.kt | 10 ++--- .../zeus/app/controller/rbac/UserApp.kt | 10 ++--- .../controller/rbac/resource/InterfaceApp.kt | 6 +-- .../app/controller/rbac/resource/PageApp.kt | 6 +-- .../app/controller/rbac/resource/SystemApp.kt | 6 +-- .../src/main/resources/application.yml | 18 ++++---- .../domain/model/rbac/resource/Interface.kt | 2 +- .../zeus/domain/model/rbac/resource/Page.kt | 2 +- .../zeus/domain/model/rbac/resource/System.kt | 2 +- .../zeus/domain/service/cmd/rbac/UserCmd.kt | 2 +- .../service/cmd/rbac/resource/InterfaceCmd.kt | 2 +- .../service/cmd/rbac/resource/PageCmd.kt | 2 +- .../service/cmd/rbac/resource/SystemCmd.kt | 2 +- .../domain/service/impl/rbac/UserService.kt | 8 ++-- .../zeus/query/contr/IAuthorityQuery.kt | 4 +- .../synebula/zeus/query/contr/IUserQuery.kt | 4 +- .../query/contr/resouce/IInterfaceQuery.kt | 4 +- .../zeus/query/contr/resouce/IPageQuery.kt | 6 +-- .../zeus/query/contr/resouce/ISystemQuery.kt | 4 +- .../zeus/query/impl/AuthorityQuery.kt | 9 ++-- .../com/synebula/zeus/query/impl/UserQuery.kt | 10 ++--- .../zeus/query/impl/resouce/InterfaceQuery.kt | 6 +-- .../zeus/query/impl/resouce/PageQuery.kt | 8 ++-- .../zeus/query/impl/resouce/SystemQuery.kt | 6 +-- .../com/synebula/zeus/query/view/GroupView.kt | 6 +-- .../com/synebula/zeus/query/view/RoleView.kt | 2 +- .../com/synebula/zeus/query/view/UserView.kt | 8 ++-- .../zeus/query/view/resource/InterfaceView.kt | 2 +- .../zeus/query/view/resource/PageView.kt | 2 +- .../zeus/query/view/resource/SystemView.kt | 2 +- 40 files changed, 197 insertions(+), 130 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index 50f4ba5..5ae2980 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,6 @@ gradlew* build gradle logs +bin !.gitignore \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..914988b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM gradle:8.10.1-jdk21-alpine AS build +ENV GRADLE_USER_HOME=/.gradle +USER root +WORKDIR /src +COPY --chown=gradle:gradle . . +RUN --mount=type=cache,target=/.gradle gradle bootJar --no-daemon --build-cache + +FROM openjdk:21-jdk-slim +EXPOSE 80 +VOLUME /logs +WORKDIR /app +COPY --from=build /src/src/zeus.app/build/libs/*.jar ./spring-boot-application.jar +ENTRYPOINT ["java", "-XX:+UnlockExperimentalVMOptions", "-Djava.security.egd=file:/dev/./urandom","-jar","/app/spring-boot-application.jar"] \ No newline at end of file diff --git a/build.gradle b/build.gradle index 915f885..b51cc50 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,18 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + buildscript { ext { - kotlin_version = '1.6.10' + jvm_version = '21' + kotlin_version = '2.0.0' + gaea_version = '1.7.0' + spring_version = "3.3.0" } repositories { mavenLocal() - maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://maven.aliyun.com/repository/public' } mavenCentral() } @@ -19,9 +26,7 @@ subprojects { version version ext { - version '0.9.0' - gaea_version = '1.5.1' - spring_version = "2.7.0" + version '1.0.0' } buildscript { @@ -34,6 +39,7 @@ subprojects { repositories { mavenLocal() + maven { url 'https://git.synebula.com/api/packages/alex/maven' } maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } mavenCentral() } @@ -49,13 +55,17 @@ subprojects { testApi group: 'junit', name: 'junit', version: '4.12' } - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - + /*** 指定 Java & Kotlin 语言编译目标JVM ***/ + sourceCompatibility = "$jvm_version" + targetCompatibility = "$jvm_version" compileKotlin { - kotlinOptions.jvmTarget = "1.8" + compilerOptions { + jvmTarget = JvmTarget.valueOf("JVM_$jvm_version") + } } compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" + compilerOptions { + jvmTarget = JvmTarget.valueOf("JVM_$jvm_version") + } } } diff --git a/doc/db-init.js b/doc/db-init.js index 5019d72..dae785c 100644 --- a/doc/db-init.js +++ b/doc/db-init.js @@ -1,21 +1,16 @@ -db.role.insertMany([ +db = db.getSiblingDB('zeus'); +db.createUser( + { + user: "root", + pwd: "LcY221815", + roles:[ { role: "dbOwner", db: "zeus" }] + } +) +db.role.insertOne( { _id: "admin", name: "管理员" - }, - { - _id: "VE", - name: "Viewer" - }, - { - _id: "RE", - name: "RE工程师" - }, - { - _id: "FE", - name: "FE工程师" } -] ); db.group.insertOne( @@ -32,7 +27,7 @@ db.user.insertOne({ phone: "18654551561", role: "admin", group: "1", - alive: true, + avalible: true, _class: "com.synebula.zeus.domain.model.rbac.User" }); @@ -55,14 +50,14 @@ db.page.insertMany([ ]) db.authority.insertMany([ - { "role": "admin", "resource": "1", "type": "System", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, - { "role": "admin", "resource": "1", "type": "Page", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, - { "role": "admin", "resource": "2", "type": "Page", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, - { "role": "admin", "resource": "3", "type": "Page", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, - { "role": "admin", "resource": "4", "type": "Page", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, - { "role": "admin", "resource": "5", "type": "Page", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, - { "role": "admin", "resource": "6", "type": "Page", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, - { "role": "admin", "resource": "7", "type": "Page", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, - { "role": "admin", "resource": "8", "type": "Page", "authority": "Allow", "alive": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "1", "type": "System", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "1", "type": "Page", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "2", "type": "Page", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "3", "type": "Page", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "4", "type": "Page", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "5", "type": "Page", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "6", "type": "Page", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "7", "type": "Page", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, + { "role": "admin", "resource": "8", "type": "Page", "authority": "Allow", "avalible": true, "_class": "com.synebula.zeus.domain.model.rbac.Authority" }, ]) diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..6ae0bea --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,45 @@ +services: + app: + image: com.synebula/zeus + restart: always + container_name: zeus.app + build: + context: ./ + dockerfile: ./Dockerfile + volumes: + - ./bin/logs:/app/logs + - /etc/hosts:/etc/hosts + - /usr/share/zoneinfo/Asia/Shanghai:/etc/timezone + ports: + - 8080:80 + environment: + - TZ=Asia/Shanghai + - DB_URL=mongodb://root:LcY221815@db/zeus + + db: + container_name: zeus.db + image: mongo + ports: + - 27017:27017 + volumes: + - ./bin/sct:/sct + - ./bin/data:/data/db + - ./bin/backup:/data/backup + environment: + - MONGO_INITDB_ROOT_USERNAME=root + - MONGO_INITDB_ROOT_PASSWORD=LcY221815 + restart: unless-stopped + +# ui: +# image: nginx:mainline-alpine +# restart: always +# container_name: zeus.ui +# links: +# - app +# volumes: +# - ./conf/ui:/etc/nginx/conf.d/ +# - ./bin/ui:/app +# - /usr/share/zoneinfo/Asia/Shanghai:/etc/timezone +# ports: +# - 80:80 +# - 443:443 \ No newline at end of file diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt index bd2d54e..a7d7960 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt @@ -3,23 +3,26 @@ package com.synebula.zeus.app.config import com.google.gson.Gson import com.synebula.gaea.data.message.HttpMessageFactory import com.synebula.gaea.data.serialization.json.IJsonSerializer +import com.synebula.gaea.db.query.IQuery import com.synebula.gaea.domain.repository.IRepositoryFactory -import com.synebula.gaea.mongodb.query.MongodbQueryFactory import com.synebula.gaea.mongodb.repository.MongodbRepositoryFactory -import com.synebula.gaea.query.IQueryFactory +import com.synebula.gaea.mongodb.db.MongodbQuery import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration +import org.springframework.context.annotation.Primary import org.springframework.data.mongodb.core.MongoTemplate @Configuration class ZeusBeans { + @Bean fun repoFactory(template: MongoTemplate): IRepositoryFactory { return MongodbRepositoryFactory(template) } + @Primary @Bean - fun queryFactory(template: MongoTemplate): IQueryFactory { - return MongodbQueryFactory(template) + fun defaultQuery(template: MongoTemplate): IQuery { + return MongodbQuery(template) } @Bean diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusServices.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusServices.kt index b54c90d..723f1b4 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusServices.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusServices.kt @@ -1,10 +1,10 @@ package com.synebula.zeus.app.config import com.synebula.gaea.app.autoconfig.service.ServiceScan -import com.synebula.gaea.mongodb.autoconfig.MongodbRepositoryScan +import com.synebula.gaea.mongodb.autoconfig.MongoDbRepositoryScan import org.springframework.stereotype.Component @Component @ServiceScan(basePackages = ["com.synebula.zeus.domain.service"]) -@MongodbRepositoryScan(basePackages = ["com.synebula.zeus.domain.repository", "com.synebula.zeus.repository", "com.synebula.zeus.query"]) +@MongoDbRepositoryScan(basePackages = ["com.synebula.zeus.domain.repository", "com.synebula.zeus.repository", "com.synebula.zeus.query"]) class ZeusServices \ No newline at end of file diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt index 0956b65..0a63fcb 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt @@ -12,6 +12,7 @@ import com.synebula.gaea.spring.aop.annotation.Method import com.synebula.zeus.domain.service.cmd.rbac.UserCmd import com.synebula.zeus.domain.service.contr.rbac.IUserService import com.synebula.zeus.query.contr.IUserQuery +import com.synebula.zeus.query.view.UserView import org.springframework.beans.factory.annotation.Autowired import org.springframework.security.core.context.SecurityContextHolder import org.springframework.web.bind.annotation.* @@ -77,7 +78,7 @@ class SignInOutApp(override var logger: ILogger) : IApplication { @PostMapping("/up") fun signUp(@RequestBody command: UserCmd): HttpMessage { return this.safeExecute("用户注册出错, 用户信息: ${serializer.serialize(command)}") { - val list = this.userQuery.list(mapOf(Pair("name", command.name))) + val list = this.userQuery.list(mapOf(Pair("name", command.name)), UserView::class.java) if (list.isEmpty()) { val message = userService.add(command) it.data = message.data diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt index 09b087f..b1fe900 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt @@ -1,6 +1,6 @@ package com.synebula.zeus.app.controller.rbac -import com.synebula.gaea.app.controller.Application +import com.synebula.gaea.app.controller.DomainApplication import com.synebula.gaea.data.message.HttpMessage import com.synebula.gaea.log.ILogger import com.synebula.gaea.spring.aop.annotation.Method @@ -18,8 +18,8 @@ class AuthorityApp( query: IAuthorityQuery, logger: ILogger, private var authorityService: IAuthorityService -) : Application( - "权限信息", authorityService, query, logger +) : DomainApplication( + "权限信息", authorityService, query, AuthorityView::class.java, logger ) { @Method("批量添加权限信息") @PostMapping("/batch") diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt index effdfd6..36a055a 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt @@ -1,8 +1,8 @@ package com.synebula.zeus.app.controller.rbac -import com.synebula.gaea.app.controller.Application +import com.synebula.gaea.app.controller.DomainApplication +import com.synebula.gaea.db.query.IQuery import com.synebula.gaea.log.ILogger -import com.synebula.gaea.query.IQueryFactory import com.synebula.zeus.domain.service.cmd.rbac.GroupCmd import com.synebula.zeus.domain.service.contr.rbac.IGroupService import com.synebula.zeus.query.view.GroupView @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/groups") class GroupApp( service: IGroupService, - factory: IQueryFactory, + query: IQuery, logger: ILogger -) : Application( - "用户组信息", service, factory.createQuery(GroupView::class.java), logger +) : DomainApplication( + "用户组信息", service, query, GroupView::class.java, logger ) \ No newline at end of file diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt index 2953e06..262d493 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt @@ -1,8 +1,8 @@ package com.synebula.zeus.app.controller.rbac -import com.synebula.gaea.app.controller.Application +import com.synebula.gaea.app.controller.DomainApplication +import com.synebula.gaea.db.query.IQuery import com.synebula.gaea.log.ILogger -import com.synebula.gaea.query.IQueryFactory import com.synebula.zeus.domain.service.cmd.rbac.RoleCmd import com.synebula.zeus.domain.service.contr.rbac.IRoleService import com.synebula.zeus.query.view.RoleView @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/roles") class RoleApp( service: IRoleService, - factory: IQueryFactory, + query: IQuery, logger: ILogger -) : Application( - "用户信息", service, factory.createQuery(RoleView::class.java), logger +) : DomainApplication( + "用户信息", service, query, RoleView::class.java, logger ) \ No newline at end of file diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt index 29c42a4..1e271a9 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt @@ -1,6 +1,6 @@ package com.synebula.zeus.app.controller.rbac -import com.synebula.gaea.app.controller.Application +import com.synebula.gaea.app.controller.DomainApplication import com.synebula.gaea.data.message.HttpMessage import com.synebula.gaea.data.message.Status import com.synebula.gaea.data.serialization.json.IJsonSerializer @@ -18,8 +18,8 @@ class UserApp( service: IUserService, query: IUserQuery, logger: ILogger -) : Application( - "用户信息", service, query, logger +) : DomainApplication( + "用户信息", service, query, UserView::class.java, logger ) { @Autowired @@ -27,7 +27,7 @@ class UserApp( override fun add(command: UserCmd): HttpMessage { return this.safeExecute("查询重复用户信息出错, 用户信息: ${serializer.serialize(command)}") { - val list = this.query.list(mapOf(Pair("name", command.name))) + val list = this.query.list(mapOf(Pair("name", command.name)), UserView::class.java) if (list.isEmpty()) it.from(super.add(command)) else { @@ -53,7 +53,7 @@ class UserApp( @GetMapping("/{name}/forgot") fun forgot(@PathVariable name: String): HttpMessage { return this.safeExecute("遗忘用户密码出现异常") { - val users = this.query.list(mapOf(Pair("name", name))) + val users = this.query.list(mapOf(Pair("name", name)), UserView::class.java) if (users.isNotEmpty()) { it.load((this.service as IUserService).forgotPassword(users[0].id)) diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt index 1696090..c1dff67 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt @@ -1,6 +1,6 @@ package com.synebula.zeus.app.controller.rbac.resource -import com.synebula.gaea.app.controller.Application +import com.synebula.gaea.app.controller.DomainApplication import com.synebula.gaea.data.message.HttpMessage import com.synebula.gaea.log.ILogger import com.synebula.gaea.spring.aop.annotation.Method @@ -19,8 +19,8 @@ class InterfaceApp( service: IInterfaceService, logger: ILogger, var interfaceQuery: IInterfaceQuery -) : Application( - "接口信息", service, interfaceQuery, logger +) : DomainApplication( + "接口信息", service, interfaceQuery, InterfaceView::class.java, logger ) { @Method("获取角色系统下有权接口") diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt index ebe085d..7e586a4 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt @@ -1,6 +1,6 @@ package com.synebula.zeus.app.controller.rbac.resource -import com.synebula.gaea.app.controller.Application +import com.synebula.gaea.app.controller.DomainApplication import com.synebula.gaea.data.message.HttpMessage import com.synebula.gaea.log.ILogger import com.synebula.gaea.spring.aop.annotation.Method @@ -21,8 +21,8 @@ class PageApp( service: IPageService, logger: ILogger, var pageQuery: IPageQuery -) : Application( - "页面信息", service, pageQuery, logger +) : DomainApplication( + "页面信息", service, pageQuery, PageView::class.java, logger ) { @Method("获取角色系统下有权页面") diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt index f90f687..16bf7ed 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt @@ -1,6 +1,6 @@ package com.synebula.zeus.app.controller.rbac.resource -import com.synebula.gaea.app.controller.Application +import com.synebula.gaea.app.controller.DomainApplication import com.synebula.gaea.data.message.HttpMessage import com.synebula.gaea.log.ILogger import com.synebula.gaea.spring.aop.annotation.Method @@ -19,8 +19,8 @@ class SystemApp( service: ISystemService, logger: ILogger, var systemQuery: ISystemQuery -) : Application( - "系统信息", service, systemQuery, logger +) : DomainApplication( + "系统信息", service, systemQuery, SystemView::class.java, logger ) { @Method("获取角色有权系统") @GetMapping("/authorized/{role}") diff --git a/src/zeus.app/src/main/resources/application.yml b/src/zeus.app/src/main/resources/application.yml index 08e0d06..b0bbb5c 100644 --- a/src/zeus.app/src/main/resources/application.yml +++ b/src/zeus.app/src/main/resources/application.yml @@ -1,23 +1,23 @@ server: - port: 8080 + port: 80 spring: application: name: gaea.app sign-in-url: /sign/in - allow-multi-sign: false + allow-multi-sign: ${ALLOW_MULTI_SIGN:false} data: mongodb: - uri: mongodb://127.0.0.1/zeus + uri: ${DB_URL:mongodb://root:LcY221815@127.0.0.1/zeus} mail: send: true target: ge.com - sender: gehsrv@163.com - protocol: smtp - host: smtp.163.com - port: 465 - username: gehsrv@163.com - password: SRBPJBLFFVVCPZLZ + sender: ${MAIL_SENDER:gehsrv@163.com} + protocol: ${MAIL_SENDER:smtp} + host: ${MAIL_HOST:smtp.163.com} + port: ${MAIL_PORT:465} + username: ${MAIL_USER:gehsrv@163.com} + password: ${MAIL_PWD:SRBPJBLFFVVCPZLZ} default-encoding: UTF-8 properties: mail: diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Interface.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Interface.kt index 67716a2..731083f 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Interface.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Interface.kt @@ -4,5 +4,5 @@ import com.synebula.gaea.domain.model.IAggregateRoot class Interface : Resource(), IAggregateRoot { var system = "" - override var alive = true + override var avalible = true } \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Page.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Page.kt index 02325bc..51ecaa5 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Page.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Page.kt @@ -16,6 +16,6 @@ class Page : Resource(), IAggregateRoot { // 所属系统 var system = "" - override var alive = true + override var avalible = true } \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/System.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/System.kt index d4e023d..1ccae98 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/System.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/System.kt @@ -3,5 +3,5 @@ package com.synebula.zeus.domain.model.rbac.resource import com.synebula.gaea.domain.model.IAggregateRoot class System : Resource(), IAggregateRoot { - override var alive = true + override var avalible = true } \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/UserCmd.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/UserCmd.kt index a7a5140..ff93b42 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/UserCmd.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/UserCmd.kt @@ -10,6 +10,6 @@ class UserCmd : Command() { var phone: String? = null var role: String? = null var group: String = "" - var alive: Boolean = false + var avalible: Boolean = false var token: String? = null } diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/InterfaceCmd.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/InterfaceCmd.kt index 05af0c2..99643d7 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/InterfaceCmd.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/InterfaceCmd.kt @@ -2,5 +2,5 @@ package com.synebula.zeus.domain.service.cmd.rbac.resource class InterfaceCmd : ResourceCmd() { var system = "" - var alive = true + var avalible = true } \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PageCmd.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PageCmd.kt index 6e644b1..246ab22 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PageCmd.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PageCmd.kt @@ -14,6 +14,6 @@ class PageCmd : ResourceCmd() { // 所属系统 var system = "" - var alive = true + var avalible = true } \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/SystemCmd.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/SystemCmd.kt index 6cb909a..7ba2b6c 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/SystemCmd.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/SystemCmd.kt @@ -2,5 +2,5 @@ package com.synebula.zeus.domain.service.cmd.rbac.resource class SystemCmd : ResourceCmd() { - var alive = true + var avalible = true } \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt index 3b0e2dd..e076e5a 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt @@ -41,7 +41,7 @@ class UserService( val user = this.map(command) user.password = user.password.toMd5() user.token = UUID.randomUUID().toString() - user.alive = false + user.avalible = false this.repository.add(user) userNotifier?.added(user.id!!, user.name, user.token!!) return DataMessage(user.id!!) @@ -54,11 +54,11 @@ class UserService( */ override fun active(key: String, token: String): DataMessage { val user = this.repository.get(key)!! - return if (user.alive) { + return if (user.avalible) { DataMessage("用户${user.name}无需重复激活") } else { if (token == user.token) { - user.alive = true + user.avalible = true user.token = null this.repository.update(user) DataMessage(Status.Success, "用户${user.name}激活成功") @@ -101,7 +101,7 @@ class UserService( override fun forgotPassword(key: String): DataMessage { val user = this.repository.get(key)!! - return if (user.alive) { + return if (user.avalible) { user.token = UUID.randomUUID().toString() this.repository.update(user) userNotifier?.forgot(user.id!!, user.name, user.token!!) diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt index 4d673af..ce01a7b 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt @@ -1,11 +1,11 @@ package com.synebula.zeus.query.contr import com.synebula.gaea.data.permission.AuthorityType -import com.synebula.gaea.query.IQuery +import com.synebula.gaea.db.query.IQuery import com.synebula.zeus.env.ResourceType import com.synebula.zeus.query.view.AuthorityView -interface IAuthorityQuery : IQuery { +interface IAuthorityQuery : IQuery { /** * 获取角色已授权的资源 diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt index 2f48903..8ace4fe 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt @@ -1,11 +1,11 @@ package com.synebula.zeus.query.contr import com.synebula.gaea.data.message.DataMessage -import com.synebula.gaea.query.IQuery +import com.synebula.gaea.db.query.IQuery import com.synebula.zeus.query.view.SignUserView import com.synebula.zeus.query.view.UserView -interface IUserQuery : IQuery { +interface IUserQuery : IQuery { /** * 登录接口 * diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt index 6fccb5f..1543428 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt @@ -1,10 +1,10 @@ package com.synebula.zeus.query.contr.resouce import com.synebula.gaea.data.permission.AuthorityType -import com.synebula.gaea.query.IQuery +import com.synebula.gaea.db.query.IQuery import com.synebula.zeus.query.view.resource.InterfaceView -interface IInterfaceQuery : IQuery { +interface IInterfaceQuery : IQuery { fun authorized(role: String): List diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt index c389e3c..84bf898 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt @@ -1,14 +1,14 @@ package com.synebula.zeus.query.contr.resouce import com.synebula.gaea.data.permission.AuthorityType -import com.synebula.gaea.query.IQuery +import com.synebula.gaea.db.query.IQuery import com.synebula.zeus.query.view.resource.PageView -interface IPageQuery : IQuery { +interface IPageQuery : IQuery { fun authorized(role: String): List - fun authorized(role: String, system: String? ): List + fun authorized(role: String, system: String?): List fun authorize(resource: String, role: String): AuthorityType? diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt index a65b9be..d101109 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt @@ -1,10 +1,10 @@ package com.synebula.zeus.query.contr.resouce import com.synebula.gaea.data.permission.AuthorityType -import com.synebula.gaea.query.IQuery +import com.synebula.gaea.db.query.IQuery import com.synebula.zeus.query.view.resource.SystemView -interface ISystemQuery : IQuery { +interface ISystemQuery : IQuery { fun authorized(role: String): List diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt index ef19895..247899a 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt @@ -1,7 +1,7 @@ package com.synebula.zeus.query.impl import com.synebula.gaea.data.permission.AuthorityType -import com.synebula.gaea.mongodb.query.MongodbQuery +import com.synebula.gaea.mongodb.db.MongodbQuery import com.synebula.zeus.env.ResourceType import com.synebula.zeus.query.contr.IAuthorityQuery import com.synebula.zeus.query.view.AuthorityView @@ -10,15 +10,14 @@ import org.springframework.data.mongodb.core.query.Criteria import org.springframework.data.mongodb.core.query.Query class AuthorityQuery(template: MongoTemplate) : - MongodbQuery(AuthorityView::class.java, template), IAuthorityQuery { - var collection = this.collection(this.clazz) + MongodbQuery(template), IAuthorityQuery { override fun authorized(resourceType: ResourceType, role: String): List { return this.template.find( Query.query( Criteria.where("type").`is`(resourceType) .and("role").`is`(role) - ), this.clazz, this.collection + ), AuthorityView::class.java, this.collection(AuthorityView::class.java) ) } @@ -28,7 +27,7 @@ class AuthorityQuery(template: MongoTemplate) : Criteria.where("type").`is`(resourceType) .and("resource").`is`(resource) .and("role").`is`(role) - ), this.clazz, this.collection + ), AuthorityView::class.java, this.collection(AuthorityView::class.java) ) return authority?.authority ?: AuthorityType.Default } diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt index 2fa99a8..225a3a3 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt @@ -4,7 +4,7 @@ import com.synebula.gaea.data.message.DataMessage import com.synebula.gaea.data.message.Status import com.synebula.gaea.data.permission.PermissionType import com.synebula.gaea.ext.toMd5 -import com.synebula.gaea.mongodb.query.MongodbQuery +import com.synebula.gaea.mongodb.db.MongodbQuery import com.synebula.gaea.mongodb.whereId import com.synebula.zeus.query.contr.IUserQuery import com.synebula.zeus.query.view.GroupView @@ -17,15 +17,15 @@ import org.springframework.data.mongodb.core.query.Query import org.springframework.data.mongodb.core.query.isEqualTo class UserQuery(template: MongoTemplate) : - MongodbQuery(UserView::class.java, template), IUserQuery { + MongodbQuery(template), IUserQuery { override fun signIn(name: String, password: String): DataMessage { val query = Query.query( Criteria.where("name").isEqualTo(name) .and("password").isEqualTo(password.toMd5()) - .and("alive").isEqualTo(true) + .and("avalible").isEqualTo(true) ) - val user = this.template.findOne(query, this.clazz, "user") + val user = this.template.findOne(query, UserView::class.java, "user") return if (user != null) { val role = this.template.findOne(whereId(user.role), RoleView::class.java, "role") val group = this.template.findOne(whereId(user.group), GroupView::class.java, "group") @@ -43,6 +43,6 @@ class UserQuery(template: MongoTemplate) : override fun listUsers(idList: List): List { - return this.template.find(Query.query(Criteria.where("_id").`in`(idList)), this.clazz, "user") + return this.template.find(Query.query(Criteria.where("_id").`in`(idList)), UserView::class.java, "user") } } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt index 319a586..8a1bfc8 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt @@ -1,7 +1,7 @@ package com.synebula.zeus.query.impl.resouce import com.synebula.gaea.data.permission.AuthorityType -import com.synebula.gaea.mongodb.query.MongodbQuery +import com.synebula.gaea.mongodb.db.MongodbQuery import com.synebula.zeus.env.ResourceType import com.synebula.zeus.query.contr.IAuthorityQuery import com.synebula.zeus.query.contr.resouce.IInterfaceQuery @@ -13,7 +13,7 @@ class InterfaceQuery( template: MongoTemplate, var authorityQuery: IAuthorityQuery, var systemQuery: ISystemQuery -) : MongodbQuery(InterfaceView::class.java, template), IInterfaceQuery { +) : MongodbQuery(template), IInterfaceQuery { override fun authorized(role: String): List { return this.authorized(role, null) @@ -28,7 +28,7 @@ class InterfaceQuery( } val params = mutableMapOf() if (system != null) params["system"] = system - val interfaces = this.list(params) + val interfaces = this.list(params, InterfaceView::class.java) val authorities = this.authorityQuery.authorized(ResourceType.Interface, role) return interfaces.filter { i -> val authority = authorities.find { p -> i.id == p.resource } diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt index 28bdabb..2a90703 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt @@ -1,7 +1,7 @@ package com.synebula.zeus.query.impl.resouce import com.synebula.gaea.data.permission.AuthorityType -import com.synebula.gaea.mongodb.query.MongodbQuery +import com.synebula.gaea.mongodb.db.MongodbQuery import com.synebula.zeus.env.ResourceType import com.synebula.zeus.query.contr.IAuthorityQuery import com.synebula.zeus.query.contr.resouce.IPageQuery @@ -12,7 +12,7 @@ import org.springframework.data.mongodb.core.query.Criteria import org.springframework.data.mongodb.core.query.Query class PageQuery(template: MongoTemplate, var authorityQuery: IAuthorityQuery, var systemQuery: ISystemQuery) : - MongodbQuery(PageView::class.java, template), IPageQuery { + MongodbQuery(template), IPageQuery { override fun authorized(role: String): List { return this.authorized(role, null) @@ -26,7 +26,7 @@ class PageQuery(template: MongoTemplate, var authorityQuery: IAuthorityQuery, va } val params = mutableMapOf() if (system != null) params["system"] = system - val pages = this.list(params) + val pages = this.list(params, PageView::class.java) val authorities = this.authorityQuery.authorized(ResourceType.Page, role) return pages.filter { i -> val authority = authorities.find { p -> i.id == p.resource } @@ -41,7 +41,7 @@ class PageQuery(template: MongoTemplate, var authorityQuery: IAuthorityQuery, va override fun uriAuthorize(path: String, role: String): AuthorityType? { val page = this.template.findOne( Query.query(Criteria.where("uri").`is`(path)), - this.clazz, this.collection(this.clazz) + PageView::class.java, this.collection(PageView::class.java) ) ?: return null return this.authorize(page.id!!, role) } diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt index da5630e..9d5bd55 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt @@ -1,7 +1,7 @@ package com.synebula.zeus.query.impl.resouce import com.synebula.gaea.data.permission.AuthorityType -import com.synebula.gaea.mongodb.query.MongodbQuery +import com.synebula.gaea.mongodb.db.MongodbQuery import com.synebula.zeus.env.ResourceType import com.synebula.zeus.query.contr.IAuthorityQuery import com.synebula.zeus.query.contr.resouce.ISystemQuery @@ -9,10 +9,10 @@ import com.synebula.zeus.query.view.resource.SystemView import org.springframework.data.mongodb.core.MongoTemplate class SystemQuery(template: MongoTemplate, var authorityQuery: IAuthorityQuery) : - MongodbQuery(SystemView::class.java, template), ISystemQuery { + MongodbQuery(template), ISystemQuery { override fun authorized(role: String): List { - val systems = this.list(mapOf()) + val systems = this.list(mapOf(), SystemView::class.java) val authorities = this.authorityQuery.authorized(ResourceType.System, role) return systems.filter { i -> authorities.find { p -> i.id == p.resource }?.authority == AuthorityType.Allow } } diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt index 91e601c..357bcdf 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt @@ -1,8 +1,8 @@ package com.synebula.zeus.query.view -import com.synebula.gaea.query.Operator -import com.synebula.gaea.query.Table -import com.synebula.gaea.query.Where +import com.synebula.gaea.db.query.Operator +import com.synebula.gaea.db.query.Table +import com.synebula.gaea.db.query.Where @Table("group") diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt index 2ce2f3c..a792266 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt @@ -1,7 +1,7 @@ package com.synebula.zeus.query.view import com.synebula.gaea.data.permission.PermissionType -import com.synebula.gaea.query.Table +import com.synebula.gaea.db.query.Table @Table("role") class RoleView { diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/UserView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/UserView.kt index 2ff38a1..1263d7f 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/UserView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/UserView.kt @@ -1,8 +1,8 @@ package com.synebula.zeus.query.view -import com.synebula.gaea.query.Operator -import com.synebula.gaea.query.Table -import com.synebula.gaea.query.Where +import com.synebula.gaea.db.query.Operator +import com.synebula.gaea.db.query.Table +import com.synebula.gaea.db.query.Where @Table("user") class UserView { @@ -23,5 +23,5 @@ class UserView { var token: String? = null - var alive: Boolean? = null + var avalible: Boolean? = null } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/InterfaceView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/InterfaceView.kt index 3153305..b75d1f0 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/InterfaceView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/InterfaceView.kt @@ -2,5 +2,5 @@ package com.synebula.zeus.query.view.resource class InterfaceView : ResourceView() { var system = "" - var alive = true + var avalible = true } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PageView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PageView.kt index 43c27d6..77601d0 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PageView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PageView.kt @@ -14,6 +14,6 @@ class PageView : ResourceView() { // 所属系统 var system = "" - var alive = true + var avalible = true } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/SystemView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/SystemView.kt index e3f7dbc..71e12d9 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/SystemView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/SystemView.kt @@ -2,5 +2,5 @@ package com.synebula.zeus.query.view.resource class SystemView : ResourceView() { - var alive = true + var avalible = true } \ No newline at end of file